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

androiddump: Raise ADB timeout to 2s for slower devices 

Running "tcpdump -D" on target seems to be a expensive operation in some
cases, not finishing within the 500ms timeout on several devices (~1000 ms
in one of our cases).

Change-Id: I57e4d31f12c4e393ff84e79b64cb024b74a11f0e
Reviewed-on: https://code.wireshark.org/review/24719
Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Florian Bezold 2017-12-06 11:31:18 +01:00 committed by Michael Mann
parent 3d94f624d1
commit 20d4c7bb62
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extcap/androiddump.c
View File

@ -118,7 +118,7 @@
#define PACKET_LENGTH 65535
#define SOCKET_RW_TIMEOUT_MS 500
#define SOCKET_RW_TIMEOUT_MS 2000
#define SOCKET_CONNECT_TIMEOUT_TRIES 10
#define SOCKET_CONNECT_DELAY_US 1000 /* (1000us = 1ms) * SOCKET_CONNECT_TIMEOUT_TRIES (10) = 10ms worst-case */