From Irene Ruengeler: Whitespace changes.

[obnox/wireshark/wip.git] / capture_ifinfo.c

diff --git a/capture_ifinfo.c b/capture_ifinfo.c
index b5b888959922d1be66498350d2717445e2e5e153..be57f02ebd69fae85802a89aefb56a19bdf69d1b 100644 (file)
--- a/capture_ifinfo.c
+++ b/capture_ifinfo.c
@@ -44,7 +44,7 @@
 #endif
 
 #ifdef NEED_INET_V6DEFS_H
-# include "inet_v6defs.h"
+# include "wsutil/inet_v6defs.h"
 #endif
 
 #include <glib.h>
@@ -55,6 +55,45 @@
 
 #include "capture_ifinfo.h"
 
+#ifdef HAVE_PCAP_REMOTE
+static GList *remote_interface_list = NULL;
+
+static void append_remote_list(GList *iflist)
+{
+    GSList *list;
+    GList *rlist;
+    if_addr_t *if_addr, *temp_addr;
+    if_info_t *if_info, *temp;
+
+    for (rlist = g_list_nth(remote_interface_list, 0); rlist != NULL; rlist = g_list_next(rlist)) {
+        if_info = (if_info_t *)rlist->data;
+        temp = g_malloc0(sizeof(if_info_t));
+        temp->name = g_strdup(if_info->name);
+        temp->description = g_strdup(if_info->description);
+        for (list = g_slist_nth(if_info->addrs, 0); list != NULL; list = g_slist_next(list)) {
+            temp_addr = g_malloc0(sizeof(if_addr_t));
+            if_addr = (if_addr_t *)list->data;
+            if (if_addr) {
+                temp_addr->ifat_type = if_addr->ifat_type;
+                if (temp_addr->ifat_type == IF_AT_IPv4) {
+                    temp_addr->addr.ip4_addr = if_addr->addr.ip4_addr;
+                } else {
+                    memcpy(temp_addr->addr.ip6_addr, if_addr->addr.ip6_addr, sizeof(if_addr->addr));
+                }
+            } else {
+                g_free(temp_addr);
+                temp_addr = NULL;
+            }
+            if (temp_addr) {
+                temp->addrs = g_slist_append(temp->addrs, temp_addr);
+            }
+        }
+        temp->loopback = if_info->loopback;
+        iflist = g_list_append(iflist, temp);
+   }
+}
+#endif
+
 /**
  * Fetch the interface list from a child process (dumpcap).
  *
@@ -70,7 +109,7 @@ capture_interface_list(int *err, char **err_str)
     int        ret;
     GList     *if_list = NULL;
     int        i, j;
-    gchar     *msg;
+    gchar     *data, *primary_msg, *secondary_msg;
     gchar    **raw_list, **if_parts, **addr_parts;
     gchar     *name;
     if_info_t *if_info;
@@ -79,25 +118,26 @@ capture_interface_list(int *err, char **err_str)
     g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List ...");
 
     /* Try to get our interface list */
-    ret = sync_interface_list_open(&msg);
+    ret = sync_interface_list_open(&data, &primary_msg, &secondary_msg);
     if (ret != 0) {
         g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!");
         if (err_str) {
-            *err_str = msg;
+            *err_str = primary_msg;
         } else {
-            g_free(msg);
+            g_free(primary_msg);
         }
-        *err = CANT_RUN_DUMPCAP;
+        g_free(secondary_msg);
+        *err = CANT_GET_INTERFACE_LIST;
         return NULL;
     }
 
     /* Split our lines */
 #ifdef _WIN32
-    raw_list = g_strsplit(msg, "\r\n", 0);
+    raw_list = g_strsplit(data, "\r\n", 0);
 #else
-    raw_list = g_strsplit(msg, "\n", 0);
+    raw_list = g_strsplit(data, "\n", 0);
 #endif
-    g_free(msg);
+    g_free(data);
 
     for (i = 0; raw_list[i] != NULL; i++) {
         if_parts = g_strsplit(raw_list[i], "\t", 4);
@@ -150,43 +190,50 @@ capture_interface_list(int *err, char **err_str)
         if (err_str)
             *err_str = g_strdup("No interfaces found");
     }
+#ifdef HAVE_PCAP_REMOTE
+    if (remote_interface_list && g_list_length(remote_interface_list) > 0) {
+        append_remote_list(if_list);
+    }
+#endif
     return if_list;
 }
 
 /* XXX - We parse simple text output to get our interface list.  Should
  * we use "real" data serialization instead, e.g. via XML? */
-if_caps_t *
+if_capabilities_t *
 capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode,
                             char **err_str)
 {
-    if_caps_t *caps;
+    if_capabilities_t *caps;
     GList              *linktype_list = NULL;
     int                 err, i;
-    gchar              *msg;
+    gchar              *data, *primary_msg, *secondary_msg;
     gchar             **raw_list, **lt_parts;
     data_link_info_t   *data_link_info;
 
     g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities ...");
 
     /* Try to get our interface list */
-    err = sync_if_capabilities_open(ifname, monitor_mode, &msg);
+    err = sync_if_capabilities_open(ifname, monitor_mode, &data,
+                                    &primary_msg, &secondary_msg);
     if (err != 0) {
         g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface Capabilities failed!");
         if (err_str) {
-            *err_str = msg;
+            *err_str = primary_msg;
         } else {
-            g_free(msg);
+            g_free(primary_msg);
         }
+        g_free(secondary_msg);
         return NULL;
     }
 
     /* Split our lines */
 #ifdef _WIN32
-    raw_list = g_strsplit(msg, "\r\n", 0);
+    raw_list = g_strsplit(data, "\r\n", 0);
 #else
-    raw_list = g_strsplit(msg, "\n", 0);
+    raw_list = g_strsplit(data, "\n", 0);
 #endif
-    g_free(msg);
+    g_free(data);
 
     /*
      * First line is 0 if monitor mode isn't supported, 1 if it is.
@@ -258,4 +305,35 @@ capture_get_if_capabilities(const gchar *ifname, gboolean monitor_mode,
     return caps;
 }
 
+#ifdef HAVE_PCAP_REMOTE
+void add_interface_to_remote_list(if_info_t *if_info)
+{
+    GSList *list;
+    if_addr_t *if_addr, *temp_addr;
+
+    if_info_t *temp = g_malloc0(sizeof(if_info_t));
+    temp->name = g_strdup(if_info->name);
+    temp->description = g_strdup(if_info->description);
+    for (list = g_slist_nth(if_info->addrs, 0); list != NULL; list = g_slist_next(list)) {
+        temp_addr = g_malloc0(sizeof(if_addr_t));
+        if_addr = (if_addr_t *)list->data;
+        if (if_addr) {
+            temp_addr->ifat_type = if_addr->ifat_type;
+            if (temp_addr->ifat_type == IF_AT_IPv4) {
+                temp_addr->addr.ip4_addr = if_addr->addr.ip4_addr;
+            } else {
+                memcpy(temp_addr->addr.ip6_addr, if_addr->addr.ip6_addr, sizeof(if_addr->addr));
+            }
+        } else {
+            g_free(temp_addr);
+            temp_addr = NULL;
+        }
+        if (temp_addr) {
+            temp->addrs = g_slist_append(temp->addrs, temp_addr);
+        }
+    }
+    temp->loopback = if_info->loopback;
+    remote_interface_list = g_list_append(remote_interface_list, temp);
+}
+#endif
 #endif /* HAVE_LIBPCAP */