osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

extcap: set help for interfaces. 

The help statement is in the first sentence, while interfaces are
in others. We need to keep state of it.

Ping-Bug: 13218
Change-Id: Iad1d403d5e8bc34e2489daaa3b14d469d5ee5b5b
Reviewed-on: https://code.wireshark.org/review/19148
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Dario Lombardo 2016-12-08 17:56:22 +01:00 committed by Roland Knall
parent 39050d3e2f
commit 1c2d224647
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extcap.c
View File

@ -364,6 +364,7 @@ static gboolean interfaces_cb(const gchar *extcap, const gchar *ifname _U_, gcha
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "Extcap pipe %s ", extcap);
walker = interfaces;
char* help = NULL;
while (walker != NULL)
{
/* Whether the interface information needs to be preserved or not. */
@ -384,6 +385,7 @@ static gboolean interfaces_cb(const gchar *extcap, const gchar *ifname _U_, gcha
else if (int_iter->if_type == EXTCAP_SENTENCE_EXTCAP)
{
g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, " Extcap [%s] ", int_iter->call);
help = g_strdup(int_iter->help);
}
if (int_iter->if_type == EXTCAP_SENTENCE_INTERFACE)
@ -401,6 +403,7 @@ static gboolean interfaces_cb(const gchar *extcap, const gchar *ifname _U_, gcha
}
int_iter->extcap_path = g_strdup(extcap);
int_iter->help = help;
preserve_interface = extcap_if_add(int_iter);
}