Re: [Bug 3610] New: kernel-2.6.9 breaks Amanda

@@ -248,9 +248,31 @@
     socklen_t addrlen;
     int nfound;
     int save_errno;
+    int flags;
 
     sock = dgram->socket;
 
+    /* Need to be in non-blocking mode before doing receive,
+     * because select on Linux will return true when there is
+     * a UDP message with checksum error, but receive will
+     * then hang.
+     */
+    flags = fcntl(sock, F_GETFL);
+    if (flags < 0) {
+	    save_errno = errno;
+	    dbprintf(("%s: dgram_recv: fcntl get flags failed %s\n",
+		      debug_prefix(NULL), strerror(save_errno)));
+	    return -1;
+    }		     
+
+    if(fcntl(sock, F_SETFL, flags|O_NONBLOCK) < 0) {
+	    save_errno = errno;
+	    dbprintf(("%s: dgram_recv: fcntl set flags failed %s\n",
+		      debug_prefix(NULL), strerror(save_errno)));
+	    return -1;
+    }		     
+
+ retry:
     FD_ZERO(&ready);
     FD_SET(sock, &ready);
     to.tv_sec = timeout;

@@ -284,6 +306,7 @@
 	    nfound = -1;
 	}
 	errno = save_errno;
+	fcntl(sock, F_SETFL, flags);
 	return nfound;
     }
 

@@ -291,13 +314,19 @@
     size = recvfrom(sock, dgram->data, MAX_DGRAM, 0,
 		    (struct sockaddr *)fromaddr, &addrlen);
     if(size == -1) {
+	if (errno == EINTR || errno == EAGAIN)
+		goto retry;
 	save_errno = errno;
 	dbprintf(("%s: dgram_recv: recvfrom() failed: %s\n",
 		  debug_prefix(NULL),
 		  strerror(save_errno)));
 	errno = save_errno;
+	fcntl(sock, F_SETFL, flags);
 	return -1;
     }
+
+    fcntl(sock, F_SETFL, flags);
+
     dgram->len = size;
     dgram->data[size] = '\0';
     dgram->cur = dgram->data;