rename DNSPacket::remote to DNSPacket::d_remote

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

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index ae9f6c1c50500b2bfc4e8a1c96efa2608cd3ed8f..f2c474afb1e9f7fbbd770e86154017cb7615abdf 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -200,7 +200,7 @@ void sendout(const DNSDistributor::AnswerData &AD)
   N->send(AD.A);
   numanswered++;
 
-  if(AD.A->remote.getSocklen()==sizeof(sockaddr_in))
+  if(AD.A->d_remote.getSocklen()==sizeof(sockaddr_in))
     numanswered4++;
   else
     numanswered6++;
@@ -248,7 +248,7 @@ void *qthread(void *number)
       continue;                    // packet was broken, try again
     }
 
-    if(P->remote.getSocklen()==sizeof(sockaddr_in))
+    if(P->d_remote.getSocklen()==sizeof(sockaddr_in))
       numreceived4++;
     else
       numreceived6++;
@@ -256,13 +256,13 @@ void *qthread(void *number)
     S.ringAccount("queries", P->qdomain+"/"+P->qtype.getName());
     S.ringAccount("remotes",P->getRemote());
     if(logDNSQueries) 
-      L << Logger::Notice<<"Remote "<< P->remote.toString() <<" wants '" << P->qdomain<<"|"<<P->qtype.getName() << 
+      L << Logger::Notice<<"Remote "<< P->d_remote.toString() <<" wants '" << P->qdomain<<"|"<<P->qtype.getName() << 
         "', do = " <<P->d_dnssecOk <<", bufsize = "<< P->getMaxReplyLen()<<": ";
 
     if((P->d.opcode != Opcode::Notify) && P->couldBeCached() && PC.get(P, &cached)) { // short circuit - does the PacketCache recognize this question?
       if(logDNSQueries)
         L<<"packetcache HIT"<<endl;
-      cached.setRemote(&P->remote);  // inlined
+      cached.setRemote(&P->d_remote);  // inlined
       cached.setSocket(P->getSocket());                               // inlined
       cached.setMaxReplyLen(P->getMaxReplyLen());
       cached.d.rd=P->d.rd; // copy in recursion desired bit 
@@ -274,7 +274,7 @@ void *qthread(void *number)
       avg_latency=(int)(0.999*avg_latency+0.001*diff); // 'EWMA'
       
       numanswered++;
-      if(P->remote.sin4.sin_family==AF_INET)
+      if(P->d_remote.sin4.sin_family==AF_INET)
         numanswered4++;
       else
         numanswered6++;

diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc
index 00fd295f3bdacf8431b8eeff7deb99ae03c33383..350b128a9a73a7d0d761fc1e3a91d7a075afcef6 100644 (file)
--- a/pdns/dnsbackend.cc
+++ b/pdns/dnsbackend.cc
@@ -32,10 +32,10 @@ string DNSBackend::getRemote(DNSPacket *p)
 
 bool DNSBackend::getRemote(DNSPacket *p, struct sockaddr *sa, Utility::socklen_t *len)
 {
-  if(p->remote.getSocklen() < *len)
+  if(p->d_remote.getSocklen() < *len)
     return false;
-  *len=p->remote.getSocklen();
-  memcpy(sa,&p->remote,*len);
+  *len=p->d_remote.getSocklen();
+  memcpy(sa,&p->d_remote,*len);
   return true;
 }
 

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 320f4b8b52ff6a40b4a57aaae8f464a9310f1859..f063c578f32752e71e43921e8c183a1780a3d021 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -62,19 +62,19 @@ const string& DNSPacket::getString()
 
 string DNSPacket::getRemote() const
 {
-  return remote.toString();
+  return d_remote.toString();
 }
 
 uint16_t DNSPacket::getRemotePort() const
 {
-  return remote.sin4.sin_port;
+  return d_remote.sin4.sin_port;
 }
 
 DNSPacket::DNSPacket(const DNSPacket &orig)
 {
   DLOG(L<<"DNSPacket copy constructor called!"<<endl);
   d_socket=orig.d_socket;
-  remote=orig.remote;
+  d_remote=orig.d_remote;
   d_qlen=orig.d_qlen;
   d_dt=orig.d_dt;
   d_compress=orig.d_compress;
@@ -324,7 +324,7 @@ DNSPacket *DNSPacket::replyPacket() const
   DNSPacket *r=new DNSPacket;
   r->setSocket(d_socket);
 
-  r->setRemote(&remote);
+  r->setRemote(&d_remote);
   r->setAnswer(true);  // this implies the allocation of the header
   r->setA(true); // and we are authoritative
   r->setRA(0); // no recursion available
@@ -500,7 +500,7 @@ void DNSPacket::setMaxReplyLen(int bytes)
 //! Use this to set where this packet was received from or should be sent to
 void DNSPacket::setRemote(const ComboAddress *s)
 {
-  remote=*s;
+  d_remote=*s;
 }
 
 void DNSPacket::setSocket(Utility::sock_t sock)

diff --git a/pdns/dnspacket.hh b/pdns/dnspacket.hh
index c9f0092359852787862e20ec94d280c628432e7d..bbfcb10633be543fb0f2f20f5f6811dcd1c55ec2 100644 (file)
--- a/pdns/dnspacket.hh
+++ b/pdns/dnspacket.hh
@@ -135,7 +135,7 @@ public:
 
   //////// DATA !
 
-  ComboAddress remote;
+  ComboAddress d_remote;
   uint16_t qclass;  //!< class of the question - should always be INternet 2
   struct dnsheader d; //!< dnsheader at the start of the databuffer 12
 

diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index b835d495f59fb78e7980ce9201b4846e6d2c0424..143e1cf99e7b246ac4d315596267ebd0155a9387 100644 (file)
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -85,7 +85,7 @@ void DNSProxy::onlyFrom(const string &ips)
 
 bool DNSProxy::recurseFor(DNSPacket* p)
 {
-  return d_ng.match((ComboAddress *)&p->remote);
+  return d_ng.match((ComboAddress *)&p->d_remote);
 }
 
 /** returns false if p->remote is not allowed to recurse via us */
@@ -101,7 +101,7 @@ bool DNSProxy::sendPacket(DNSPacket *p)
 
     ConntrackEntry ce;
     ce.id       = p->d.id;
-    ce.remote = p->remote;
+    ce.remote = p->d_remote;
     ce.outsock  = p->getSocket();
     ce.created  = time( NULL );
     ce.qtype = p->qtype.getCode();

diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 61d064cc2e3a9a207af3051c87fdfbec05bc3345..d6319e1edf125855b60b0cb809a1bcdc217d8f80 100644 (file)
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -183,7 +183,7 @@ void UDPNameserver::send(DNSPacket *p)
   if(buffer.length() > p->getMaxReplyLen()) {
     cerr<<"Weird, trying to send a message that needs truncation, "<< buffer.length()<<" > "<<p->getMaxReplyLen()<<endl;
   }
-  if(sendto(p->getSocket(),buffer.c_str(), buffer.length(), 0, (struct sockaddr *)(&p->remote), p->remote.getSocklen()) < 0)
+  if(sendto(p->getSocket(),buffer.c_str(), buffer.length(), 0, (struct sockaddr *)(&p->d_remote), p->d_remote.getSocklen()) < 0)
     L<<Logger::Error<<"Error sending reply with sendto (socket="<<p->getSocket()<<"): "<<strerror(errno)<<endl;
 }
 

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 4a279498c21a2a39687ce4086a50493715b6938d..b6ccbb56988ef82b8e5f3c44aa6a302a9daede2a 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -873,7 +873,7 @@ int PacketHandler::processNotify(DNSPacket *p)
   }
     
   // ok, we've done our checks
