Commit
v2.1.0rc0-2181-ga4e2263ac4 introduced a helppage parameter, but
all callers were NULL. In a later change, callers would use the
data_file_url() function, but this needs to be freed, so do that.
Fixes: v2.3.0rc0-1825-ge5596b74bd ("extcap: set help page for all extcaps.")
Change-Id: I967c0f8c6b50d9e78ac227575de24a81f97d376a
Reviewed-on: https://code.wireshark.org/review/19570
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
const char *default_bt_local_ip = "127.0.0.1";
unsigned short default_bt_local_tcp_port = 4330;
extcap_parameters * extcap_conf = NULL;
+ char *help_url;
char *help_header = NULL;
#ifdef _WIN32
extcap_conf = g_new0(extcap_parameters, 1);
+ help_url = data_file_url("androiddump.html");
extcap_base_set_util_info(extcap_conf, argv[0], ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR,
- ANDROIDDUMP_VERSION_RELEASE, data_file_url("androiddump.html"));
+ ANDROIDDUMP_VERSION_RELEASE, help_url);
+ g_free(help_url);
help_header = g_strdup_printf(
" %s --extcap-interfaces [--adb-server-ip=<arg>] [--adb-server-tcp-port=<arg>]\n"
guint32 count = 0;
int ret = EXIT_FAILURE;
extcap_parameters * extcap_conf = g_new0(extcap_parameters, 1);
+ char* help_url;
char* help_header = NULL;
#ifdef _WIN32
attach_parent_console();
#endif /* _WIN32 */
+ help_url = data_file_url("ciscodump.html");
extcap_base_set_util_info(extcap_conf, argv[0], CISCODUMP_VERSION_MAJOR, CISCODUMP_VERSION_MINOR,
- CISCODUMP_VERSION_RELEASE, data_file_url("ciscodump.html"));
+ CISCODUMP_VERSION_RELEASE, help_url);
+ g_free(help_url);
extcap_base_register_interface(extcap_conf, CISCODUMP_EXTCAP_INTERFACE, "Cisco remote capture", 147, "Remote capture dependent DLT");
help_header = g_strdup_printf(
#endif /* _WIN32 */
extcap_parameters * extcap_conf = g_new0(extcap_parameters, 1);
+ char* help_url;
char* help_header = NULL;
+ help_url = data_file_url("randpktdump.html");
extcap_base_set_util_info(extcap_conf, argv[0], RANDPKTDUMP_VERSION_MAJOR, RANDPKTDUMP_VERSION_MINOR,
- RANDPKTDUMP_VERSION_RELEASE, data_file_url("randpktdump.html"));
+ RANDPKTDUMP_VERSION_RELEASE, help_url);
+ g_free(help_url);
extcap_base_register_interface(extcap_conf, RANDPKT_EXTCAP_INTERFACE, "Random packet generator", 147, "Generator dependent DLT");
help_header = g_strdup_printf(
guint32 count = 0;
int ret = EXIT_FAILURE;
extcap_parameters * extcap_conf = g_new0(extcap_parameters, 1);
+ char* help_url;
char* help_header = NULL;
#ifdef _WIN32
attach_parent_console();
#endif /* _WIN32 */
+ help_url = data_file_url("sshdump.html");
extcap_base_set_util_info(extcap_conf, argv[0], SSHDUMP_VERSION_MAJOR, SSHDUMP_VERSION_MINOR,
- SSHDUMP_VERSION_RELEASE, data_file_url("sshdump.html"));
+ SSHDUMP_VERSION_RELEASE, help_url);
+ g_free(help_url);
extcap_base_register_interface(extcap_conf, SSH_EXTCAP_INTERFACE, "SSH remote capture", 147, "Remote capture dependent DLT");
help_header = g_strdup_printf(
guint16 port = 0;
int ret = EXIT_FAILURE;
extcap_parameters* extcap_conf = g_new0(extcap_parameters, 1);
+ char* help_url;
char* help_header = NULL;
char* payload = NULL;
char* port_msg = NULL;
attach_parent_console();
#endif /* _WIN32 */
+ help_url = data_file_url("udpdump.html");
extcap_base_set_util_info(extcap_conf, argv[0], UDPDUMP_VERSION_MAJOR, UDPDUMP_VERSION_MINOR,UDPDUMP_VERSION_RELEASE,
- data_file_url("udpdump.html"));
+ help_url);
+ g_free(help_url);
extcap_base_register_interface(extcap_conf, UDPDUMP_EXTCAP_INTERFACE, "UDP Listener remote capture", 252, "Exported PDUs");
help_header = g_strdup_printf(