osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

androiddump: check return value in useSndTimeout() (CID 1394378). 

Change-Id: I14109ffe1b9930c464ce2c42767f96b8ba4e5b67
Reviewed-on: https://code.wireshark.org/review/18855
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
This commit is contained in:
Dario Lombardo 2016-11-17 11:33:02 +01:00 committed by Michal Labedzki
parent a90d196ce8
commit 6a91e8aba7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extcap/androiddump.c
View File

@ -250,18 +250,21 @@ static inline int is_specified_interface(char *interface, const char *interface_
}
static void useSndTimeout(socket_handle_t sock) {
int res;
#ifdef _WIN32
const DWORD socket_timeout = SOCKET_SEND_TIMEOUT_MS;
setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char *) &socket_timeout, sizeof(socket_timeout));
res = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char *) &socket_timeout, sizeof(socket_timeout));
#else
const struct timeval socket_timeout = {
.tv_sec = SOCKET_SEND_TIMEOUT_MS / 1000,
.tv_usec = (SOCKET_SEND_TIMEOUT_MS % 1000) * 1000
};
setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &socket_timeout, sizeof(socket_timeout));
res = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &socket_timeout, sizeof(socket_timeout));
#endif
if (res != 0)
g_debug("Can't set socket timeout, using default");
}
static struct extcap_dumper extcap_dumper_open(char *fifo, int encap) {