Changeset 1270

Timestamp:

11/15/08 20:34:19 (5 years ago)

Author:

ahu

Message:

further ::arg() stuff

Location:

trunk/pdns/pdns

Files:

• dnspacket.cc (modified) (2 diffs)
• nameserver.cc (modified) (7 diffs)

trunk/pdns/pdns/dnspacket.cc

@@ -189 +189 @@
   // 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;
@@ -297 +297 @@
   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) {

trunk/pdns/pdns/nameserver.cc

@@ -80 +80 @@
 {
   vector<string>locals;
-  stringtok(locals,arg()["local-address"]," ,");
+  stringtok(locals,::arg()["local-address"]," ,");
 
   if(locals.empty())
@@ -115 +115 @@
     }
 
-    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");
@@ -123 +123 @@
     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);
   }
@@ -132 +132 @@
 #if !WIN32 && HAVE_IPV6
   vector<string>locals;
-  stringtok(locals,arg()["local-ipv6"]," ,");
+  stringtok(locals,::arg()["local-ipv6"]," ,");
 
   if(locals.empty())
@@ -149 +149 @@
     }
     
-    ComboAddress locala(localname, arg().asNum("local-port"));
+    ComboAddress locala(localname, ::arg().asNum("local-port"));
 
     if(bind(s, (sockaddr*)&locala, sizeof(locala))<0) {
@@ -157 +157 @@
     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);
   }
@@ -167 +167 @@
   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;