From 20d4c7bb62fc8641643e1101b215bd4c2e6e23b0 Mon Sep 17 00:00:00 2001 From: Florian Bezold Date: Wed, 6 Dec 2017 11:31:18 +0100 Subject: [PATCH] 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 Reviewed-by: Michael Mann --- extcap/androiddump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */