Changeset 440

Timestamp:

07/11/05 20:27:36 (8 years ago)

Author:

ahu

Message:

fix TCP related crashes due to HUUUUGE daum.net records (3.5kbyte!)

Location:

trunk/pdns/pdns

Files:

• lwres.cc (modified) (3 diffs)
• pdns_recursor.cc (modified) (1 diff)
• syncres.cc (modified) (1 diff)

trunk/pdns/pdns/lwres.cc

@@ -92 +92 @@
   }
   else {
+    //    cerr<<"do tcp"<<endl;
     Socket s(InterNetwork, Stream);
     IPEndpoint ie(ip, 53);
@@ -97 +98 @@
     s.connect(ie);
 
-    int len=htons(p.len);
+    unsigned int len=htons(p.len);
     char *lenP=(char*)&len;
     const char *msgP=p.getData();
@@ -122 +123 @@
       return 0;
     }
-
+    if(len > d_bufsize) {
+      d_bufsize=len;
+      delete[] d_buf;
+      d_buf = new unsigned char[d_bufsize];
+    }
     memcpy(d_buf, packet.c_str(), len);
     d_len=len;

trunk/pdns/pdns/pdns_recursor.cc

@@ -247 +247 @@
 
     if(!R->d_tcp) {
-      if(R->len > 512) 
+      if(R->len > 512) {
         R->truncate(512);
+      }
 
       sendto(R->getSocket(),buffer,R->len,0,(struct sockaddr *)(R->remote),R->d_socklen);

trunk/pdns/pdns/syncres.cc

@@ -412 +412 @@
 
       result=d_lwr.result();
-
+      
       if(d_lwr.d_tcbit) {
         if(!doTCP) {