Index: /trunk/pdns/pdns/common_startup.cc
===================================================================
--- /trunk/pdns/pdns/common_startup.cc	(revision 2217)
+++ /trunk/pdns/pdns/common_startup.cc	(revision 2230)
@@ -201,5 +201,5 @@
   numanswered++;
 
-  if(AD.A->remote.getSocklen()==sizeof(sockaddr_in))
+  if(AD.A->d_remote.getSocklen()==sizeof(sockaddr_in))
     numanswered4++;
   else
@@ -249,5 +249,5 @@
     }
 
-    if(P->remote.getSocklen()==sizeof(sockaddr_in))
+    if(P->d_remote.getSocklen()==sizeof(sockaddr_in))
       numreceived4++;
     else
@@ -257,5 +257,5 @@
     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()<<": ";
 
@@ -263,5 +263,5 @@
       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());
@@ -275,5 +275,5 @@
       
       numanswered++;
-      if(P->remote.sin4.sin_family==AF_INET)
+      if(P->d_remote.sin4.sin_family==AF_INET)
         numanswered4++;
       else
Index: /trunk/pdns/pdns/packethandler.cc
===================================================================
--- /trunk/pdns/pdns/packethandler.cc	(revision 2224)
+++ /trunk/pdns/pdns/packethandler.cc	(revision 2230)
@@ -874,5 +874,5 @@
     
   // ok, we've done our checks
-  Communicator.addSlaveCheckRequest(di, p->remote);
+  Communicator.addSlaveCheckRequest(di, p->d_remote);
   return 0;
 }
Index: /trunk/pdns/pdns/nameserver.cc
===================================================================
--- /trunk/pdns/pdns/nameserver.cc	(revision 2022)
+++ /trunk/pdns/pdns/nameserver.cc	(revision 2230)
@@ -184,5 +184,5 @@
     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;
 }
Index: /trunk/pdns/pdns/dnsproxy.cc
===================================================================
--- /trunk/pdns/pdns/dnsproxy.cc	(revision 2210)
+++ /trunk/pdns/pdns/dnsproxy.cc	(revision 2230)
@@ -86,5 +86,5 @@
 bool DNSProxy::recurseFor(DNSPacket* p)
 {
-  return d_ng.match((ComboAddress *)&p->remote);
+  return d_ng.match((ComboAddress *)&p->d_remote);
 }
 
@@ -102,5 +102,5 @@
     ConntrackEntry ce;
     ce.id       = p->d.id;
-    ce.remote = p->remote;
+    ce.remote = p->d_remote;
     ce.outsock  = p->getSocket();
     ce.created  = time( NULL );
Index: /trunk/pdns/pdns/dnspacket.hh
===================================================================
--- /trunk/pdns/pdns/dnspacket.hh	(revision 2034)
+++ /trunk/pdns/pdns/dnspacket.hh	(revision 2230)
@@ -136,5 +136,5 @@
   //////// 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
Index: /trunk/pdns/pdns/dnsbackend.cc
===================================================================
--- /trunk/pdns/pdns/dnsbackend.cc	(revision 1871)
+++ /trunk/pdns/pdns/dnsbackend.cc	(revision 2230)
@@ -33,8 +33,8 @@
 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;
 }
Index: /trunk/pdns/pdns/tcpreceiver.cc
===================================================================
--- /trunk/pdns/pdns/tcpreceiver.cc	(revision 2140)
+++ /trunk/pdns/pdns/tcpreceiver.cc	(revision 2230)
@@ -284,5 +284,5 @@
       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()<<": ";
 
@@ -291,5 +291,5 @@
         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 
@@ -382,5 +382,5 @@
     
 
-  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
Index: /trunk/pdns/pdns/dnspacket.cc
===================================================================
--- /trunk/pdns/pdns/dnspacket.cc	(revision 2210)
+++ /trunk/pdns/pdns/dnspacket.cc	(revision 2230)
@@ -63,10 +63,10 @@
 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;
 }
 
@@ -75,5 +75,5 @@
   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;
@@ -325,5 +325,5 @@
   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
@@ -501,5 +501,5 @@
 void DNSPacket::setRemote(const ComboAddress *s)
 {
-  remote=*s;
+  d_remote=*s;
 }