Ticket #673: network_timeout.patch

stream/udp.c

@@ -66 +66 @@
     return -1;
   }
 
+#if (defined SO_RCVTIMEO && defined SO_SNDTIMEO)
+  tv.tv_sec = 10;
+  tv.tv_usec = 0;
+  err = setsockopt (socket_server_fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+  if (err < 0) {
+          perror ("setsockopt");
+  }
+  err = setsockopt (socket_server_fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+  if (err < 0) {
+          perror ("setsockopt");
+  }
+#endif
+
   if (isalpha (url->hostname[0]))
   {
 #ifndef HAVE_WINSOCK2

stream/tcp.c

@@ -86 +86 @@
                 return TCP_ERROR_FATAL;
         }
 
+#if (defined SO_RCVTIMEO && defined SO_SNDTIMEO)
+        tv.tv_sec = 10;
+        tv.tv_usec = 0;
+        ret = setsockopt(socket_server_fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+        if (ret < 0) {
+                perror("setsockopt");
+        }
+        ret = setsockopt(socket_server_fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+        if (ret < 0) {
+                perror("setsockopt");
+        }
+#endif
+
         switch (af) {
                 case AF_INET:  our_s_addr = (void *) &server_address.four.sin_addr; break;
 #ifdef HAVE_AF_INET6