extcap: set help for interfaces.
authorDario Lombardo <lomato@gmail.com>
Thu, 8 Dec 2016 16:56:22 +0000 (17:56 +0100)
committerRoland Knall <rknall@gmail.com>
Wed, 14 Dec 2016 10:12:43 +0000 (10:12 +0000)
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>
extcap.c

index fc841233fccc59e956d4a5e3f3c44af7950fc501..973d2a9d2c1686a1aeebb955efa08a81ec2e6218 100644 (file)
--- a/extcap.c
+++ b/extcap.c
@@ -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);
         }