Skip to content

Fixes build warnings in maxmind_acl #7085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
randall merged 1 commit into from
Aug 5, 2020
Merged

Fixes build warnings in maxmind_acl #7085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions plugins/experimental/maxmind_acl/mmdb.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Acl::init(char const *filename)
}
#endif
} catch (const YAML::Exception &e) {
TSError("YAML::Exception %s when parsing YAML config file %s for maxmind", e.what(), configloc.c_str());
TSError("[%s] YAML::Exception %s when parsing YAML config file %s for maxmind", PLUGIN_NAME, e.what(), configloc.c_str());
return status;
}

Expand Down Expand Up @@ -152,7 +152,7 @@ Acl::loaddeny(YAML::Node denyNode)
}
}
} catch (const YAML::Exception &e) {
TSDebug("YAML::Exception %s when parsing YAML config file country code deny list for maxmind", e.what());
TSDebug(PLUGIN_NAME, "YAML::Exception %s when parsing YAML config file country code deny list for maxmind", e.what());
return false;
}

Expand All @@ -175,7 +175,7 @@ Acl::loaddeny(YAML::Node denyNode)
}
}
} catch (const YAML::Exception &e) {
TSDebug("YAML::Exception %s when parsing YAML config file ip deny list for maxmind", e.what());
TSDebug(PLUGIN_NAME, "YAML::Exception %s when parsing YAML config file ip deny list for maxmind", e.what());
return false;
}

Expand Down Expand Up @@ -233,7 +233,7 @@ Acl::loadallow(YAML::Node allowNode)
}
}
} catch (const YAML::Exception &e) {
TSDebug("YAML::Exception %s when parsing YAML config file country code allow list for maxmind", e.what());
TSDebug(PLUGIN_NAME, "YAML::Exception %s when parsing YAML config file country code allow list for maxmind", e.what());
return false;
}

Expand All @@ -256,7 +256,7 @@ Acl::loadallow(YAML::Node allowNode)
}
}
} catch (const YAML::Exception &e) {
TSDebug("YAML::Exception %s when parsing YAML config file ip allow list for maxmind", e.what());
TSDebug(PLUGIN_NAME, "YAML::Exception %s when parsing YAML config file ip allow list for maxmind", e.what());
return false;
}

Expand Down Expand Up @@ -315,7 +315,7 @@ Acl::parseregex(YAML::Node regex, bool allow)
}
}
} catch (const YAML::Exception &e) {
TSDebug("YAML::Exception %s when parsing YAML config file regex allow list for maxmind", e.what());
TSDebug(PLUGIN_NAME, "YAML::Exception %s when parsing YAML config file regex allow list for maxmind", e.what());
return;
}
}
Expand Down Expand Up @@ -537,7 +537,7 @@ Acl::eval_country(MMDB_entry_data_s *entry_data, const char *path, int path_len)
// UNKNOWN_IP if it does not exist in either, this is then used to determine
// action based on the default allow action
ipstate
Acl::eval_ip(const sockaddr *sock)
Acl::eval_ip(const sockaddr *sock) const
{
#if 0
for (auto &spot : allow_ip_map) {
Expand Down