further ::arg() stuff

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1270 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index e8ef9411e5ea4211c09271c4367c86189df3ec18..5807e23ef5646d37d3736666bc7cf2261ff3008f 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -188,10 +188,10 @@ void fillSOAData(const string &content, SOAData &data)
   // fill out data with some plausible defaults:
   // 10800 3600 604800 3600
   data.serial=0;
-  data.refresh=arg().asNum("soa-refresh-default");
-  data.retry=arg().asNum("soa-retry-default");
-  data.expire=arg().asNum("soa-expire-default");
-  data.default_ttl=arg().asNum("soa-minimum-ttl");
+  data.refresh=::arg().asNum("soa-refresh-default");
+  data.retry=::arg().asNum("soa-retry-default");
+  data.expire=::arg().asNum("soa-expire-default");
+  data.default_ttl=::arg().asNum("soa-minimum-ttl");
 
   vector<string>parts;
   stringtok(parts,content);
@@ -296,7 +296,7 @@ void DNSPacket::wrapup(void)
 
   stable_sort(rrs.begin(),rrs.end(),rrcomp);
 
-  static bool mustShuffle =arg().mustDo("no-shuffle");
+  static bool mustShuffle =::arg().mustDo("no-shuffle");
 
   if(!d_tcp && !mustShuffle) {
     shuffle(rrs);

diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index ca75f3b0020c4ab2b87d77f9344602c2268a6856..a2564fa39da6568d6411102967fc2c39938abd62 100644 (file)
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -79,7 +79,7 @@ extern StatBag S;
 void UDPNameserver::bindIPv4()
 {
   vector<string>locals;
-  stringtok(locals,arg()["local-address"]," ,");
+  stringtok(locals,::arg()["local-address"]," ,");
 
   if(locals.empty())
     throw AhuException("No local address specified");
@@ -114,15 +114,15 @@ void UDPNameserver::bindIPv4()
       locala.sin_addr.s_addr=*(int*)h->h_addr;
     }
 
-    locala.sin_port=htons(arg().asNum("local-port"));
+    locala.sin_port=htons(::arg().asNum("local-port"));
     
-    if(bind(s, (sockaddr*)&locala,sizeof(locala))<0) {
+    if(::bind(s, (sockaddr*)&locala,sizeof(locala))<0) {
       L<<Logger::Error<<"binding UDP socket to '"+localname+"' port "+lexical_cast<string>(ntohs(locala.sin_port))+": "<<strerror(errno)<<endl;
       throw AhuException("Unable to bind to UDP socket");
     }
     d_highfd=max(s,d_highfd);
     d_sockets.push_back(s);
-    L<<Logger::Error<<"UDP server bound to "<<inet_ntoa(locala.sin_addr)<<":"<<arg().asNum("local-port")<<endl;
+    L<<Logger::Error<<"UDP server bound to "<<inet_ntoa(locala.sin_addr)<<":"<<::arg().asNum("local-port")<<endl;
     FD_SET(s, &d_rfds);
   }
 }
@@ -131,7 +131,7 @@ void UDPNameserver::bindIPv6()
 {
 #if !WIN32 && HAVE_IPV6
   vector<string>locals;
-  stringtok(locals,arg()["local-ipv6"]," ,");
+  stringtok(locals,::arg()["local-ipv6"]," ,");
 
   if(locals.empty())
     return;
@@ -148,7 +148,7 @@ void UDPNameserver::bindIPv6()
       L<<Logger::Warning<<"It is advised to bind to explicit addresses with the --local-ipv6 option"<<endl;
     }
     
-    ComboAddress locala(localname, arg().asNum("local-port"));
+    ComboAddress locala(localname, ::arg().asNum("local-port"));
 
     if(bind(s, (sockaddr*)&locala, sizeof(locala))<0) {
       L<<Logger::Error<<"binding to UDP ipv6 socket: "<<strerror(errno)<<endl;
@@ -156,7 +156,7 @@ void UDPNameserver::bindIPv6()
     }
     d_highfd=max(s,d_highfd);
     d_sockets.push_back(s);
-    L<<Logger::Error<<"UDPv6 server bound to ["<<localname<<"]:"<<arg().asNum("local-port")<<endl;
+    L<<Logger::Error<<"UDPv6 server bound to ["<<localname<<"]:"<<::arg().asNum("local-port")<<endl;
     FD_SET(s, &d_rfds);
   }
 #endif // WIN32
@@ -166,12 +166,12 @@ UDPNameserver::UDPNameserver()
 {
   d_highfd=0;
   FD_ZERO(&d_rfds);  
-  if(!arg()["local-address"].empty())
+  if(!::arg()["local-address"].empty())
     bindIPv4();
-  if(!arg()["local-ipv6"].empty())
+  if(!::arg()["local-ipv6"].empty())
     bindIPv6();
 
-  if(arg()["local-address"].empty() && arg()["local-ipv6"].empty()) 
+  if(::arg()["local-address"].empty() && ::arg()["local-ipv6"].empty()) 
     L<<Logger::Critical<<"PDNS is deaf and mute! Not listening on any interfaces"<<endl;
     
 }