git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
extcap: Fix crash in extcap_verify_capture_filter
[metze/wireshark/wip.git] / extcap.c
diff --git a/extcap.c b/extcap.c
index 79c5bb43afd067c87b930e7c99f3262043539e9a..c5f446a6d097e03ce275d046d05be6c5e4231ded 100644 (file)
--- a/extcap.c
+++ b/extcap.c
@@ -289,9 +289,39 @@ extcap_iface_toolbar_add(const gchar *extcap, iface_toolbar *toolbar_entry)
     g_free(toolname);
 }
 
+static gchar **
+extcap_convert_arguments_to_array(GList * arguments)
+{
+    gchar ** result = NULL;
+    if ( arguments )
+    {
+        GList * walker = g_list_first(arguments);
+        int cnt = 0;
+
+        result = (gchar **) g_malloc0(sizeof(gchar *) * (g_list_length(arguments)));
+
+        while(walker)
+        {
+            result[cnt] = g_strdup((const gchar *)walker->data);
+            walker = g_list_next(walker);
+            cnt++;
+        }
+    }
+    return result;
+}
+
+static void extcap_free_array(gchar ** args, int argc)
+{
+    int cnt = 0;
+
+    for ( cnt = 0; cnt < argc; cnt++ )
+        g_free(args[cnt]);
+    g_free(args);
+}
+
 /* Note: args does not need to be NULL-terminated. */
 static gboolean extcap_foreach(GList * arguments,
-                                      extcap_cb_t cb, extcap_callback_info_t cb_info)
+                                      extcap_cb_t cb, extcap_callback_info_t cb_info, GList * fallback_arguments)
 {
     GDir *dir;
     gboolean keep_going;
@@ -303,20 +333,13 @@ static gboolean extcap_foreach(GList * arguments,
     {
         GString *extcap_path = NULL;
         const gchar *file;
+        gchar ** args = extcap_convert_arguments_to_array(arguments);
+        int cnt = g_list_length(arguments);
 
         extcap_path = g_string_new("");
         while (keep_going && (file = g_dir_read_name(dir)) != NULL)
         {
             gchar *command_output = NULL;
-            gchar ** args = (gchar **) g_malloc0(sizeof(gchar *) * (g_list_length(arguments)));
-            GList * walker = g_list_first(arguments);
-            int cnt = 0;
-            while(walker)
-            {
-                args[cnt] = g_strdup((const gchar *)walker->data);
-                walker = g_list_next(walker);
-                cnt++;
-            }
 
             /* full path to extcap binary */
             g_string_printf(extcap_path, "%s" G_DIR_SEPARATOR_S "%s", dirname, file);
@@ -336,10 +359,24 @@ static gboolean extcap_foreach(GList * arguments,
 
                     keep_going = cb(cb_info);
                 }
+                else if ( fallback_arguments )
+                {
+                    gchar ** fb_args = extcap_convert_arguments_to_array(fallback_arguments);
+
+                    if (ws_pipe_spawn_sync((gchar *) dirname, extcap_path->str, g_list_length(fallback_arguments), fb_args, &command_output))
+                    {
+                        cb_info.output = command_output;
+                        cb_info.extcap = extcap_path->str;
+
+                        keep_going = cb(cb_info);
+                    }
+                }
 
                 g_free(command_output);
             }
+
         }
+        extcap_free_array(args, cnt);
 
         g_dir_close(dir);
         g_string_free(extcap_path, TRUE);
@@ -440,16 +477,16 @@ extcap_get_if_dlts(const gchar *ifname, char **err_str)
 
     if (extcap_if_exists(ifname))
     {
-        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_LIST_DLTS) );
-        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_INTERFACE) );
-        arguments = g_list_append(arguments, g_strdup(ifname) );
+        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_LIST_DLTS));
+        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_INTERFACE));
+        arguments = g_list_append(arguments, g_strdup(ifname));
 
         extcap_callback_info_t cb_info;
         cb_info.data = &caps;
         cb_info.err_str = err_str;
         cb_info.ifname = ifname;
 
