extcap: put missed parameters into the help

"--debug" and "--extcap-version" are part of extcap-base helper,
do not hide them.

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

7 files changed, 4 insertions, 8 deletions

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 7e6bd5f7fe..7960f29b85 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -2584,8 +2584,6 @@ int main(int argc, char **argv) {
     g_free(help_header);
 
     extcap_help_add_option(extcap_conf, "--help", "print this help");
-    extcap_help_add_option(extcap_conf, "--version", "print the version");
-    extcap_help_add_option(extcap_conf, "--verbose", "verbose mode");
     extcap_help_add_option(extcap_conf, "--adb-server-ip <IP>", "the IP address of the ADB server");
     extcap_help_add_option(extcap_conf, "--adb-server-tcp-port <port>", "the TCP port of the ADB server");
     extcap_help_add_option(extcap_conf, "--logcat-text <text>", "logcat text");
diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c
index 159b8d334f..358473cd0a 100644
--- a/extcap/ciscodump.c
+++ b/extcap/ciscodump.c
@@ -556,7 +556,6 @@ int main(int argc, char **argv)
 
 	extcap_help_add_option(extcap_conf, "--help", "print this help");
 	extcap_help_add_option(extcap_conf, "--version", "print the version");
-	extcap_help_add_option(extcap_conf, "--verbose", "print more messages");
 	extcap_help_add_option(extcap_conf, "--remote-host <host>", "the remote SSH host");
 	extcap_help_add_option(extcap_conf, "--remote-port <port>", "the remote SSH port (default: 22)");
 	extcap_help_add_option(extcap_conf, "--remote-username <username>", "the remote SSH username (default: the current user)");
diff --git a/extcap/extcap-base.c b/extcap/extcap-base.c
index f344d2edd4..dd20f3bac5 100644
--- a/extcap/extcap-base.c
+++ b/extcap/extcap-base.c
@@ -328,6 +328,8 @@ void extcap_help_add_header(extcap_parameters * extcap, char * help_header)
     extcap_help_add_option(extcap, "--capture", "run the capture");
     extcap_help_add_option(extcap, "--extcap-capture-filter <filter>", "the capture filter");
     extcap_help_add_option(extcap, "--fifo <file>", "dump data to file or fifo");
+    extcap_help_add_option(extcap, "--extcap-version", "print tool version");
+    extcap_help_add_option(extcap, "--debug", "print additional messages");
 }
 
 /*
diff --git a/extcap/extcap-base.h b/extcap/extcap-base.h
index fecfb4cdd8..36348f8e66 100644
--- a/extcap/extcap-base.h
+++ b/extcap/extcap-base.h
@@ -84,7 +84,6 @@
 
 
 #define EXTCAP_BASE_OPTIONS \
-	{ "debug", optional_argument, NULL, EXTCAP_OPT_DEBUG}, \
 	{ "extcap-interfaces", no_argument, NULL, EXTCAP_OPT_LIST_INTERFACES}, \
 	{ "extcap-version", optional_argument, NULL, EXTCAP_OPT_VERSION}, \
 	{ "extcap-dlts", no_argument, NULL, EXTCAP_OPT_LIST_DLTS}, \
@@ -92,7 +91,8 @@
 	{ "extcap-config", no_argument, NULL, EXTCAP_OPT_CONFIG}, \
 	{ "capture", no_argument, NULL, EXTCAP_OPT_CAPTURE}, \
 	{ "extcap-capture-filter", required_argument,	NULL, EXTCAP_OPT_CAPTURE_FILTER}, \
-	{ "fifo", required_argument, NULL, EXTCAP_OPT_FIFO} \
+	{ "fifo", required_argument, NULL, EXTCAP_OPT_FIFO}, \
+	{ "debug", optional_argument, NULL, EXTCAP_OPT_DEBUG} \
 
 #if defined(_WIN32)
 	BOOLEAN IsHandleRedirected(DWORD handle);
diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index 16e4edec09..6dc7b8f5fb 100644
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -161,7 +161,6 @@ int main(int argc, char *argv[])
 
 	extcap_help_add_option(extcap_conf, "--help", "print this help");
 	extcap_help_add_option(extcap_conf, "--version", "print the version");
-	extcap_help_add_option(extcap_conf, "--verbose", "verbose mode");
 	extcap_help_add_option(extcap_conf, "--maxbytes <bytes>", "max bytes per pack");
 	extcap_help_add_option(extcap_conf, "--count <num>", "number of packets to generate");
 	extcap_help_add_option(extcap_conf, "--random-type", "one random type is chosen for all packets");
diff --git a/extcap/sshdump.c b/extcap/sshdump.c
index bda8c81a7a..08a36c38be 100644
--- a/extcap/sshdump.c
+++ b/extcap/sshdump.c
@@ -366,7 +366,6 @@ int main(int argc, char **argv)
 	g_free(help_header);
 	extcap_help_add_option(extcap_conf, "--help", "print this help");
 	extcap_help_add_option(extcap_conf, "--version", "print the version");
-	extcap_help_add_option(extcap_conf, "--verbose", "print more messages");
 	extcap_help_add_option(extcap_conf, "--remote-host <host>", "the remote SSH host");
 	extcap_help_add_option(extcap_conf, "--remote-port <port>", "the remote SSH port (default: 22)");
 	extcap_help_add_option(extcap_conf, "--remote-username <username>", "the remote SSH username (default: the current user)");
diff --git a/extcap/udpdump.c b/extcap/udpdump.c
index a83b7215d6..4ad0f616f8 100644
--- a/extcap/udpdump.c
+++ b/extcap/udpdump.c
@@ -308,7 +308,6 @@ int main(int argc, char *argv[])
 	g_free(help_header);
 	extcap_help_add_option(extcap_conf, "--help", "print this help");
 	extcap_help_add_option(extcap_conf, "--version", "print the version");
-	extcap_help_add_option(extcap_conf, "--verbose", "print more messages");
 	port_msg = g_strdup_printf("the port to listens on. Default: %u", UDPDUMP_DEFAULT_PORT);
 	extcap_help_add_option(extcap_conf, "--port <port>", port_msg);
 	g_free(port_msg);