Changeset 1549

Timestamp:

04/03/10 16:23:11 (3 years ago)

Author:

ahu

Message:

slightly clean up dnsproxy code to be ComboAddress?-native

Location:

trunk/pdns/pdns

Files:

• dnsproxy.cc (modified) (2 diffs)
• dnsproxy.hh (modified) (1 diff)

trunk/pdns/pdns/dnsproxy.cc

@@ -111 +111 @@
     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 );
@@ -190 +189 @@
         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;

trunk/pdns/pdns/dnsproxy.hh

@@ -77 +77 @@
   {
     uint16_t id;
-    char remote[sizeof(sockaddr_in6)];
-    Utility::socklen_t addrlen;
+    ComboAddress remote;
     int outsock;
     time_t created;