From Irene Ruengeler: Whitespace changes.
[obnox/wireshark/wip.git] / capture.c
index ba5d6616f23218aea3ed58c8eb1d23c98a26459f..b9c2f98f2978815d0adb1bd6e9a4fa9356039cd6 100644 (file)
--- a/capture.c
+++ b/capture.c
 #include <unistd.h>
 #endif
 
-#include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
-#include <ctype.h>
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>         /* needed to define AF_ values on UNIX */
-#endif
-
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>           /* needed to define AF_ values on Windows */
-#endif
-
-#ifdef NEED_INET_V6DEFS_H
-# include "inet_v6defs.h"
-#endif
-
-#include <signal.h>
-#include <errno.h>
 
 #include <glib.h>
 
 #include <epan/dfilter/dfilter.h>
 #include "file.h"
 #include "capture.h"
+#include "capture_ifinfo.h"
 #include "capture_sync.h"
 #include "capture_info.h"
 #include "capture_ui_utils.h"
-#include "util.h"
+#include "ui/util.h"
 #include "capture-pcap-util.h"
-#include "alert_box.h"
-#include "simple_dialog.h"
 #include <epan/prefs.h>
 
 #ifdef _WIN32
 #include "capture-wpcap.h"
 #endif
-#include "ui_util.h"
+
+#include "ui/simple_dialog.h"
+#include "ui/ui_util.h"
+
 #include "wsutil/file_util.h"
 #include "log.h"
 
