aboutsummaryrefslogtreecommitdiffstats
path: root/extcap
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2016-09-12 19:49:50 +0200
committerMichael Mann <mmann78@netscape.net>2016-10-19 12:20:05 +0000
commitb4f86c9cb84c8cefcf0784fa1bbe10a89392da74 (patch)
tree7d2e5e07680a28c6080440fb787b9310b6b3794f /extcap
parent4ef14c76513acb92e75c87a1f987c8c9c18fabc6 (diff)
androiddump: Fix help - interfaces
Fix help output that describes interfaces provided by tool to reflect reality - add missed DEVICE_ID that is part of interface. Change-Id: Ib6374db28d8d4696ce27c5358da49d3ebfcf31e1 Reviewed-on: https://code.wireshark.org/review/18267 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'extcap')
-rw-r--r--extcap/androiddump.c35
1 files changed, 21 insertions, 14 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 7960f29b85..9589d4e9e1 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -2565,20 +2565,27 @@ int main(int argc, char **argv) {
" %s --extcap-interface=INTERFACE --extcap-dlts\n"
" %s --extcap-interface=INTERFACE --extcap-config\n"
" %s --extcap-interface=INTERFACE --fifo=PATH_FILENAME --capture\n"
- "\nINTERFACE can be:\n\n"
- "\tandroid-logcat-main\n"
- "\tandroid-logcat-system\n"
- "\tandroid-logcat-radio\n"
- "\tandroid-logcat-events\n"
- "\tandroid-logcat-text-main\n"
- "\tandroid-logcat-text-system\n"
- "\tandroid-logcat-text-radio\n"
- "\tandroid-logcat-text-events\n"
- "\tandroid-logcat-text-crash\n"
- "\tandroid-bluetooth-hcidump\n"
- "\tandroid-bluetooth-external-parser\n"
- "\tandroid-bluetooth-btsnoop-net\n"
- "\tandroid-wifi-tcpdump\n",
+ "\nINTERFACE has the form TYPE-DEVICEID:\n"
+ "\t""For example: "INTERFACE_ANDROID_BLUETOOTH_BTSNOOP_NET"-W3D7N15C29005648""\n"
+ "\n"
+ "\tTYPE is one of:\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_MAIN"\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_SYSTEM"\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_RADIO"\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_EVENTS"\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_TEXT_MAIN"\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_TEXT_SYSTEM"\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_TEXT_RADIO"\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_TEXT_EVENTS"\n"
+ "\t"INTERFACE_ANDROID_LOGCAT_TEXT_CRASH"\n"
+ "\t"INTERFACE_ANDROID_BLUETOOTH_HCIDUMP"\n"
+ "\t"INTERFACE_ANDROID_BLUETOOTH_EXTERNAL_PARSER"\n"
+ "\t"INTERFACE_ANDROID_BLUETOOTH_BTSNOOP_NET"\n"
+ "\t"INTERFACE_ANDROID_WIFI_TCPDUMP"\n"
+ "\n"
+ "\t""DEVICEID is the identifier of the device provided by Android SDK (see \"adb devices\")\n"
+ "\t""For example: W3D7N15C29005648""\n",
+
argv[0], argv[0], argv[0], argv[0]);
extcap_help_add_header(extcap_conf, help_header);
g_free(help_header);