slightly clean up dnsproxy code to be ComboAddress-native

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

diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index e0e93297582c4de3e0b208bd142b2cdc82feaa95..eec5dd2ee46f818d7e33c93b272cd68cda3b2c53 100644 (file)
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -110,8 +110,7 @@ bool DNSProxy::sendPacket(DNSPacket *p)
 
     ConntrackEntry ce;
     ce.id       = p->d.id;
-    memcpy((void *)&ce.remote,(void *)&p->remote, p->remote.getSocklen()); 
-    ce.addrlen  = p->remote.getSocklen();
+    ce.remote = p->remote;
     ce.outsock  = p->getSocket();
     ce.created  = time( NULL );
 
@@ -189,7 +188,7 @@ void DNSProxy::mainloop(void)
         d.id=i->second.id;
         memcpy(buffer,&d,sizeof(d));  // commit spoofed id
 
-        sendto(i->second.outsock,buffer,len,0,(struct sockaddr*)&i->second.remote,i->second.addrlen);
+        sendto(i->second.outsock, buffer, len, 0, (struct sockaddr*)&i->second.remote, i->second.remote.getSocklen());
         
         DNSPacket p,q;
         p.parse(buffer,len);

diff --git a/pdns/dnsproxy.hh b/pdns/dnsproxy.hh
index f42677c45b6988b50d9a4ffa7a9eb18c83db0c73..ee002a3a3b23f1ffd1b8afcf6ece1245cab5fd77 100644 (file)
--- a/pdns/dnsproxy.hh
+++ b/pdns/dnsproxy.hh
@@ -76,8 +76,7 @@ private:
   struct ConntrackEntry
   {
     uint16_t id;
-    char remote[sizeof(sockaddr_in6)];
-    Utility::socklen_t addrlen;
+    ComboAddress remote;
     int outsock;
     time_t created;
   };