tftpd.c: Fixed sread timeout on Windows by setting it manually

curl · Apr 6, 2013 · a181e7b · a181e7b
1 parent 34fa8d1
commit a181e7b
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
@@ -1196,6 +1196,9 @@ static void sendtftp(struct testcase *test, struct formats *pf)
  */
 static void recvtftp(struct testcase *test, struct formats *pf)
 {
+#if USE_WINSOCK
+  DWORD recvtimeout;
+#endif
   ssize_t n, size;
   recvblock = 0;
 #if defined(HAVE_ALARM) && defined(SIGALRM)
@@ -1265,7 +1268,17 @@ static void recvtftp(struct testcase *test, struct formats *pf)
   alarm(rexmtval);
 #endif
   /* normally times out and quits */
+#ifdef USE_WINSOCK
+  recvtimeout = 10;
+  setsockopt(peer, SOL_SOCKET, SO_RCVTIMEO,
+             (const char*)&recvtimeout, sizeof(recvtimeout));
+#endif
   n = sread(peer, &buf.storage[0], sizeof(buf.storage));
+#ifdef USE_WINSOCK
+  recvtimeout = 0;
+  setsockopt(peer, SOL_SOCKET, SO_RCVTIMEO,
+             (const char*)&recvtimeout, sizeof(recvtimeout));
+#endif
 #ifdef HAVE_ALARM
   alarm(0);
 #endif