aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bezold <florian.bezold@esrlabs.com>2017-12-06 11:31:18 +0100
committerMichael Mann <mmann78@netscape.net>2018-01-28 21:57:34 +0000
commit20d4c7bb62fc8641643e1101b215bd4c2e6e23b0 (patch)
tree21daeeec0e44cbddc2f5eff8f0daeb9a72a78789
parent3d94f624d152068cd597e139d5807357fa285ac6 (diff)
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>
-rw-r--r--extcap/androiddump.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 04c838f6ad..2969a33cf7 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -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 */