pdns_notify: Implement 60 second timeout

diff --git a/pdns/notify.cc b/pdns/notify.cc
index 270aaad3640e9470b26f338a90abcb285ef4a98c..d4457714532f3d4f5bce4ae82234247e6942827e 100644 (file)
--- a/pdns/notify.cc
+++ b/pdns/notify.cc
@@ -121,11 +121,32 @@ try
     }
 
     char buffer[1500];
+    fd_set rfds;
+    FD_ZERO(&rfds);
+    FD_SET(sock, &rfds);
+    int len;
+    struct timeval tv;
+    bool timeout = true;
+
+    for(int tries=0; tries<60; tries++) {
+      tv.tv_sec = 1;
+      tv.tv_usec = 0;
+      if ((len = select(sock+1, &rfds, NULL, &rfds, &tv)) > 0) {
+        len = recv(sock, buffer, sizeof(buffer), 0);
+        timeout = false;
+        break;
+      }
+    }
 
-    int len=recv(sock, buffer, sizeof(buffer),0);
     if(len < 0) {
       cerr<<"Unable to receive notification response from PowerDNS: "+stringerror()<<endl;
       continue;
+    } else if (timeout) {
+      cerr<<"Unable to receive notification response from PowerDNS: Timed out"<<endl;
+      continue;
+    } else if (len == 0) {
+      cerr<<"Unable to receive notification response from PowerDNS: EOF"<<endl;
+      continue;
     }
 
     string packet(buffer, len);