Skip to content
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

Jump to bottom

Parse query-local-address before lua-config-file #4381

Merged
merged 1 commit into from
Sep 5, 2016
Merged

Parse query-local-address before lua-config-file #4381

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
52 changes: 26 additions & 26 deletions pdns/pdns_recursor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2551,6 +2551,32 @@ int serviceMain(int argc, char*argv[])

g_disthashseed=dns_random(0xffffffff);

checkLinuxIPv6Limits();
try {
vector<string> addrs;
if(!::arg()["query-local-address6"].empty()) {
SyncRes::s_doIPv6=true;
L<<Logger::Warning<<"Enabling IPv6 transport for outgoing queries"<<endl;

stringtok(addrs, ::arg()["query-local-address6"], ", ;");
for(const string& addr : addrs) {
g_localQueryAddresses6.push_back(ComboAddress(addr));
}
}
else {
L<<Logger::Warning<<"NOT using IPv6 for outgoing queries - set 'query-local-address6=::' to enable"<<endl;
}
addrs.clear();
stringtok(addrs, ::arg()["query-local-address"], ", ;");
for(const string& addr : addrs) {
g_localQueryAddresses4.push_back(ComboAddress(addr));
}
}
catch(std::exception& e) {
L<<Logger::Error<<"Assigning local query addresses: "<<e.what();
exit(99);
}

loadRecursorLuaConfig(::arg()["lua-config-file"]);

parseACLs();
Expand Down Expand Up @@ -2612,32 +2638,6 @@ int serviceMain(int argc, char*argv[])

SyncRes::s_minimumTTL = ::arg().asNum("minimum-ttl-override");

checkLinuxIPv6Limits();
try {
vector<string> addrs;
if(!::arg()["query-local-address6"].empty()) {
SyncRes::s_doIPv6=true;
L<<Logger::Warning<<"Enabling IPv6 transport for outgoing queries"<<endl;

stringtok(addrs, ::arg()["query-local-address6"], ", ;");
for(const string& addr : addrs) {
g_localQueryAddresses6.push_back(ComboAddress(addr));
}
}
else {
L<<Logger::Warning<<"NOT using IPv6 for outgoing queries - set 'query-local-address6=::' to enable"<<endl;
}
addrs.clear();
stringtok(addrs, ::arg()["query-local-address"], ", ;");
for(const string& addr : addrs) {
g_localQueryAddresses4.push_back(ComboAddress(addr));
}
}
catch(std::exception& e) {
L<<Logger::Error<<"Assigning local query addresses: "<<e.what();
exit(99);
}

SyncRes::s_nopacketcache = ::arg().mustDo("disable-packetcache");

SyncRes::s_maxnegttl=::arg().asNum("max-negative-ttl");
Expand Down