romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-30 13:28:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

tftpd.c: Follow up cleanup and restore of previous sockopt

Browse source
This commit is contained in:
Marc Hoersken 2013-04-06 17:18:13 +02:00
parent 090b55c100
commit 9474c4a9a5
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/server/tftpd.c
View file

@ -1196,8 +1196,8 @@ static void sendtftp(struct testcase *test, struct formats *pf)
*/
static void recvtftp(struct testcase *test, struct formats *pf)
{
#if USE_WINSOCK
DWORD recvtimeout;
#ifdef USE_WINSOCK
DWORD recvtimeout, recvtimeoutbak;
#endif
ssize_t n, size;
recvblock = 0;
@ -1269,13 +1269,16 @@ send_ack:
#endif
/* normally times out and quits */
#ifdef USE_WINSOCK
recvtimeout = sizeof(recvtimeoutbak);
getsockopt(peer, SOL_SOCKET, SO_RCVTIMEO,
(char*)&recvtimeoutbak, (int*)&recvtimeout);
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;
recvtimeout = recvtimeoutbak;
setsockopt(peer, SOL_SOCKET, SO_RCVTIMEO,
(const char*)&recvtimeout, sizeof(recvtimeout));
#endif