extcap: improve interface print in help.

Change-Id: Ife8e73b6cb1756623e937452fc042d8b31e2554f
Reviewed-on: https://code.wireshark.org/review/17321
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>

4 files changed, 30 insertions, 13 deletions

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 823603264c..df4b5e5ebb 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -2527,7 +2527,21 @@ int main(int argc, char **argv) {
         " %s --extcap-interfaces [--adb-server-ip=<arg>] [--adb-server-tcp-port=<arg>]\n"
         " %s --extcap-interface=INTERFACE --extcap-dlts\n"
         " %s --extcap-interface=INTERFACE --extcap-config\n"
-        " %s --extcap-interface=INTERFACE --fifo=PATH_FILENAME --capture \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",
         argv[0], argv[0], argv[0], argv[0]);
     extcap_help_add_header(extcap_conf, help_header);
     g_free(help_header);
diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c
index 3d5676cac1..619b930373 100644
--- a/extcap/ciscodump.c
+++ b/extcap/ciscodump.c
@@ -543,11 +543,12 @@ int main(int argc, char **argv)
 
 	help_header = g_strdup_printf(
 		" %s --extcap-interfaces\n"
-		" %s --extcap-interface=INTERFACE --extcap-dlts\n"
-		" %s --extcap-interface=INTERFACE --extcap-config\n"
-		" %s --extcap-interface=INTERFACE --remote-host myhost --remote-port 22222 "
+		" %s --extcap-interface=%s --extcap-dlts\n"
+		" %s --extcap-interface=%s --extcap-config\n"
+		" %s --extcap-interface=%s --remote-host myhost --remote-port 22222 "
 		"--remote-username myuser --remote-interface gigabit0/0 "
-		"--fifo=FILENAME --capture\n", argv[0], argv[0], argv[0], argv[0]);
+		"--fifo=FILENAME --capture\n", argv[0], argv[0], CISCODUMP_EXTCAP_INTERFACE, argv[0],
+		CISCODUMP_EXTCAP_INTERFACE, argv[0], CISCODUMP_EXTCAP_INTERFACE);
 	extcap_help_add_header(extcap_conf, help_header);
 	g_free(help_header);
 
diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index 67214395f2..974f7f3947 100644
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -150,10 +150,11 @@ int main(int argc, char *argv[])
 
 	help_header = g_strdup_printf(
 		" %s --extcap-interfaces\n"
-		" %s --extcap-interface=INTERFACE --extcap-dlts\n"
-		" %s --extcap-interface=INTERFACE --extcap-config\n"
-		" %s --extcap-interface=INTERFACE --type dns --count 10 "
-		"--fifo=FILENAME --capture\n", argv[0], argv[0], argv[0], argv[0]);
+		" %s --extcap-interface=%s --extcap-dlts\n"
+		" %s --extcap-interface=%s --extcap-config\n"
+		" %s --extcap-interface=%s --type dns --count 10 "
+		"--fifo=FILENAME --capture\n", argv[0], argv[0], RANDPKT_EXTCAP_INTERFACE, argv[0], RANDPKT_EXTCAP_INTERFACE,
+		argv[0], RANDPKT_EXTCAP_INTERFACE);
 	extcap_help_add_header(extcap_conf, help_header);
 	g_free(help_header);
 
diff --git a/extcap/sshdump.c b/extcap/sshdump.c
index dc4454a486..46d95b43e8 100644
--- a/extcap/sshdump.c
+++ b/extcap/sshdump.c
@@ -332,11 +332,12 @@ int main(int argc, char **argv)
 
 	help_header = g_strdup_printf(
 		" %s --extcap-interfaces\n"
-		" %s --extcap-interface=INTERFACE --extcap-dlts\n"
-		" %s --extcap-interface=INTERFACE --extcap-config\n"
-		" %s --extcap-interface=INTERFACE --remote-host myhost --remote-port 22222 "
+		" %s --extcap-interface=%s --extcap-dlts\n"
+		" %s --extcap-interface=%s --extcap-config\n"
+		" %s --extcap-interface=%s --remote-host myhost --remote-port 22222 "
 		"--remote-username myuser --remote-interface eth2 --remote-capture-bin /bin/dumpcap "
-		"--fifo=FILENAME --capture\n", argv[0], argv[0], argv[0], argv[0]);
+		"--fifo=FILENAME --capture\n", argv[0], argv[0], SSH_EXTCAP_INTERFACE, argv[0],
+		SSH_EXTCAP_INTERFACE, argv[0], SSH_EXTCAP_INTERFACE);
 	extcap_help_add_header(extcap_conf, help_header);
 	g_free(help_header);
 	extcap_help_add_option(extcap_conf, "--help", "print this help");