-        extcap_foreach(arguments, cb_dlt, cb_info);
+        extcap_foreach(arguments, cb_dlt, cb_info, NULL);
 
         g_list_free_full(arguments, g_free);
     }
@@ -790,16 +827,16 @@ extcap_get_if_configuration(const char *ifname)
         g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "Extcap path %s",
               get_extcap_dir());
 
-        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_CONFIG) );
-        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_INTERFACE) );
-        arguments = g_list_append(arguments, g_strdup(ifname) );
+        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_CONFIG));
+        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_INTERFACE));
+        arguments = g_list_append(arguments, g_strdup(ifname));
 
         extcap_callback_info_t cb_info;
         cb_info.data = &ret;
         cb_info.err_str = err_str;
         cb_info.ifname = ifname;
 
-        extcap_foreach(arguments, cb_preference, cb_info);
+        extcap_foreach(arguments, cb_preference, cb_info, NULL);
 
         g_list_free_full(arguments, g_free);
     }
@@ -839,11 +876,11 @@ extcap_get_if_configuration_values(const char * ifname, const char * argname, GH
         g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "Extcap path %s",
               get_extcap_dir());
 
-        args = g_list_append(args, g_strdup(EXTCAP_ARGUMENT_CONFIG) );
-        args = g_list_append(args, g_strdup(EXTCAP_ARGUMENT_INTERFACE) );
-        args = g_list_append(args, g_strdup(ifname) );
-        args = g_list_append(args, g_strdup(EXTCAP_ARGUMENT_RELOAD_OPTION) );
-        args = g_list_append(args, g_strdup(argname) );
+        args = g_list_append(args, g_strdup(EXTCAP_ARGUMENT_CONFIG));
+        args = g_list_append(args, g_strdup(EXTCAP_ARGUMENT_INTERFACE));
+        args = g_list_append(args, g_strdup(ifname));
+        args = g_list_append(args, g_strdup(EXTCAP_ARGUMENT_RELOAD_OPTION));
+        args = g_list_append(args, g_strdup(argname));
 
         if ( arguments )
         {
@@ -851,8 +888,8 @@ extcap_get_if_configuration_values(const char * ifname, const char * argname, GH
             while ( keys )
             {
                 const gchar * key_data = (const gchar *)keys->data;
-                args = g_list_append(args, g_strdup(key_data) );
-                args = g_list_append(args, g_strdup((const gchar *)g_hash_table_lookup(arguments, key_data)) );
+                args = g_list_append(args, g_strdup(key_data));
+                args = g_list_append(args, g_strdup((const gchar *)g_hash_table_lookup(arguments, key_data)));
                 keys = g_list_next(keys);
             }
         }
@@ -862,7 +899,7 @@ extcap_get_if_configuration_values(const char * ifname, const char * argname, GH
         cb_info.err_str = err_str;
         cb_info.ifname = ifname;
 
-        extcap_foreach(args, cb_reload_preference, cb_info);
+        extcap_foreach(args, cb_reload_preference, cb_info, NULL);
 
         g_list_free_full(args, g_free);
     }
@@ -982,9 +1019,9 @@ extcap_verify_capture_filter(const char *ifname, const char *filter, gchar **err
         g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "Extcap path %s",
               get_extcap_dir());
 
-        arguments = g_list_append(arguments, EXTCAP_ARGUMENT_CAPTURE_FILTER);
+        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_CAPTURE_FILTER));
         arguments = g_list_append(arguments, g_strdup(filter));
-        arguments = g_list_append(arguments, EXTCAP_ARGUMENT_INTERFACE);
+        arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_INTERFACE));
         arguments = g_list_append(arguments, g_strdup(ifname));
 
         extcap_callback_info_t cb_info;
@@ -992,7 +1029,7 @@ extcap_verify_capture_filter(const char *ifname, const char *filter, gchar **err
         cb_info.err_str = err_str;
         cb_info.ifname = ifname;
 
-        extcap_foreach(arguments, cb_verify_filter, cb_info);
+        extcap_foreach(arguments, cb_verify_filter, cb_info, NULL);
         g_list_free_full(arguments, g_free);
     }
 