@@ -115,49 +81,49 @@ static GList *capture_callbacks = NULL;
 static void
 capture_callback_invoke(int event, capture_options *capture_opts)
 {
-    capture_callback_data_t *cb;
-    GList *cb_item = capture_callbacks;
+  capture_callback_data_t *cb;
+  GList *cb_item = capture_callbacks;
 
-    /* there should be at least one interested */
-    g_assert(cb_item != NULL);
+  /* there should be at least one interested */
+  g_assert(cb_item != NULL);
 
-    while(cb_item != NULL) {
-        cb = cb_item->data;
-        cb->cb_fct(event, capture_opts, cb->user_data);
-        cb_item = g_list_next(cb_item);
-    }
+  while(cb_item != NULL) {
+    cb = cb_item->data;
+    cb->cb_fct(event, capture_opts, cb->user_data);
+    cb_item = g_list_next(cb_item);
+  }
 }
 
 
 void
 capture_callback_add(capture_callback_t func, gpointer user_data)
 {
-    capture_callback_data_t *cb;
+  capture_callback_data_t *cb;
 
-    cb = g_malloc(sizeof(capture_callback_data_t));
-    cb->cb_fct = func;
-    cb->user_data = user_data;
+  cb = g_malloc(sizeof(capture_callback_data_t));
+  cb->cb_fct = func;
+  cb->user_data = user_data;
 
-    capture_callbacks = g_list_append(capture_callbacks, cb);
+  capture_callbacks = g_list_append(capture_callbacks, cb);
 }
 
 void
 capture_callback_remove(capture_callback_t func)
 {
-    capture_callback_data_t *cb;
-    GList *cb_item = capture_callbacks;
-
-    while(cb_item != NULL) {
-        cb = cb_item->data;
-        if(cb->cb_fct == func) {
-            capture_callbacks = g_list_remove(capture_callbacks, cb);
-            g_free(cb);
-            return;
-        }
-        cb_item = g_list_next(cb_item);
+  capture_callback_data_t *cb;
+  GList *cb_item = capture_callbacks;
+
+  while(cb_item != NULL) {
+    cb = cb_item->data;
+    if(cb->cb_fct == func) {
+      capture_callbacks = g_list_remove(capture_callbacks, cb);
+      g_free(cb);
+      return;
     }
+    cb_item = g_list_next(cb_item);
+  }
 
-    g_assert_not_reached();
+  g_assert_not_reached();
 }
 
 /**
@@ -169,16 +135,46 @@ gboolean
 capture_start(capture_options *capture_opts)
 {
   gboolean ret;
+  guint i;
+  GString *source = g_string_new("");
 
+  if (capture_opts->state != CAPTURE_STOPPED)
+    return FALSE;
+  capture_opts->state = CAPTURE_PREPARING;
 
   /* close the currently loaded capture file */
   cf_close(capture_opts->cf);
-
-  g_assert(capture_opts->state == CAPTURE_STOPPED);
-  capture_opts->state = CAPTURE_PREPARING;
-
+  collect_ifaces(capture_opts);
   g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Start ...");
-
+#ifdef _WIN32
+  if (capture_opts->ifaces->len < 2) {
+#else
+  if (capture_opts->ifaces->len < 4) {
+#endif
+    for (i = 0; i < capture_opts->ifaces->len; i++) {
+      interface_options interface_opts;
+
+      interface_opts = g_array_index(capture_opts->ifaces, interface_options, i);
+      if (i > 0) {
+          if (capture_opts->ifaces->len > 2) {
+              g_string_append_printf(source, ",");
+          }
+          g_string_append_printf(source, " ");
+          if (i == capture_opts->ifaces->len - 1) {
+              g_string_append_printf(source, "and ");
+          }
+      }
+      g_string_append_printf(source, "%s", get_iface_description_for_interface(capture_opts, i));
+      if ((interface_opts.cfilter != NULL) &&
+          (strlen(interface_opts.cfilter) > 0)) {
+        g_string_append_printf(source, " (%s)", interface_opts.cfilter);
+      }
+    }
+  } else {
+    g_string_append_printf(source, "%u interfaces", capture_opts->ifaces->len);
+  }
+  cf_set_tempfile_source(capture_opts->cf, source->str);
+  g_string_free(source, TRUE);
   /* try to start the capture child process */
   ret = sync_pipe_start(capture_opts);
   if(!ret) {
@@ -245,13 +241,12 @@ guint32 drops)
 {
   int err;
 
-
   /* Capture succeeded; attempt to open the capture file. */
   if (cf_open(capture_opts->cf, capture_opts->save_file, is_tempfile, &err) != CF_OK) {
     /* We're not doing a capture any more, so we don't have a save file. */
     return FALSE;
   }
-
+  
   /* Set the read filter to NULL. */
   /* XXX - this is odd here; try to put it somewhere where it fits better */
   cf_set_rfcode(capture_opts->cf, NULL);
@@ -289,7 +284,7 @@ guint32 drops)
   }
 
   /* read in the packet data */
-  switch (cf_read(capture_opts->cf)) {
+  switch (cf_read(capture_opts->cf, FALSE)) {
 
   case CF_READ_OK:
   case CF_READ_ERROR:
@@ -337,7 +332,6 @@ capture_input_new_file(capture_options *capture_opts, gchar *new_file)
   gboolean is_tempfile;
   int  err;
 
-
   if(capture_opts->state == CAPTURE_PREPARING) {
     g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture started!");
   }
@@ -430,6 +424,7 @@ capture_input_new_packets(capture_options *capture_opts, int to_read)
     /* increase the capture file packet counter by the number of incoming packets */
     cf_set_packet_count(capture_opts->cf,
         cf_get_packet_count(capture_opts->cf) + to_read);
+    cf_fake_continue_tail(capture_opts->cf);
 
     capture_callback_invoke(capture_cb_capture_fixed_continue, capture_opts);
   }
@@ -498,20 +493,27 @@ capture_input_error_message(capture_options *capture_opts, char *error_msg, char
    capture filter when starting/running the capture.
  */
 void
-capture_input_cfilter_error_message(capture_options *capture_opts, char *error_message)
+capture_input_cfilter_error_message(capture_options *capture_opts, guint i, char *error_message)
 {
-  dfilter_t   *rfcode = NULL;
-  gchar *safe_cfilter = simple_dialog_format_message(capture_opts->cfilter);
-  gchar *safe_cfilter_error_msg = simple_dialog_format_message(error_message);
+  dfilter_t *rfcode = NULL;
+  gchar *safe_cfilter;
+  gchar *safe_descr;
+  gchar *safe_cfilter_error_msg;
+  interface_options interface_opts;
 
   g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture filter error message from child: \"%s\"", error_message);
 
   g_assert(capture_opts->state == CAPTURE_PREPARING || capture_opts->state == CAPTURE_RUNNING);
+  g_assert(i < capture_opts->ifaces->len);
 
+  interface_opts = g_array_index(capture_opts->ifaces, interface_options, i);
+  safe_cfilter = simple_dialog_format_message(interface_opts.cfilter);
+  safe_descr = simple_dialog_format_message(interface_opts.descr);
+  safe_cfilter_error_msg = simple_dialog_format_message(error_message);
   /* Did the user try a display filter? */
-  if (dfilter_compile(capture_opts->cfilter, &rfcode) && rfcode != NULL) {
+  if (dfilter_compile(interface_opts.cfilter, &rfcode) && rfcode != NULL) {
     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-      "%sInvalid capture filter: \"%s\"!%s\n"
+      "%sInvalid capture filter \"%s\" for interface %s!%s\n"
       "\n"
       "That string looks like a valid display filter; however, it isn't a valid\n"
       "capture filter (%s).\n"
@@ -520,19 +522,20 @@ capture_input_cfilter_error_message(capture_options *capture_opts, char *error_m
       "so you can't use most display filter expressions as capture filters.\n"
       "\n"
       "See the User's Guide for a description of the capture filter syntax.",
-      simple_dialog_primary_start(), safe_cfilter,
+      simple_dialog_primary_start(), safe_cfilter, safe_descr,
       simple_dialog_primary_end(), safe_cfilter_error_msg);
       dfilter_free(rfcode);
   } else {
     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-      "%sInvalid capture filter: \"%s\"!%s\n"
+      "%sInvalid capture filter \"%s\" for interface %s!%s\n"
       "\n"
       "That string isn't a valid capture filter (%s).\n"
       "See the User's Guide for a description of the capture filter syntax.",
-      simple_dialog_primary_start(), safe_cfilter,
+      simple_dialog_primary_start(), safe_cfilter, safe_descr,
       simple_dialog_primary_end(), safe_cfilter_error_msg);
   }
   g_free(safe_cfilter_error_msg);
+  g_free(safe_descr);
   g_free(safe_cfilter);
 
   /* the capture child will close the sync_pipe if required, nothing to do for now */
@@ -541,387 +544,244 @@ capture_input_cfilter_error_message(capture_options *capture_opts, char *error_m
 
 /* capture child closed its side of the pipe, do the required cleanup */
 void
-capture_input_closed(capture_options *capture_opts)
+capture_input_closed(capture_options *capture_opts, gchar *msg)
 {
-    int  err;
-    int  packet_count_save;
-
-    g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture stopped!");
-    g_assert(capture_opts->state == CAPTURE_PREPARING || capture_opts->state == CAPTURE_RUNNING);
-
-    /* if we didn't start the capture, do a fake start. */
-    /* (happens if we got an error message - we won't get a filename then). */
-    if(capture_opts->state == CAPTURE_PREPARING) {
-        if(capture_opts->real_time_mode) {
-            capture_callback_invoke(capture_cb_capture_update_started, capture_opts);
-        } else {
-            capture_callback_invoke(capture_cb_capture_fixed_started, capture_opts);
-        }
-    }
-
-    if(capture_opts->real_time_mode) {
-       cf_read_status_t status;
-
-        /* Read what remains of the capture file. */
-        status = cf_finish_tail(capture_opts->cf, &err);
-
-        /* XXX: If -Q (quit-after-cap) then cf->count clr'd below so save it first */
-       packet_count_save = cf_get_packet_count(capture_opts->cf);
-        /* Tell the GUI we are not doing a capture any more.
-                  Must be done after the cf_finish_tail(), so file lengths are 
-                   correctly displayed */
-        capture_callback_invoke(capture_cb_capture_update_finished, capture_opts);
+  int  err;
+  int  packet_count_save;
 
-        /* Finish the capture. */
-        switch (status) {
+  g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture stopped!");
+  g_assert(capture_opts->state == CAPTURE_PREPARING || capture_opts->state == CAPTURE_RUNNING);
 
-        case CF_READ_OK:
-            if ((packet_count_save == 0) && !capture_opts->restart) {
-                simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
-"%sNo packets captured!%s\n"
-"\n"
-"As no data was captured, closing the %scapture file!\n"
-"\n"
-"\n"
-"Help about capturing can be found at:\n"
-"\n"
-"       http://wiki.wireshark.org/CaptureSetup"
-#ifdef _WIN32
-"\n\n"
-"Wireless (Wi-Fi/WLAN):\n"
-"Try to switch off promiscuous mode in the Capture Options!"
-#endif
-"",
-              simple_dialog_primary_start(), simple_dialog_primary_end(),
-              cf_is_tempfile(capture_opts->cf) ? "temporary " : "");
-              cf_close(capture_opts->cf);
-            }
-            break;
-        case CF_READ_ERROR:
-          /* Just because we got an error, that doesn't mean we were unable
-             to read any of the file; we handle what we could get from the
-             file. */
-          break;
-
-        case CF_READ_ABORTED:
-          /* Exit by leaving the main loop, so that any quit functions
-             we registered get called. */
-          main_window_quit();
-        }
+  if (msg != NULL)
+    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", msg);
 
+  /* if we didn't start the capture, do a fake start. */
+  /* (happens if we got an error message - we won't get a filename then). */
+  if(capture_opts->state == CAPTURE_PREPARING) {
+    if(capture_opts->real_time_mode) {
+      capture_callback_invoke(capture_cb_capture_update_started, capture_opts);
     } else {
-        /* first of all, we are not doing a capture any more */
-        capture_callback_invoke(capture_cb_capture_fixed_finished, capture_opts);
-
-        /* this is a normal mode capture and if no error happened, read in the capture file data */
-        if(capture_opts->save_file != NULL) {
-            capture_input_read_all(capture_opts, cf_is_tempfile(capture_opts->cf),
-                cf_get_drops_known(capture_opts->cf), cf_get_drops(capture_opts->cf));
-        }
+      capture_callback_invoke(capture_cb_capture_fixed_started, capture_opts);
     }
+  }
 
-    if(capture_opts->show_info)
-      capture_info_close();
-
-    capture_opts->state = CAPTURE_STOPPED;
+  if(capture_opts->real_time_mode) {
+    cf_read_status_t status;
 
-    /* if we couldn't open a capture file, there's nothing more for us to do */
-    if(capture_opts->save_file == NULL) {
-        cf_close(capture_opts->cf);
-        return;
-    }
+    /* Read what remains of the capture file. */
+    status = cf_finish_tail(capture_opts->cf, &err);
 
-    /* does the user wants to restart the current capture? */
-    if(capture_opts->restart) {
-        capture_opts->restart = FALSE;
+    /* XXX: If -Q (quit-after-cap) then cf->count clr'd below so save it first */
+    packet_count_save = cf_get_packet_count(capture_opts->cf);
+    /* Tell the GUI we are not doing a capture any more.
+       Must be done after the cf_finish_tail(), so file lengths are 
+       correctly displayed */
+    capture_callback_invoke(capture_cb_capture_update_finished, capture_opts);
 
-        ws_unlink(capture_opts->save_file);
+    /* Finish the capture. */
+    switch (status) {
 
-        /* if it was a tempfile, throw away the old filename (so it will become a tempfile again) */
-        if(cf_is_tempfile(capture_opts->cf)) {
-            g_free(capture_opts->save_file);
-            capture_opts->save_file = NULL;
-        }
+    case CF_READ_OK:
+      if ((packet_count_save == 0) && !capture_opts->restart) {
+        simple_dialog(ESD_TYPE_INFO, ESD_BTN_OK,
+          "%sNo packets captured!%s\n"
+          "\n"
+          "As no data was captured, closing the %scapture file!\n"
+          "\n"
+          "\n"
+          "Help about capturing can be found at:\n"
+          "\n"
+          "       http://wiki.wireshark.org/CaptureSetup"
+#ifdef _WIN32
+          "\n\n"
+          "Wireless (Wi-Fi/WLAN):\n"
+          "Try to switch off promiscuous mode in the Capture Options!"
+#endif
+          "",
+          simple_dialog_primary_start(), simple_dialog_primary_end(),
+          cf_is_tempfile(capture_opts->cf) ? "temporary " : "");
+        cf_close(capture_opts->cf);
+      }
+      break;
+    case CF_READ_ERROR:
+      /* Just because we got an error, that doesn't mean we were unable
+         to read any of the file; we handle what we could get from the
+         file. */
+      break;
 
-        /* ... and start the capture again */
-        capture_start(capture_opts);
-    } else {
-        /* We're not doing a capture any more, so we don't have a save file. */
-        g_free(capture_opts->save_file);
-        capture_opts->save_file = NULL;
+    case CF_READ_ABORTED:
+      /* Exit by leaving the main loop, so that any quit functions
+         we registered get called. */
+      main_window_quit();
+      break;
     }
-}
 
-/**
- * Fetch the interface list from a child process (dumpcap).
- *
- * @return A GList containing if_info_t structs if successful, NULL (with err and possibly err_str set) otherwise.
- *
- */
+  } else {
+    /* first of all, we are not doing a capture any more */
+    capture_callback_invoke(capture_cb_capture_fixed_finished, capture_opts);
 
-/* XXX - We parse simple text output to get our interface list.  Should
- * we use "real" data serialization instead, e.g. via XML? */
-GList *
-capture_interface_list(int *err, char **err_str)
-{
-    GList     *if_list = NULL;
-    int        i, j;
-    gchar     *msg;
-    gchar    **raw_list, **if_parts, **addr_parts;
-    gchar     *name;
-    if_info_t *if_info;
-    if_addr_t *if_addr;
-
-    g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List ...");
-
-    /* Try to get our interface list */
-    *err = sync_interface_list_open(&msg);
-    if (*err != 0) {
-        g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!");
-        if (err_str) {
-            *err_str = msg;
-        } else {
-            g_free(msg);
-        }
-        return NULL;
+    /* this is a normal mode capture and if no error happened, read in the capture file data */
+    if(capture_opts->save_file != NULL) {
+      capture_input_read_all(capture_opts, cf_is_tempfile(capture_opts->cf),
+        cf_get_drops_known(capture_opts->cf), cf_get_drops(capture_opts->cf));
     }
+  }
 
-    /* Split our lines */
-#ifdef _WIN32
-    raw_list = g_strsplit(msg, "\r\n", 0);
-#else
-    raw_list = g_strsplit(msg, "\n", 0);
-#endif
-    g_free(msg);
+  if(capture_opts->show_info)
+    capture_info_close();
 
-    for (i = 0; raw_list[i] != NULL; i++) {
-        if_parts = g_strsplit(raw_list[i], "\t", 4);
-        if (if_parts[0] == NULL || if_parts[1] == NULL || if_parts[2] == NULL ||
-                if_parts[3] == NULL) {
-            g_strfreev(if_parts);
-            continue;
-        }
-
-        /* Number followed by the name, e.g "1. eth0" */
-        name = strchr(if_parts[0], ' ');
-        if (name) {
-            name++;
-        } else {
-            g_strfreev(if_parts);
-            continue;
-        }
-
-        if_info = g_malloc0(sizeof(if_info_t));
-        if_info->name = g_strdup(name);
-        if (strlen(if_parts[1]) > 0)
-            if_info->description = g_strdup(if_parts[1]);
-        addr_parts = g_strsplit(if_parts[2], ",", 0);
-        for (j = 0; addr_parts[j] != NULL; j++) {
-            if_addr = g_malloc0(sizeof(if_addr_t));
-            if (inet_pton(AF_INET, addr_parts[j], &if_addr->ip_addr.ip4_addr)) {
-                if_addr->type = AT_IPv4;
-            } else if (inet_pton(AF_INET6, addr_parts[j],
-                    &if_addr->ip_addr.ip6_addr)) {
-                if_addr->type = AT_IPv6;
-            } else {
-                g_free(if_addr);
-                if_addr = NULL;
-            }
-            if (if_addr) {
-                if_info->ip_addr = g_slist_append(if_info->ip_addr, if_addr);
-            }
-        }
-        if (strcmp(if_parts[3], "loopback") == 0)
-            if_info->loopback = TRUE;
-        g_strfreev(if_parts);
-        g_strfreev(addr_parts);
-        if_list = g_list_append(if_list, if_info);
-    }
-    g_strfreev(raw_list);
+  capture_opts->state = CAPTURE_STOPPED;
 
-    /* Check to see if we built a list */
-    if (if_list == NULL) {
-        *err = NO_INTERFACES_FOUND;
-        if (err_str)
-            *err_str = g_strdup("No interfaces found");
-    }
-    return if_list;
-}
+  /* if we couldn't open a capture file, there's nothing more for us to do */
+  if(capture_opts->save_file == NULL) {
+    cf_close(capture_opts->cf);
+    return;
+  }
 
-/* XXX - We parse simple text output to get our interface list.  Should
- * we use "real" data serialization instead, e.g. via XML? */
-GList *
-capture_pcap_linktype_list(const gchar *ifname, char **err_str)
-{
-    GList     *linktype_list = NULL;
-    int        err, i;
-    gchar     *msg;
-    gchar    **raw_list, **lt_parts;
-    data_link_info_t *data_link_info;
-
-    g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List ...");
-
-    /* Try to get our interface list */
-    err = sync_linktype_list_open(ifname, &msg);
-    if (err != 0) {
-        g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!");
-        if (err_str) {
-            *err_str = msg;
-        } else {
-            g_free(msg);
-        }
-        return NULL;
-    }
+  /* does the user wants to restart the current capture? */
+  if(capture_opts->restart) {
+    capture_opts->restart = FALSE;
 
-    /* Split our lines */
-#ifdef _WIN32
-    raw_list = g_strsplit(msg, "\r\n", 0);
-#else
-    raw_list = g_strsplit(msg, "\n", 0);
-#endif
-    g_free(msg);
+    ws_unlink(capture_opts->save_file);
 
-    for (i = 0; raw_list[i] != NULL; i++) {
-        /* ...and what if the interface name has a tab in it, Mr. Clever Programmer? */
-        lt_parts = g_strsplit(raw_list[i], "\t", 3);
-        if (lt_parts[0] == NULL || lt_parts[1] == NULL || lt_parts[2] == NULL) {
-            g_strfreev(lt_parts);
-            continue;
-        }
-
-        data_link_info = g_malloc(sizeof (data_link_info_t));
-        data_link_info->dlt = (int) strtol(lt_parts[0], NULL, 10);
-        data_link_info->name = g_strdup(lt_parts[1]);
-        if (strcmp(lt_parts[2], "(not supported)") != 0)
-            data_link_info->description = g_strdup(lt_parts[2]);
-        else
-            data_link_info->description = NULL;
-
-        linktype_list = g_list_append(linktype_list, data_link_info);
+    /* if it was a tempfile, throw away the old filename (so it will become a tempfile again) */
+    if(cf_is_tempfile(capture_opts->cf)) {
+      g_free(capture_opts->save_file);
+      capture_opts->save_file = NULL;
     }
-    g_strfreev(raw_list);
 
-    /* Check to see if we built a list */
-    if (linktype_list == NULL) {
-        if (err_str)
-            *err_str = NULL;
+    /* ... and start the capture again */
+    if (capture_opts->ifaces->len == 0) {
+      collect_ifaces(capture_opts);
     }
-    return linktype_list;
+    capture_start(capture_opts);
+  } else {
+    /* We're not doing a capture any more, so we don't have a save file. */
+    g_free(capture_opts->save_file);
+    capture_opts->save_file = NULL;
+  }
 }
 
 if_stat_cache_t *
-capture_stat_start(GList *if_list) {
-    int stat_fd, fork_child;
-    gchar *msg;
-    if_stat_cache_t *sc = NULL;
-    GList *if_entry;
-    if_info_t *if_info;
-    if_stat_cache_item_t *sc_item;
-
-    /* Fire up dumpcap. */
-    /*
-     * XXX - on systems with BPF, the number of BPF devices limits the
-     * number of devices on which you can capture simultaneously.
-     *
-     * This means that
-     *
-     * 1) this might fail if you run out of BPF devices
-     *
-     * and
-     *
-     * 2) opening every interface could leave too few BPF devices
-     *    for *other* programs.
-     *
-     * It also means the system could end up getting a lot of traffic
-     * that it has to pass through the networking stack and capture
-     * mechanism, so opening all the devices and presenting packet
-     * counts might not always be a good idea.
-     */
-     if (sync_interface_stats_open(&stat_fd, &fork_child, &msg) == 0) {
-        sc = g_malloc(sizeof(if_stat_cache_t));
-        sc->stat_fd = stat_fd;
-        sc->fork_child = fork_child;
-        sc->cache_list = NULL;
-
-        /* Initialize the cache */
-        for (if_entry = if_list; if_entry != NULL; if_entry = g_list_next(if_entry)) {
-            if_info = if_entry->data;
-            sc_item = g_malloc0(sizeof(if_stat_cache_item_t));
-            sc_item->name = g_strdup(if_info->name);
-            sc->cache_list = g_list_append(sc->cache_list, sc_item);
-        }
+capture_stat_start(capture_options *capture_opts) {
+  int stat_fd, fork_child;
+  gchar *msg;
+  if_stat_cache_t *sc = NULL;
+  if_stat_cache_item_t *sc_item;
+  guint i;
+  interface_t device;
+
+  /* Fire up dumpcap. */
+  /*
+   * XXX - on systems with BPF, the number of BPF devices limits the
+   * number of devices on which you can capture simultaneously.
+   *
+   * This means that
+   *
+   *    1) this might fail if you run out of BPF devices
+   *
+   * and
+   *
+   *    2) opening every interface could leave too few BPF devices
+   *       for *other* programs.
+   *
+   * It also means the system could end up getting a lot of traffic
+   * that it has to pass through the networking stack and capture
+   * mechanism, so opening all the devices and presenting packet
+   * counts might not always be a good idea.
+   */
+  if (sync_interface_stats_open(&stat_fd, &fork_child, &msg) == 0) {
+    sc = g_malloc(sizeof(if_stat_cache_t));
+    sc->stat_fd = stat_fd;
+    sc->fork_child = fork_child;
+    sc->cache_list = NULL;
+
+    /* Initialize the cache */
+    for (i = 0; i < capture_opts->all_ifaces->len; i++) {
+      device = g_array_index(capture_opts->all_ifaces, interface_t, i);
+      if (device.type != IF_PIPE && &(device.if_info)) {
+        sc_item = g_malloc0(sizeof(if_stat_cache_item_t));
+        sc_item->name = g_strdup(device.if_info.name);
+        sc->cache_list = g_list_append(sc->cache_list, sc_item);
+      }
     }
-    return sc;
+  }
+  return sc;
 }
 
 #define MAX_STAT_LINE_LEN 500
 
 static void
 capture_stat_cache_update(if_stat_cache_t *sc) {
-    gchar stat_line[MAX_STAT_LINE_LEN];
-    gchar **stat_parts;
-    GList *sc_entry;
-    if_stat_cache_item_t *sc_item;
-
-    if (!sc)
-        return;
-
-    while (sync_pipe_gets_nonblock(sc->stat_fd, stat_line, MAX_STAT_LINE_LEN) > 0) {
-        g_strstrip(stat_line);
-        stat_parts = g_strsplit(stat_line, "\t", 3);
-        if (stat_parts[0] == NULL || stat_parts[1] == NULL ||
-            stat_parts[2] == NULL) {
-            g_strfreev(stat_parts);
-            continue;
-        }
-        for (sc_entry = sc->cache_list; sc_entry != NULL; sc_entry = g_list_next(sc_entry)) {
-            sc_item = sc_entry->data;
-            if (strcmp(sc_item->name, stat_parts[0]) == 0) {
-                sc_item->ps.ps_recv = (u_int) strtoul(stat_parts[1], NULL, 10);
-                sc_item->ps.ps_drop = (u_int) strtoul(stat_parts[2], NULL, 10);
-            }
-        }
-        g_strfreev(stat_parts);
+  gchar stat_line[MAX_STAT_LINE_LEN];
+  gchar **stat_parts;
+  GList *sc_entry;
+  if_stat_cache_item_t *sc_item;
+
+  if (!sc)
+    return;
+
+  while (sync_pipe_gets_nonblock(sc->stat_fd, stat_line, MAX_STAT_LINE_LEN) > 0) {
+    g_strstrip(stat_line);
+    stat_parts = g_strsplit(stat_line, "\t", 3);
+    if (stat_parts[0] == NULL || stat_parts[1] == NULL ||
+      stat_parts[2] == NULL) {
+      g_strfreev(stat_parts);
+      continue;
+    }
+    for (sc_entry = sc->cache_list; sc_entry != NULL; sc_entry = g_list_next(sc_entry)) {
+      sc_item = sc_entry->data;
+      if (strcmp(sc_item->name, stat_parts[0]) == 0) {
+        sc_item->ps.ps_recv = (u_int) strtoul(stat_parts[1], NULL, 10);
+        sc_item->ps.ps_drop = (u_int) strtoul(stat_parts[2], NULL, 10);
+      }
     }
+  g_strfreev(stat_parts);
+  }
 }
 
 gboolean
 capture_stats(if_stat_cache_t *sc, char *ifname, struct pcap_stat *ps) {
-    GList *sc_entry;
-    if_stat_cache_item_t *sc_item;
+  GList *sc_entry;
+  if_stat_cache_item_t *sc_item;
 
-    if (!sc || !ifname || !ps) {
-        return FALSE;
-    }
+  if (!sc || !ifname || !ps) {
+    return FALSE;
+  }
 
-    capture_stat_cache_update(sc);
-    for (sc_entry = sc->cache_list; sc_entry != NULL; sc_entry = g_list_next(sc_entry)) {
-        sc_item = sc_entry->data;
-        if (strcmp(sc_item->name, ifname) == 0) {
-            memcpy(ps, &sc_item->ps, sizeof(struct pcap_stat));
-            return TRUE;
-        }
+  capture_stat_cache_update(sc);
+  for (sc_entry = sc->cache_list; sc_entry != NULL; sc_entry = g_list_next(sc_entry)) {
+    sc_item = sc_entry->data;
+    if (strcmp(sc_item->name, ifname) == 0) {
+      memcpy(ps, &sc_item->ps, sizeof(struct pcap_stat));
+      return TRUE;
     }
-    return FALSE;
+  }
+  return FALSE;
 }
 
 void
 capture_stat_stop(if_stat_cache_t *sc) {
-    GList *sc_entry;
-    if_stat_cache_item_t *sc_item;
-    gchar *msg;
+  GList *sc_entry;
+  if_stat_cache_item_t *sc_item;
+  int ret;
+  gchar *msg;
 
-    if (!sc)
-        return;
+  if (!sc)
+    return;
 
-    sync_interface_stats_close(&sc->stat_fd, &sc->fork_child, &msg);
+  ret = sync_interface_stats_close(&sc->stat_fd, &sc->fork_child, &msg);
+  if (ret == -1) {
+    /* XXX - report failure? */
+    g_free(msg);
+  }
 
-    for (sc_entry = sc->cache_list; sc_entry != NULL; sc_entry = g_list_next(sc_entry)) {
-        sc_item = sc_entry->data;
-        g_free(sc_item->name);
-        g_free(sc_item);
-    }
-    g_free(sc);
+  for (sc_entry = sc->cache_list; sc_entry != NULL; sc_entry = g_list_next(sc_entry)) {
+    sc_item = sc_entry->data;
+    g_free(sc_item->name);
+    g_free(sc_item);
+  }
+  g_free(sc);
 }
 
 #endif /* HAVE_LIBPCAP */