From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sat, 3 Apr 2010 14:23:11 +0000 (+0000)
Subject: slightly clean up dnsproxy code to be ComboAddress-native
X-Git-Tag: rec-3.3~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d183f84e1eda535685cb24329717cafdbd789fe;p=pdns

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 e0e932975..eec5dd2ee 100644
--- 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 f42677c45..ee002a3a3 100644
--- 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;
   };