moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 00:28:48 -05:00
Code Issues Releases Wiki Activity

added time loop to sockfilt.c in order to wait for SO_REUSEADDR;

Browse Source 
added go_sleep() to util.c.
This commit is contained in:
Gunter Knauf 2007-07-12 01:07:49 +00:00
parent 7d56f35388
commit 0878b14f79
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/server/sockfilt.c
View File

@ -399,10 +399,17 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
#endif /* ENABLE_IPV6 */ #endif /* ENABLE_IPV6 */
int flag = 1; int flag = 1;
int rc; int rc;
int maxretr = 100;
if (setsockopt rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&flag, (void *)&flag, sizeof(flag));
sizeof(flag)) < 0) { while ((rc < 0) && maxretr) {
maxretr--;
go_sleep(10);
rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
(void *)&flag, sizeof(flag));
}
if (rc < 0) {
perror("setsockopt(SO_REUSEADDR)"); perror("setsockopt(SO_REUSEADDR)");
} }

32
tests/server/util.c
View File

@ -45,6 +45,9 @@
#ifdef HAVE_NETDB_H #ifdef HAVE_NETDB_H
#include <netdb.h> #include <netdb.h>
#endif #endif
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
#define ENABLE_CURLX_PRINTF #define ENABLE_CURLX_PRINTF
/* make the curlx header define all printf() functions to use the curlx_* /* make the curlx header define all printf() functions to use the curlx_*
@ -159,3 +162,32 @@ char *test2file(long testno)
snprintf(filename, sizeof(filename), TEST_DATA_PATH, path, testno); snprintf(filename, sizeof(filename), TEST_DATA_PATH, path, testno);
return filename; return filename;
} }
void go_sleep(long ms)
{
#ifdef HAVE_POLL_FINE
/* portable subsecond "sleep" */
poll((void *)0, 0, (int)ms);
#else
/* systems without poll() need other solutions */
#ifdef WIN32
/* Windows offers a millisecond sleep */
Sleep(ms);
#elif defined(MSDOS)
delay(ms);
#else
/* Other systems must use select() for this */
struct timeval timeout;
timeout.tv_sec = ms/1000;
ms = ms%1000;
timeout.tv_usec = ms * 1000;
select(0, NULL, NULL, NULL, &timeout);
#endif
#endif
}

2
tests/server/util.h
View File

@ -49,4 +49,6 @@ void win32_cleanup(void);
/* returns the path name to the test case file */ /* returns the path name to the test case file */
char *test2file(long testno); char *test2file(long testno);
void go_sleep(long ms);
#endif /* __SERVER_UTIL_H */ #endif /* __SERVER_UTIL_H */