extcap: set help page for all extcaps.

They've been set to the manpage of the local filesystem.

Ping-Bug: 13218
Change-Id: Iacd5d2ba7ae39ee1718b59747c245d1c07785e8f
Reviewed-on: https://code.wireshark.org/review/19179
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: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 0af6f2de556ae24dfeed6a8a941f2be9657abee9..e38d4b3f0b3119a0bb6657b26962f77dba98bb59 100644 (file)
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <time.h>
 #include <wsutil/strtoi.h>
+#include <wsutil/filesystem.h>
 
 #ifdef HAVE_NETINET_IN_H
 #    include <netinet/in.h>
@@ -2590,7 +2591,7 @@ int main(int argc, char **argv) {
     extcap_conf = g_new0(extcap_parameters, 1);
 
     extcap_base_set_util_info(extcap_conf, argv[0], ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR,
-        ANDROIDDUMP_VERSION_RELEASE, NULL);
+        ANDROIDDUMP_VERSION_RELEASE, data_file_url("androiddump.html"));
 
     help_header = g_strdup_printf(
         " %s --extcap-interfaces [--adb-server-ip=<arg>] [--adb-server-tcp-port=<arg>]\n"

diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c
index 358473cd0ac00136c1e1376e1a9ea3c599a9dcd0..8f136e9c1ead70fabfacaf90af98b619f1f5e4c3 100644 (file)
--- a/extcap/ciscodump.c
+++ b/extcap/ciscodump.c
@@ -27,6 +27,7 @@
 #include <extcap/extcap-base.h>
 #include <wsutil/interface.h>
 #include <wsutil/strtoi.h>
+#include <wsutil/filesystem.h>
 #include <extcap/ssh-base.h>
 #include <writecap/pcapio.h>
 
@@ -540,7 +541,7 @@ int main(int argc, char **argv)
 #endif  /* _WIN32 */
 
        extcap_base_set_util_info(extcap_conf, argv[0], CISCODUMP_VERSION_MAJOR, CISCODUMP_VERSION_MINOR,
-               CISCODUMP_VERSION_RELEASE, NULL);
+               CISCODUMP_VERSION_RELEASE, data_file_url("ciscodump.html"));
        extcap_base_register_interface(extcap_conf, CISCODUMP_EXTCAP_INTERFACE, "Cisco remote capture", 147, "Remote capture dependent DLT");
 
        help_header = g_strdup_printf(

diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index 6dc7b8f5fbc4bd4121c4768ba66b322d0490eb46..9df98b026b20aea88be0c0a0943ad2a2b7ce7a80 100644 (file)
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -28,6 +28,7 @@
 
 #include "randpkt_core/randpkt_core.h"
 #include <wsutil/strtoi.h>
+#include <wsutil/filesystem.h>
 
 #define RANDPKT_EXTCAP_INTERFACE "randpkt"
 #define RANDPKTDUMP_VERSION_MAJOR "0"
@@ -146,7 +147,7 @@ int main(int argc, char *argv[])
        char* help_header = NULL;
 
        extcap_base_set_util_info(extcap_conf, argv[0], RANDPKTDUMP_VERSION_MAJOR, RANDPKTDUMP_VERSION_MINOR,
-               RANDPKTDUMP_VERSION_RELEASE, NULL);
+               RANDPKTDUMP_VERSION_RELEASE, data_file_url("randpktdump.html"));
        extcap_base_register_interface(extcap_conf, RANDPKT_EXTCAP_INTERFACE, "Random packet generator", 147, "Generator dependent DLT");
 
        help_header = g_strdup_printf(

diff --git a/extcap/sshdump.c b/extcap/sshdump.c
index f8199db80b3be516c1378cb983ad635f53a8e60b..9b71c6b613de4dc00932a6fe33b57f5349fbfa0d 100644 (file)
--- a/extcap/sshdump.c
+++ b/extcap/sshdump.c
@@ -29,6 +29,7 @@
 #include <wsutil/interface.h>
 #include <wsutil/file_util.h>
 #include <wsutil/strtoi.h>
+#include <wsutil/filesystem.h>
 
 #include <errno.h>
 #include <string.h>
@@ -346,7 +347,7 @@ int main(int argc, char **argv)
 #endif  /* _WIN32 */
 
        extcap_base_set_util_info(extcap_conf, argv[0], SSHDUMP_VERSION_MAJOR, SSHDUMP_VERSION_MINOR,
-               SSHDUMP_VERSION_RELEASE, NULL);
+               SSHDUMP_VERSION_RELEASE, data_file_url("sshdump.html"));
        extcap_base_register_interface(extcap_conf, SSH_EXTCAP_INTERFACE, "SSH remote capture", 147, "Remote capture dependent DLT");
 
        help_header = g_strdup_printf(

diff --git a/extcap/udpdump.c b/extcap/udpdump.c
index 4ad0f616f8a8b4223fd7a2bb017b540a52a580bd..b188658c19e11e910e86d8c27e2a6eeccdbeaba5 100644 (file)
--- a/extcap/udpdump.c
+++ b/extcap/udpdump.c
@@ -57,6 +57,7 @@
 #include <epan/exported_pdu.h>
 #include <wsutil/strtoi.h>
 #include <wsutil/inet_addr.h>
+#include <wsutil/filesystem.h>
 
 #define PCAP_SNAPLEN 0xffff
 
@@ -295,7 +296,8 @@ int main(int argc, char *argv[])
        attach_parent_console();
 #endif  /* _WIN32 */
 
-       extcap_base_set_util_info(extcap_conf, argv[0], UDPDUMP_VERSION_MAJOR, UDPDUMP_VERSION_MINOR,UDPDUMP_VERSION_RELEASE, NULL);
+       extcap_base_set_util_info(extcap_conf, argv[0], UDPDUMP_VERSION_MAJOR, UDPDUMP_VERSION_MINOR,UDPDUMP_VERSION_RELEASE,
+               data_file_url("udpdump.html"));
        extcap_base_register_interface(extcap_conf, UDPDUMP_EXTCAP_INTERFACE, "UDP Listener remote capture", 252, "Exported PDUs");
 
        help_header = g_strdup_printf(

diff --git a/ui/help_url.c b/ui/help_url.c
index 059682d97609a94ae1c7e50853b35dfbc8b1df3d..455c173b9c48e00e969c295b2de78ad009869925 100644 (file)
--- a/ui/help_url.c
+++ b/ui/help_url.c
@@ -241,7 +241,7 @@ topic_action_url(topic_action_e action)
         break;
 #ifdef HAVE_EXTCAP
     case(HELP_EXTCAP_OPTIONS_DIALOG):
-        url = user_guide_url("ChExtcapOptions.html");
+        url = data_file_url("extcap.html");
         break;
 #endif
     case(HELP_STATS_SUMMARY_DIALOG):