generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marc Hoersken 2013-04-06 14:39:56 +02:00
parent 34fa8d1e38
commit a181e7b084
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/server/tftpd.c
View File

@ -1196,6 +1196,9 @@ static void sendtftp(struct testcase *test, struct formats *pf)
*/ */
static void recvtftp(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; ssize_t n, size;
recvblock = 0; recvblock = 0;
#if defined(HAVE_ALARM) && defined(SIGALRM) #if defined(HAVE_ALARM) && defined(SIGALRM)
@ -1265,7 +1268,17 @@ send_ack:
alarm(rexmtval); alarm(rexmtval);
#endif #endif
/* normally times out and quits */ /* 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)); 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 #ifdef HAVE_ALARM
alarm(0); alarm(0);
#endif #endif