diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-25 20:49:43 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-02-26 03:14:44 +0000 |
| commit | 043ed1f6b3aba51331c7129e25934c440e32f4e9 (patch) | |
| tree | d61222e7d725d4d83968d8d63737b79c5e05045a /extcap | |
| parent | 3cc899a428a9203d774987c333dab0edaca6e6e1 (diff) | |
androiddump: Set connect socket to non-blocking on Windows
Bug: 13104
Change-Id: I05248dad8e72272cf0933c766ec0bf5160075e1e
Reviewed-on: https://code.wireshark.org/review/20275
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/androiddump.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 521c36dfbf..6b2c19d496 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -279,9 +279,13 @@ static void useNonBlockingConnectTimeout(socket_handle_t sock) { int res_rcv; #ifdef _WIN32 const DWORD socket_timeout = SOCKET_RW_TIMEOUT_MS; + unsigned long non_blocking = 1; res_snd = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char *) &socket_timeout, sizeof(socket_timeout)); res_rcv = setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char *) &socket_timeout, sizeof(socket_timeout)); + + /* set socket to non-blocking */ + ioctlsocket(sock, FIONBIO, &non_blocking); #else const struct timeval socket_timeout = { .tv_sec = SOCKET_RW_TIMEOUT_MS / 1000, |