Changeset 673

Timestamp:

04/10/06 17:53:19 (4 years ago)

Author:

ahu

Message:

Try to prevent the 'Oops, sent partial answer' error, and made it more informative in case it does happen

Files:

• trunk/pdns/pdns/pdns_recursor.cc (modified) (4 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -186 +186 @@
 }
 
-void setReceiveBuffer(int fd, uint32_t size)
+void setBuffer(int fd, int optname, uint32_t size)
 {
   uint32_t psize=0;
   socklen_t len=sizeof(psize);
   
-  if(!getsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&psize, &len) && psize > size) {
+  if(!getsockopt(fd, SOL_SOCKET, optname, (char*)&psize, &len) && psize > size) {
     L<<Logger::Error<<"Not decreasing socket buffer size from "<<psize<<" to "<<size<<endl;
     return; 
   }
 
-  if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&size, sizeof(size)) < 0 )
+  if (setsockopt(fd, SOL_SOCKET, optname, (char*)&size, sizeof(size)) < 0 )
     L<<Logger::Error<<"Warning: unable to raise socket buffer size to "<<size<<": "<<strerror(errno)<<endl;
 }
 
+
+static void setReceiveBuffer(int fd, uint32_t size)
+{
+  setBuffer(fd, SO_RCVBUF, size);
+}
+
+static void setSendBuffer(int fd, uint32_t size)
+{
+  setBuffer(fd, SO_SNDBUF, size);
+}
 
 static void writePid(void)
@@ -346 +356 @@
         L<<Logger::Error<<"Error writing TCP answer to "<<dc->getRemote()<<": "<< (ret ? strerror(errno) : "EOF") <<endl;
       else if((unsigned int)ret != 2 + packet.size())
-        L<<Logger::Error<<"Oops, partial answer sent to "<<dc->getRemote()<<" - probably would have trouble receiving our answer anyhow (size="<<packet.size()<<")"<<endl;
+        L<<Logger::Error<<"Oops, partial answer sent to "<<dc->getRemote()<<" for "<<dc->d_mdp.d_qname<<" (size="<< (2 + packet.size()) <<", sent "<<ret<<")"<<endl;
     }
 
@@ -466 +476 @@
     
     Utility::setNonBlocking(fd);
+    setSendBuffer(fd, 65000);
     listen(fd, 128);
     s_tcpserversocks.push_back(fd);
@@ -939 +950 @@
             }
             catch(MOADNSException& mde) {
-              L<<Logger::Error<<"Unable to parse packet from remote udp client "<< sockAddrToString((struct sockaddr_in*) &fromaddr, addrlen) <<": "<<mde.what()<<endl;
+              L<<Logger::Error<<"Unable to parse packet from remote UDP client "<< sockAddrToString((struct sockaddr_in*) &fromaddr, addrlen) <<": "<<mde.what()<<endl;
             }
           }