@@ -1373,12 +1410,12 @@ extcap_init_interfaces(capture_options *capture_opts)
         if (extcap_has_toolbar(interface_opts->name))
         {
             extcap_create_pipe(interface_opts->name, &interface_opts->extcap_control_in,
-                               EXTCAP_CONTROL_IN_PREFIX, FALSE);
+                               EXTCAP_CONTROL_IN_PREFIX);
 #ifdef _WIN32
             interface_opts->extcap_control_in_h = pipe_h;
 #endif
             extcap_create_pipe(interface_opts->name, &interface_opts->extcap_control_out,
-                               EXTCAP_CONTROL_OUT_PREFIX, FALSE);
+                               EXTCAP_CONTROL_OUT_PREFIX);
 #ifdef _WIN32
             interface_opts->extcap_control_out_h = pipe_h;
 #endif
@@ -1386,7 +1423,7 @@ extcap_init_interfaces(capture_options *capture_opts)
 
         /* create pipe for fifo */
         if (!extcap_create_pipe(interface_opts->name, &interface_opts->extcap_fifo,
-                                EXTCAP_PIPE_PREFIX, TRUE))
+                                EXTCAP_PIPE_PREFIX))
         {
             return FALSE;
         }
@@ -1448,7 +1485,7 @@ extcap_init_interfaces(capture_options *capture_opts)
 }
 
 #ifdef _WIN32
-gboolean extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe_prefix, gboolean byte_mode)
+gboolean extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe_prefix)
 {
     gchar timestr[ 14 + 1 ];
     time_t current_time;
@@ -1474,8 +1511,7 @@ gboolean extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe
     pipe_h = CreateNamedPipe(
                  utf_8to16(pipename),
                  PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
-                 (byte_mode ? (PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT) :
-                              (PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT)),
+                 PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT,
                  1, 65536, 65536,
                  300,
                  &security);
@@ -1495,7 +1531,7 @@ gboolean extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe
     return TRUE;
 }
 #else
-gboolean extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe_prefix, gboolean byte_mode _U_)
+gboolean extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe_prefix)
 {
     gchar *temp_name = NULL;
     int fd = 0;
@@ -1764,6 +1800,7 @@ extcap_load_interface_list(void)
     if (_loaded_interfaces == NULL)
     {
         GList * arguments = NULL;
+        GList * fallback = NULL;
         int major = 0;
         int minor = 0;
 
@@ -1778,6 +1815,7 @@ extcap_load_interface_list(void)
         }
 
         arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_LIST_INTERFACES));
+        fallback = g_list_append(fallback, g_strdup(EXTCAP_ARGUMENT_LIST_INTERFACES));
 
         get_ws_version_number(&major, &minor, NULL);
         arguments = g_list_append(arguments, g_strdup_printf("%s=%d.%d", EXTCAP_ARGUMENT_VERSION, major, minor));
@@ -1787,22 +1825,9 @@ extcap_load_interface_list(void)
         cb_info.ifname = NULL;
         cb_info.err_str = &error;
 
-        extcap_foreach(arguments, cb_load_interfaces, cb_info);
-
-        /* Compatibility mode. Utility did not accept version argument, therefore we just ask for the interfaces
-         * and assume, that the utility will handle compatibility on it's end */
-        if ( ! cb_info.data )
-        {
-            g_free(error);
-            error = NULL;
-
-            g_list_free_full(arguments, g_free);
-            arguments = NULL;
-
-            arguments = g_list_append(arguments, g_strdup(EXTCAP_ARGUMENT_LIST_INTERFACES));
-            extcap_foreach(arguments, cb_load_interfaces, cb_info);
-        }
+        extcap_foreach(arguments, cb_load_interfaces, cb_info, fallback);
 
+        g_list_free_full(fallback, g_free);
         g_list_free_full(arguments, g_free);
     }
 }
Unnamed repository; edit this file to name it for gitweb.