-  Communicator.addSlaveCheckRequest(di, p->remote);
+  Communicator.addSlaveCheckRequest(di, p->d_remote);
   return 0;
 }
 

diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index cc43f14852ddce7efe1f2af8ad0cca981489aecd..5f730a5d66d0b1d2ba47b0816538b1dd4d704daf 100644 (file)
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -283,14 +283,14 @@ void *TCPNameserver::doConnection(void *data)
       shared_ptr<DNSPacket> reply; 
       shared_ptr<DNSPacket> cached= shared_ptr<DNSPacket>(new DNSPacket);
       if(logDNSQueries) 
-        L << Logger::Notice<<"TCP Remote "<< packet->remote.toString() <<" wants '" << packet->qdomain<<"|"<<packet->qtype.getName() << 
+        L << Logger::Notice<<"TCP Remote "<< packet->d_remote.toString() <<" wants '" << packet->qdomain<<"|"<<packet->qtype.getName() << 
         "', do = " <<packet->d_dnssecOk <<", bufsize = "<< packet->getMaxReplyLen()<<": ";
 
 
       if(!packet->d.rd && packet->couldBeCached() && PC.get(packet.get(), cached.get())) { // short circuit - does the PacketCache recognize this question?
         if(logDNSQueries)
           L<<"packetcache HIT"<<endl;
-        cached->setRemote(&packet->remote);
+        cached->setRemote(&packet->d_remote);
         cached->d.id=packet->d.id;
         cached->d.rd=packet->d.rd; // copy in recursion desired bit 
         cached->commitD(); // commit d to the packet                        inlined
@@ -381,7 +381,7 @@ bool TCPNameserver::canDoAXFR(shared_ptr<DNSPacket> q)
   }
     
 
-  if(!::arg().mustDo("per-zone-axfr-acls") && (::arg()["allow-axfr-ips"].empty() || d_ng.match( (ComboAddress *) &q->remote )))
+  if(!::arg().mustDo("per-zone-axfr-acls") && (::arg()["allow-axfr-ips"].empty() || d_ng.match( (ComboAddress *) &q->d_remote )))
     return true;
 #if 0
   if(::arg().mustDo("per-zone-axfr-acls")) {