From 22db1f066fb38de335d77372986363e829229ac4 Mon Sep 17 00:00:00 2001 From: Mikael Kanstrup Date: Mon, 19 Nov 2018 13:30:13 +0100 Subject: [PATCH] androiddump: Don't present the verbose config option The verbose config option has been replaced by an extcap base debug option. Presenting verbose as an available option makes Wireshark trying to retrieve the value of this option. As the option is not really supported and invalid options after a recent change now generate errors the androiddump tool does not start properly. For reference the problem happens due the unfortunate combo of these two patches: v2.3.0rc0-1108-gb83ea46 ("extcap: put missed parameters into the help") v2.9.0rc0-2431-g945d441 ("extcap: fix return value in extcap_base_parse_options().") Fix by removing verbose as an available config option. Change-Id: I894f599708a7160f50ca9ee1f9586022342705cb Reviewed-on: https://code.wireshark.org/review/30716 Petri-Dish: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- extcap/androiddump.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/extcap/androiddump.c b/extcap/androiddump.c index fd9b8fa16f..979a3704c1 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -1272,14 +1272,12 @@ static int list_config(char *interface) { printf("arg {number=%u}{call=--bt-forward-socket}{display=Forward Bluetooth Socket}{type=boolean}{default=false}\n", inc++); printf("arg {number=%u}{call=--bt-local-ip}{display=Bluetooth Local IP Address}{type=string}{default=127.0.0.1}\n", inc++); printf("arg {number=%u}{call=--bt-local-tcp-port}{display=Bluetooth Local TCP Port}{type=integer}{range=0,65535}{default=4330}{tooltip=Used to do \"adb forward tcp:LOCAL_TCP_PORT tcp:SERVER_TCP_PORT\"}\n", inc++); - printf("arg {number=%u}{call=--verbose}{display=Verbose/Debug output on console}{type=boolean}{default=false}\n", inc++); ret = EXIT_CODE_SUCCESS; } else if (is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_HCIDUMP) || is_specified_interface(interface, INTERFACE_ANDROID_BLUETOOTH_BTSNOOP_NET) || is_specified_interface(interface, INTERFACE_ANDROID_TCPDUMP)) { printf("arg {number=%u}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n", inc++); printf("arg {number=%u}{call=--adb-server-tcp-port}{display=ADB Server TCP Port}{type=integer}{range=0,65535}{default=5037}\n", inc++); - printf("arg {number=%u}{call=--verbose}{display=Verbose/Debug output on console}{type=boolean}{default=false}\n", inc++); ret = EXIT_CODE_SUCCESS; } else if (is_logcat_interface(interface)) { printf("arg {number=%u}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n", inc++); @@ -1287,14 +1285,12 @@ static int list_config(char *interface) { printf("arg {number=%u}{call=--logcat-text}{display=Use text logcat}{type=boolean}{default=false}\n", inc++); printf("arg {number=%u}{call=--logcat-ignore-log-buffer}{display=Ignore log buffer}{type=boolean}{default=false}\n", inc++); printf("arg {number=%u}{call=--logcat-custom-options}{display=Custom logcat parameters}{type=string}\n", inc++); - printf("arg {number=%u}{call=--verbose}{display=Verbose/Debug output on console}{type=boolean}{default=false}\n", inc++); ret = EXIT_CODE_SUCCESS; } else if (is_logcat_text_interface(interface)) { printf("arg {number=%u}{call=--adb-server-ip}{display=ADB Server IP Address}{type=string}{default=127.0.0.1}\n", inc++); printf("arg {number=%u}{call=--adb-server-tcp-port}{display=ADB Server TCP Port}{type=integer}{range=0,65535}{default=5037}\n", inc++); printf("arg {number=%u}{call=--logcat-ignore-log-buffer}{display=Ignore log buffer}{type=boolean}{default=false}\n", inc++); printf("arg {number=%u}{call=--logcat-custom-options}{display=Custom logcat parameters}{type=string}\n", inc++); - printf("arg {number=%u}{call=--verbose}{display=Verbose/Debug output on console}{type=boolean}{default=false}\n", inc++); ret = EXIT_CODE_SUCCESS; }