cdma2k: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
[metze/wireshark/wip.git] / capture_opts.c
index f419dc934a12e35a3750649cdb72905bfd469c12..16d44d197012d8dd1d301d45d2716bf6326f01be 100644 (file)
 /* capture_opts.c
  * Routines for capture options setting
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
 
 #ifdef HAVE_LIBPCAP
 
 #include <string.h>
-#include <ctype.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include <errno.h>
 
 #include <glib.h>
 
-#include <epan/packet.h>
-
 #include "capture_opts.h"
 #include "ringbuffer.h"
-#include "clopts_common.h"
-#include "console_io.h"
-#include "cmdarg_err.h"
 
-#include "capture_ifinfo.h"
-#include "capture-pcap-util.h"
+#include <ui/clopts_common.h>
+#include <ui/cmdarg_err.h>
 #include <wsutil/file_util.h>
+#include <wsutil/ws_pipe.h>
+
+#include "caputils/capture_ifinfo.h"
+#include "caputils/capture-pcap-util.h"
+
+#include "ui/filter_files.h"
 
 static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe);
 
 
 void
-capture_opts_init(capture_options *capture_opts, void *cf)
+capture_opts_init(capture_options *capture_opts)
 {
-  capture_opts->cf                           = cf;
-  capture_opts->cfilter                      = g_strdup("");     /* No capture filter string specified */
-  capture_opts->iface                        = NULL;             /* Default is "pick the first interface" */
-  capture_opts->iface_descr                  = NULL;
-  capture_opts->ifaces                       = g_array_new(FALSE, FALSE, sizeof(interface_options));
-  capture_opts->number_of_ifaces             = 0;
-  capture_opts->default_options.name         = g_strdup("");
-  capture_opts->default_options.descr        = g_strdup("");
-  capture_opts->default_options.cfilter      = g_strdup("");
-  capture_opts->default_options.snaplen      = 0;
-  capture_opts->default_options.linktype     = -1;
-  capture_opts->default_options.promisc_mode = TRUE;
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-  capture_opts->default_options.buffer_size  = 1;                /* 1 MB */
-#endif
-  capture_opts->default_options.monitor_mode = FALSE;
+    capture_opts->ifaces                          = g_array_new(FALSE, FALSE, sizeof(interface_options));
+    capture_opts->all_ifaces                      = g_array_new(FALSE, FALSE, sizeof(interface_t));
+    capture_opts->num_selected                    = 0;
+    capture_opts->default_options.name            = NULL;
+    capture_opts->default_options.descr           = NULL;
+    capture_opts->default_options.cfilter         = NULL;
+    capture_opts->default_options.has_snaplen     = FALSE;
+    capture_opts->default_options.snaplen         = WTAP_MAX_PACKET_SIZE_STANDARD;
+    capture_opts->default_options.linktype        = -1; /* use interface default */
+    capture_opts->default_options.promisc_mode    = TRUE;
+    capture_opts->default_options.if_type         = IF_WIRED;
+    capture_opts->default_options.extcap          = NULL;
+    capture_opts->default_options.extcap_fifo     = NULL;
+    capture_opts->default_options.extcap_args     = NULL;
+    capture_opts->default_options.extcap_pipedata = NULL;
+    capture_opts->default_options.extcap_pid      = WS_INVALID_PID;
+#ifdef _WIN32
+    capture_opts->default_options.extcap_pipe_h   = INVALID_HANDLE_VALUE;
+    capture_opts->default_options.extcap_control_in_h  = INVALID_HANDLE_VALUE;
+    capture_opts->default_options.extcap_control_out_h = INVALID_HANDLE_VALUE;
+#endif
+    capture_opts->default_options.extcap_control_in  = NULL;
+    capture_opts->default_options.extcap_control_out = NULL;
+#ifdef CAN_SET_CAPTURE_BUFFER_SIZE
+    capture_opts->default_options.buffer_size     = DEFAULT_CAPTURE_BUFFER_SIZE;
+#endif
+    capture_opts->default_options.monitor_mode    = FALSE;
 #ifdef HAVE_PCAP_REMOTE
-  capture_opts->src_type                     = CAPTURE_IFLOCAL;
-  capture_opts->remote_host                  = NULL;
-  capture_opts->remote_port                  = NULL;
-  capture_opts->auth_type                    = CAPTURE_AUTH_NULL;
-  capture_opts->auth_username                = NULL;
-  capture_opts->auth_password                = NULL;
-  capture_opts->datatx_udp                   = FALSE;
-  capture_opts->nocap_rpcap                  = TRUE;
-  capture_opts->nocap_local                  = FALSE;
+    capture_opts->default_options.src_type        = CAPTURE_IFLOCAL;
+    capture_opts->default_options.remote_host     = NULL;
+    capture_opts->default_options.remote_port     = NULL;
+    capture_opts->default_options.auth_type       = CAPTURE_AUTH_NULL;
+    capture_opts->default_options.auth_username   = NULL;
+    capture_opts->default_options.auth_password   = NULL;
+    capture_opts->default_options.datatx_udp      = FALSE;
+    capture_opts->default_options.nocap_rpcap     = TRUE;
+    capture_opts->default_options.nocap_local     = FALSE;
 #endif
 #ifdef HAVE_PCAP_SETSAMPLING
-  capture_opts->sampling_method              = CAPTURE_SAMP_NONE;
-  capture_opts->sampling_param               = 0;
-#endif
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-  capture_opts->buffer_size                  = 1;                /* 1 MB */
-#endif
-  capture_opts->has_snaplen                  = FALSE;
-  capture_opts->snaplen                      = WTAP_MAX_PACKET_SIZE; /* snapshot length - default is
-                                                                        infinite, in effect */
-  capture_opts->promisc_mode                 = TRUE;             /* promiscuous mode is the default */
-  capture_opts->monitor_mode                 = FALSE;
-  capture_opts->linktype                     = -1;               /* the default linktype */
-  capture_opts->saving_to_file               = FALSE;
-  capture_opts->save_file                    = NULL;
-  capture_opts->group_read_access            = FALSE;
-  capture_opts->use_pcapng                   = FALSE;            /* the default is pcap */
-  capture_opts->real_time_mode               = TRUE;
-  capture_opts->show_info                    = TRUE;
-  capture_opts->quit_after_cap               = FALSE;
-  capture_opts->restart                      = FALSE;
-
-  capture_opts->multi_files_on               = FALSE;
-  capture_opts->has_file_duration            = FALSE;
-  capture_opts->file_duration                = 60;               /* 1 min */
-  capture_opts->has_ring_num_files           = FALSE;
-  capture_opts->ring_num_files               = RINGBUFFER_MIN_NUM_FILES;
-
-  capture_opts->has_autostop_files           = FALSE;
-  capture_opts->autostop_files               = 1;
-  capture_opts->has_autostop_packets         = FALSE;
-  capture_opts->autostop_packets             = 0;
-  capture_opts->has_autostop_filesize        = FALSE;
-  capture_opts->autostop_filesize            = 1024;             /* 1 MB */
-  capture_opts->has_autostop_duration        = FALSE;
-  capture_opts->autostop_duration            = 60;               /* 1 min */
-
-
-  capture_opts->fork_child                   = -1;               /* invalid process handle */
-#ifdef _WIN32
-  capture_opts->signal_pipe_write_fd         = -1;
+    capture_opts->default_options.sampling_method = CAPTURE_SAMP_NONE;
+    capture_opts->default_options.sampling_param  = 0;
 #endif
-  capture_opts->state                        = CAPTURE_STOPPED;
-  capture_opts->output_to_pipe               = FALSE;
-#ifndef _WIN32
-  capture_opts->owner                        = getuid();
-  capture_opts->group                        = getgid();
+    capture_opts->default_options.timestamp_type  = NULL;
+    capture_opts->saving_to_file                  = FALSE;
+    capture_opts->save_file                       = NULL;
+    capture_opts->group_read_access               = FALSE;
+#ifdef PCAP_NG_DEFAULT
+    capture_opts->use_pcapng                      = TRUE;             /* Save as pcapng by default */
+#else
+    capture_opts->use_pcapng                      = FALSE;            /* Save as pcap by default */
 #endif
+    capture_opts->real_time_mode                  = TRUE;
+    capture_opts->show_info                       = TRUE;
+    capture_opts->restart                         = FALSE;
+    capture_opts->orig_save_file                  = NULL;
+
+    capture_opts->multi_files_on                  = FALSE;
+    capture_opts->has_file_duration               = FALSE;
+    capture_opts->file_duration                   = 60.0;             /* 1 min */
+    capture_opts->has_file_interval               = FALSE;
+    capture_opts->file_interval                   = 60;               /* 1 min */
+    capture_opts->has_file_packets                = FALSE;
+    capture_opts->file_packets                    = 0;
+    capture_opts->has_ring_num_files              = FALSE;
+    capture_opts->ring_num_files                  = RINGBUFFER_MIN_NUM_FILES;
+
+    capture_opts->has_autostop_files              = FALSE;
+    capture_opts->autostop_files                  = 1;
+    capture_opts->has_autostop_packets            = FALSE;
+    capture_opts->autostop_packets                = 0;
+    capture_opts->has_autostop_filesize           = FALSE;
+    capture_opts->autostop_filesize               = 1000;             /* 1 MB */
+    capture_opts->has_autostop_duration           = FALSE;
+    capture_opts->autostop_duration               = 60.0;             /* 1 min */
+    capture_opts->capture_comment                 = NULL;
+
+    capture_opts->output_to_pipe                  = FALSE;
+    capture_opts->capture_child                   = FALSE;
 }
 
+void
+capture_opts_cleanup(capture_options *capture_opts)
+{
+    if (!capture_opts)
+        return;
+
+    if (capture_opts->ifaces) {
+        while (capture_opts->ifaces->len > 0) {
+            capture_opts_del_iface(capture_opts, 0);
+        }
+        g_array_free(capture_opts->ifaces, TRUE);
+        capture_opts->ifaces = NULL;
+    }
+    if (capture_opts->all_ifaces) {
+        while (capture_opts->all_ifaces->len > 0) {
+            interface_t *device = &g_array_index(capture_opts->all_ifaces, interface_t, 0);
+            capture_opts_free_interface_t(device);
+            capture_opts->all_ifaces = g_array_remove_index(capture_opts->all_ifaces, 0);
+        }
+        g_array_free(capture_opts->all_ifaces, TRUE);
+        capture_opts->all_ifaces = NULL;
+    }
+    g_free(capture_opts->save_file);
+}
 
 /* log content of capture_opts */
 void
 capture_opts_log(const char *log_domain, GLogLevelFlags log_level, capture_options *capture_opts) {
-    gint i;
-
-    g_log(log_domain, log_level, "CAPTURE OPTIONS    :");
-    g_log(log_domain, log_level, "CFile              : 0x%p", capture_opts->cf);
-    g_log(log_domain, log_level, "Filter             : %s", capture_opts->cfilter);
-
-    for (i = 0; i < capture_opts->number_of_ifaces; i++) {
-        interface_options options;
-        
-        options = g_array_index(capture_opts->ifaces, interface_options, i);
-        g_log(log_domain, log_level, "Interface name[%02d] : %s", i, options.name);
-        g_log(log_domain, log_level, "Interface Descr[%02d]: %s", i, options.descr);
-        g_log(log_domain, log_level, "Capture filter[%02d] : %s", i, options.cfilter);
-        g_log(log_domain, log_level, "Snap length[%02d]    : %d", i, options.snaplen);
-        g_log(log_domain, log_level, "Link Type[%02d]      : %d", i, options.linktype);
-        g_log(log_domain, log_level, "Promiscous Mode[%02d]: %s", i, options.promisc_mode?"TRUE":"FALSE");
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-        g_log(log_domain, log_level, "Buffer size[%02d]    : %d (MB)", i, options.buffer_size);
-#endif
-        g_log(log_domain, log_level, "Monitor Mode[%02d]   : %s", i, options.monitor_mode?"TRUE":"FALSE");
-    }
-    g_log(log_domain, log_level, "Interface name[df] : %s", capture_opts->default_options.name);
-    g_log(log_domain, log_level, "Capture filter[df] : %s", capture_opts->default_options.cfilter);
-    g_log(log_domain, log_level, "Snap length[df]    : %d", capture_opts->default_options.snaplen);
-    g_log(log_domain, log_level, "Link Type[df]      : %d", capture_opts->default_options.linktype);
-    g_log(log_domain, log_level, "Promiscous Mode[df]: %s", capture_opts->default_options.promisc_mode?"TRUE":"FALSE");
-
+    guint i;
+
+    g_log(log_domain, log_level, "CAPTURE OPTIONS     :");
+
+    for (i = 0; i < capture_opts->ifaces->len; i++) {
+        interface_options *interface_opts;
+
+        interface_opts = &g_array_index(capture_opts->ifaces, interface_options, i);
+        g_log(log_domain, log_level, "Interface name[%02d]  : %s", i, interface_opts->name ? interface_opts->name : "(unspecified)");
+        g_log(log_domain, log_level, "Interface description[%02d] : %s", i, interface_opts->descr ? interface_opts->descr : "(unspecified)");
+        g_log(log_domain, log_level, "Display name[%02d]: %s", i, interface_opts->display_name ? interface_opts->display_name : "(unspecified)");
+        g_log(log_domain, log_level, "Capture filter[%02d]  : %s", i, interface_opts->cfilter ? interface_opts->cfilter : "(unspecified)");
+        g_log(log_domain, log_level, "Snap length[%02d] (%u) : %d", i, interface_opts->has_snaplen, interface_opts->snaplen);
+        g_log(log_domain, log_level, "Link Type[%02d]       : %d", i, interface_opts->linktype);
+        g_log(log_domain, log_level, "Promiscuous Mode[%02d]: %s", i, interface_opts->promisc_mode?"TRUE":"FALSE");
+        g_log(log_domain, log_level, "Extcap[%02d]          : %s", i, interface_opts->extcap ? interface_opts->extcap : "(unspecified)");
+        g_log(log_domain, log_level, "Extcap FIFO[%02d]     : %s", i, interface_opts->extcap_fifo ? interface_opts->extcap_fifo : "(unspecified)");
+        g_log(log_domain, log_level, "Extcap PID[%02d]      : %d", i, interface_opts->extcap_pid);
+#ifdef CAN_SET_CAPTURE_BUFFER_SIZE
+        g_log(log_domain, log_level, "Buffer size[%02d]     : %d (MB)", i, interface_opts->buffer_size);
+#endif
+        g_log(log_domain, log_level, "Monitor Mode[%02d]    : %s", i, interface_opts->monitor_mode?"TRUE":"FALSE");
 #ifdef HAVE_PCAP_REMOTE
-    g_log(log_domain, log_level, "Capture source     : %s",
-        capture_opts->src_type == CAPTURE_IFLOCAL ? "Local interface" :
-        capture_opts->src_type == CAPTURE_IFREMOTE ? "Remote interface" :
+        g_log(log_domain, log_level, "Capture source[%02d]  : %s", i,
+            interface_opts->src_type == CAPTURE_IFLOCAL ? "Local interface" :
+            interface_opts->src_type == CAPTURE_IFREMOTE ? "Remote interface" :
+            "Unknown");
+        if (interface_opts->src_type == CAPTURE_IFREMOTE) {
+            g_log(log_domain, log_level, "Remote host[%02d]     : %s", i, interface_opts->remote_host ? interface_opts->remote_host : "(unspecified)");
+            g_log(log_domain, log_level, "Remote port[%02d]     : %s", i, interface_opts->remote_port ? interface_opts->remote_port : "(unspecified)");
+        }
+        g_log(log_domain, log_level, "Authentication[%02d]  : %s", i,
+            interface_opts->auth_type == CAPTURE_AUTH_NULL ? "Null" :
+            interface_opts->auth_type == CAPTURE_AUTH_PWD ? "By username/password" :
+            "Unknown");
+        if (interface_opts->auth_type == CAPTURE_AUTH_PWD) {
+            g_log(log_domain, log_level, "Auth username[%02d]   : %s", i, interface_opts->auth_username ? interface_opts->auth_username : "(unspecified)");
+            g_log(log_domain, log_level, "Auth password[%02d]   : <hidden>", i);
+        }
+        g_log(log_domain, log_level, "UDP data tfer[%02d]   : %u", i, interface_opts->datatx_udp);
+        g_log(log_domain, log_level, "No cap. RPCAP[%02d]   : %u", i, interface_opts->nocap_rpcap);
+        g_log(log_domain, log_level, "No cap. local[%02d]   : %u", i, interface_opts->nocap_local);
+#endif
+#ifdef HAVE_PCAP_SETSAMPLING
+        g_log(log_domain, log_level, "Sampling meth.[%02d]  : %d", i, interface_opts->sampling_method);
+        g_log(log_domain, log_level, "Sampling param.[%02d] : %d", i, interface_opts->sampling_param);
+#endif
+        g_log(log_domain, log_level, "Timestamp type [%02d] : %s", i, interface_opts->timestamp_type);
+    }
+    g_log(log_domain, log_level, "Interface name[df]  : %s", capture_opts->default_options.name ? capture_opts->default_options.name : "(unspecified)");
+    g_log(log_domain, log_level, "Interface Descr[df] : %s", capture_opts->default_options.descr ? capture_opts->default_options.descr : "(unspecified)");
+    g_log(log_domain, log_level, "Capture filter[df]  : %s", capture_opts->default_options.cfilter ? capture_opts->default_options.cfilter : "(unspecified)");
+    g_log(log_domain, log_level, "Snap length[df] (%u) : %d", capture_opts->default_options.has_snaplen, capture_opts->default_options.snaplen);
+    g_log(log_domain, log_level, "Link Type[df]       : %d", capture_opts->default_options.linktype);
+    g_log(log_domain, log_level, "Promiscuous Mode[df]: %s", capture_opts->default_options.promisc_mode?"TRUE":"FALSE");
+    g_log(log_domain, log_level, "Extcap[df]          : %s", capture_opts->default_options.extcap ? capture_opts->default_options.extcap : "(unspecified)");
+    g_log(log_domain, log_level, "Extcap FIFO[df]     : %s", capture_opts->default_options.extcap_fifo ? capture_opts->default_options.extcap_fifo : "(unspecified)");
+#ifdef CAN_SET_CAPTURE_BUFFER_SIZE
+    g_log(log_domain, log_level, "Buffer size[df]     : %d (MB)", capture_opts->default_options.buffer_size);
+#endif
+    g_log(log_domain, log_level, "Monitor Mode[df]    : %s", capture_opts->default_options.monitor_mode?"TRUE":"FALSE");
+#ifdef HAVE_PCAP_REMOTE
+    g_log(log_domain, log_level, "Capture source[df]  : %s",
+        capture_opts->default_options.src_type == CAPTURE_IFLOCAL ? "Local interface" :
+        capture_opts->default_options.src_type == CAPTURE_IFREMOTE ? "Remote interface" :
         "Unknown");
-    if (capture_opts->src_type == CAPTURE_IFREMOTE) {
-        g_log(log_domain, log_level, "Remote host        : %s", capture_opts->remote_host);
-        g_log(log_domain, log_level, "Remote port        : %s", capture_opts->remote_port);
+    if (capture_opts->default_options.src_type == CAPTURE_IFREMOTE) {
+        g_log(log_domain, log_level, "Remote host[df]     : %s", capture_opts->default_options.remote_host ? capture_opts->default_options.remote_host : "(unspecified)");
+        g_log(log_domain, log_level, "Remote port[df]     : %s", capture_opts->default_options.remote_port ? capture_opts->default_options.remote_port : "(unspecified)");
     }
-    g_log(log_domain, log_level, "Authentication     : %s",
-        capture_opts->auth_type == CAPTURE_AUTH_NULL ? "Null" :
-        capture_opts->auth_type == CAPTURE_AUTH_PWD ? "By username/password" :
+    g_log(log_domain, log_level, "Authentication[df]  : %s",
+        capture_opts->default_options.auth_type == CAPTURE_AUTH_NULL ? "Null" :
+        capture_opts->default_options.auth_type == CAPTURE_AUTH_PWD ? "By username/password" :
         "Unknown");
-    if (capture_opts->auth_type == CAPTURE_AUTH_PWD) {
-        g_log(log_domain, log_level, "Auth username      : %s", capture_opts->auth_password);
-        g_log(log_domain, log_level, "Auth password      : <hidden>");
-    }
-    g_log(log_domain, log_level, "UDP data transfer  : %u", capture_opts->datatx_udp);
-    g_log(log_domain, log_level, "No capture RPCAP   : %u", capture_opts->nocap_rpcap);
-    g_log(log_domain, log_level, "No capture local   : %u", capture_opts->nocap_local);
-#endif
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-    g_log(log_domain, log_level, "BufferSize         : %u (MB)", capture_opts->buffer_size);
-#endif
-    g_log(log_domain, log_level, "SnapLen         (%u): %u", capture_opts->has_snaplen, capture_opts->snaplen);
-    g_log(log_domain, log_level, "Promisc            : %u", capture_opts->promisc_mode);
-    g_log(log_domain, log_level, "LinkType           : %d", capture_opts->linktype);
-    g_log(log_domain, log_level, "SavingToFile       : %u", capture_opts->saving_to_file);
-    g_log(log_domain, log_level, "SaveFile           : %s", (capture_opts->save_file) ? capture_opts->save_file : "");
-    g_log(log_domain, log_level, "GroupReadAccess    : %u", capture_opts->group_read_access);
-    g_log(log_domain, log_level, "Fileformat         : %s", (capture_opts->use_pcapng) ? "PCAPNG" : "PCAP");
-    g_log(log_domain, log_level, "RealTimeMode       : %u", capture_opts->real_time_mode);
-    g_log(log_domain, log_level, "ShowInfo           : %u", capture_opts->show_info);
-    g_log(log_domain, log_level, "QuitAfterCap       : %u", capture_opts->quit_after_cap);
-
-    g_log(log_domain, log_level, "MultiFilesOn       : %u", capture_opts->multi_files_on);
-    g_log(log_domain, log_level, "FileDuration    (%u): %u", capture_opts->has_file_duration, capture_opts->file_duration);
-    g_log(log_domain, log_level, "RingNumFiles    (%u): %u", capture_opts->has_ring_num_files, capture_opts->ring_num_files);
-
-    g_log(log_domain, log_level, "AutostopFiles   (%u): %u", capture_opts->has_autostop_files, capture_opts->autostop_files);
-    g_log(log_domain, log_level, "AutostopPackets (%u): %u", capture_opts->has_autostop_packets, capture_opts->autostop_packets);
-    g_log(log_domain, log_level, "AutostopFilesize(%u): %u (KB)", capture_opts->has_autostop_filesize, capture_opts->autostop_filesize);
-    g_log(log_domain, log_level, "AutostopDuration(%u): %u", capture_opts->has_autostop_duration, capture_opts->autostop_duration);
-
-    g_log(log_domain, log_level, "ForkChild          : %d", capture_opts->fork_child);
-#ifdef _WIN32
-    g_log(log_domain, log_level, "SignalPipeWrite    : %d", capture_opts->signal_pipe_write_fd);
+    if (capture_opts->default_options.auth_type == CAPTURE_AUTH_PWD) {
+        g_log(log_domain, log_level, "Auth username[df]   : %s", capture_opts->default_options.auth_username ? capture_opts->default_options.auth_username : "(unspecified)");
+        g_log(log_domain, log_level, "Auth password[df]   : <hidden>");
+    }
+    g_log(log_domain, log_level, "UDP data tfer[df]   : %u", capture_opts->default_options.datatx_udp);
+    g_log(log_domain, log_level, "No cap. RPCAP[df]   : %u", capture_opts->default_options.nocap_rpcap);
+    g_log(log_domain, log_level, "No cap. local[df]   : %u", capture_opts->default_options.nocap_local);
 #endif
+#ifdef HAVE_PCAP_SETSAMPLING
+    g_log(log_domain, log_level, "Sampling meth. [df] : %d", capture_opts->default_options.sampling_method);
+    g_log(log_domain, log_level, "Sampling param.[df] : %d", capture_opts->default_options.sampling_param);
+#endif
+    g_log(log_domain, log_level, "Timestamp type [df] : %s", capture_opts->default_options.timestamp_type ? capture_opts->default_options.timestamp_type : "(unspecified)");
+    g_log(log_domain, log_level, "SavingToFile        : %u", capture_opts->saving_to_file);
+    g_log(log_domain, log_level, "SaveFile            : %s", (capture_opts->save_file) ? capture_opts->save_file : "");
+    g_log(log_domain, log_level, "GroupReadAccess     : %u", capture_opts->group_read_access);
+    g_log(log_domain, log_level, "Fileformat          : %s", (capture_opts->use_pcapng) ? "PCAPNG" : "PCAP");
+    g_log(log_domain, log_level, "RealTimeMode        : %u", capture_opts->real_time_mode);
+    g_log(log_domain, log_level, "ShowInfo            : %u", capture_opts->show_info);
+
+    g_log(log_domain, log_level, "MultiFilesOn        : %u", capture_opts->multi_files_on);
+    g_log(log_domain, log_level, "FileDuration    (%u) : %.3f", capture_opts->has_file_duration, capture_opts->file_duration);
+    g_log(log_domain, log_level, "FileInterval    (%u) : %u", capture_opts->has_file_interval, capture_opts->file_interval);
+    g_log(log_domain, log_level, "FilePackets     (%u) : %u", capture_opts->has_file_packets, capture_opts->file_packets);
+    g_log(log_domain, log_level, "RingNumFiles    (%u) : %u", capture_opts->has_ring_num_files, capture_opts->ring_num_files);
+
+    g_log(log_domain, log_level, "AutostopFiles   (%u) : %u", capture_opts->has_autostop_files, capture_opts->autostop_files);
+    g_log(log_domain, log_level, "AutostopPackets (%u) : %u", capture_opts->has_autostop_packets, capture_opts->autostop_packets);
+    g_log(log_domain, log_level, "AutostopFilesize(%u) : %u (KB)", capture_opts->has_autostop_filesize, capture_opts->autostop_filesize);
+    g_log(log_domain, log_level, "AutostopDuration(%u) : %.3f", capture_opts->has_autostop_duration, capture_opts->autostop_duration);
 }
 
 /*
@@ -222,46 +263,101 @@ capture_opts_log(const char *log_domain, GLogLevelFlags log_level, capture_optio
 static gboolean
 set_autostop_criterion(capture_options *capture_opts, const char *autostoparg)
 {
-  gchar *p, *colonp;
-
-  colonp = strchr(autostoparg, ':');
-  if (colonp == NULL)
-    return FALSE;
-
-  p = colonp;
-  *p++ = '\0';
-
-  /*
-   * Skip over any white space (there probably won't be any, but
-   * as we allow it in the preferences file, we might as well
-   * allow it here).
-   */
-  while (isspace((guchar)*p))
-    p++;
-  if (*p == '\0') {
+    gchar *p, *colonp;
+
+    colonp = strchr(autostoparg, ':');
+    if (colonp == NULL)
+        return FALSE;
+
+    p = colonp;
+    *p++ = '\0';
+
     /*
-     * Put the colon back, so if our caller uses, in an
-     * error message, the string they passed us, the message
-     * looks correct.
+     * Skip over any white space (there probably won't be any, but
+     * as we allow it in the preferences file, we might as well
+     * allow it here).
      */
-    *colonp = ':';
-    return FALSE;
-  }
-  if (strcmp(autostoparg,"duration") == 0) {
-    capture_opts->has_autostop_duration = TRUE;
-    capture_opts->autostop_duration = get_positive_int(p,"autostop duration");
-  } else if (strcmp(autostoparg,"filesize") == 0) {
-    capture_opts->has_autostop_filesize = TRUE;
-    capture_opts->autostop_filesize = get_positive_int(p,"autostop filesize");
-  } else if (strcmp(autostoparg,"files") == 0) {
-    capture_opts->multi_files_on = TRUE;
-    capture_opts->has_autostop_files = TRUE;
-    capture_opts->autostop_files = get_positive_int(p,"autostop files");
-  } else {
-    return FALSE;
-  }
-  *colonp = ':'; /* put the colon back */
-  return TRUE;
+    while (g_ascii_isspace(*p))
+        p++;
+    if (*p == '\0') {
+        /*
+         * Put the colon back, so if our caller uses, in an
+         * error message, the string they passed us, the message
+         * looks correct.
+         */
+        *colonp = ':';
+        return FALSE;
+    }
+    if (strcmp(autostoparg,"duration") == 0) {
+        capture_opts->has_autostop_duration = TRUE;
+        capture_opts->autostop_duration = get_positive_double(p,"autostop duration");
+    } else if (strcmp(autostoparg,"filesize") == 0) {
+        capture_opts->has_autostop_filesize = TRUE;
+        capture_opts->autostop_filesize = get_nonzero_guint32(p,"autostop filesize");
+    } else if (strcmp(autostoparg,"files") == 0) {
+        capture_opts->multi_files_on = TRUE;
+        capture_opts->has_autostop_files = TRUE;
+        capture_opts->autostop_files = get_positive_int(p,"autostop files");
+    } else if (strcmp(autostoparg,"packets") == 0) {
+        capture_opts->has_autostop_packets = TRUE;
+        capture_opts->autostop_packets = get_positive_int(p,"packet count");
+    } else {
+        return FALSE;
+    }
+    *colonp = ':'; /* put the colon back */
+    return TRUE;
+}
+
+static gboolean get_filter_arguments(capture_options* capture_opts, const char* arg)
+{
+    char* colonp;
+    char* val;
+    char* filter_exp = NULL;
+
+    colonp = strchr(arg, ':');
+    if (colonp) {
+        val = colonp;
+        *val = '\0';
+        val++;
+        if (strcmp(arg, "predef") == 0) {
+            GList* filterItem;
+
+            filterItem = get_filter_list_first(CFILTER_LIST);
+            while (filterItem != NULL) {
+                filter_def *filterDef;
+
+                filterDef = (filter_def*)filterItem->data;
+                if (strcmp(val, filterDef->name) == 0) {
+                    filter_exp = g_strdup(filterDef->strval);
+                    break;
+                }
+                filterItem = filterItem->next;
+            }
+        }
+    }
+
+    if (filter_exp == NULL) {
+        /* No filter expression found yet; fallback to previous implemention
+           and assume the arg contains a filter expression */
+        if (colonp) {
+            *colonp = ':';      /* restore colon */
+        }
+        filter_exp = g_strdup(arg);
+    }
+
+    if (capture_opts->ifaces->len > 0) {
+        interface_options *interface_opts;
+
+        interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+        g_free(interface_opts->cfilter);
+        interface_opts->cfilter = filter_exp;
+        return TRUE;
+    }
+    else {
+        g_free(capture_opts->default_options.cfilter);
+        capture_opts->default_options.cfilter = filter_exp;
+        return TRUE;
+    }
 }
 
 /*
@@ -273,45 +369,51 @@ set_autostop_criterion(capture_options *capture_opts, const char *autostoparg)
 static gboolean
 get_ring_arguments(capture_options *capture_opts, const char *arg)
 {
-  gchar *p = NULL, *colonp;
-
-  colonp = strchr(arg, ':');
-  if (colonp == NULL)
-    return FALSE;
-
-  p = colonp;
-  *p++ = '\0';
-
-  /*
-   * Skip over any white space (there probably won't be any, but
-   * as we allow it in the preferences file, we might as well
-   * allow it here).
-   */
-  while (isspace((guchar)*p))
-    p++;
-  if (*p == '\0') {
+    gchar *p = NULL, *colonp;
+
+    colonp = strchr(arg, ':');
+    if (colonp == NULL)
+        return FALSE;
+
+    p = colonp;
+    *p++ = '\0';
+
     /*
-     * Put the colon back, so if our caller uses, in an
-     * error message, the string they passed us, the message
-     * looks correct.
+     * Skip over any white space (there probably won't be any, but
+     * as we allow it in the preferences file, we might as well
+     * allow it here).
      */
-    *colonp = ':';
-    return FALSE;
-  }
-
-  if (strcmp(arg,"files") == 0) {
-    capture_opts->has_ring_num_files = TRUE;
-    capture_opts->ring_num_files = get_positive_int(p, "number of ring buffer files");
-  } else if (strcmp(arg,"filesize") == 0) {
-    capture_opts->has_autostop_filesize = TRUE;
-    capture_opts->autostop_filesize = get_positive_int(p, "ring buffer filesize");
-  } else if (strcmp(arg,"duration") == 0) {
-    capture_opts->has_file_duration = TRUE;
-    capture_opts->file_duration = get_positive_int(p, "ring buffer duration");
-  }
-
-  *colonp = ':';    /* put the colon back */
-  return TRUE;
+    while (g_ascii_isspace(*p))
+        p++;
+    if (*p == '\0') {
+        /*
+         * Put the colon back, so if our caller uses, in an
+         * error message, the string they passed us, the message
+         * looks correct.
+         */
+        *colonp = ':';
+        return FALSE;
+    }
+
+    if (strcmp(arg,"files") == 0) {
+        capture_opts->has_ring_num_files = TRUE;
+        capture_opts->ring_num_files = get_nonzero_guint32(p, "number of ring buffer files");
+    } else if (strcmp(arg,"filesize") == 0) {
+        capture_opts->has_autostop_filesize = TRUE;
+        capture_opts->autostop_filesize = get_nonzero_guint32(p, "ring buffer filesize");
+    } else if (strcmp(arg,"duration") == 0) {
+        capture_opts->has_file_duration = TRUE;
+        capture_opts->file_duration = get_positive_double(p, "ring buffer duration");
+    } else if (strcmp(arg,"interval") == 0) {
+        capture_opts->has_file_interval = TRUE;
+        capture_opts->file_interval = get_positive_int(p, "ring buffer interval");
+    } else if (strcmp(arg,"packets") == 0) {
+        capture_opts->has_file_packets = TRUE;
+        capture_opts->file_packets = get_positive_int(p, "ring buffer packet count");
+    }
+
+    *colonp = ':';    /* put the colon back */
+    return TRUE;
 }
 
 #ifdef HAVE_PCAP_SETSAMPLING
@@ -333,7 +435,7 @@ get_sampling_arguments(capture_options *capture_opts, const char *arg)
     p = colonp;
     *p++ = '\0';
 
-    while (isspace((guchar)*p))
+    while (g_ascii_isspace(*p))
         p++;
     if (*p == '\0') {
         *colonp = ':';
@@ -341,11 +443,27 @@ get_sampling_arguments(capture_options *capture_opts, const char *arg)
     }
 
     if (strcmp(arg, "count") == 0) {
-        capture_opts->sampling_method = CAPTURE_SAMP_BY_COUNT;
-        capture_opts->sampling_param = get_positive_int(p, "sampling count");
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->sampling_method = CAPTURE_SAMP_BY_COUNT;
+            interface_opts->sampling_param = get_positive_int(p, "sampling count");
+        } else {
+            capture_opts->default_options.sampling_method = CAPTURE_SAMP_BY_COUNT;
+            capture_opts->default_options.sampling_param = get_positive_int(p, "sampling count");
+        }
     } else if (strcmp(arg, "timer") == 0) {
-        capture_opts->sampling_method = CAPTURE_SAMP_BY_TIMER;
-        capture_opts->sampling_param = get_positive_int(p, "sampling timer");
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->sampling_method = CAPTURE_SAMP_BY_TIMER;
+            interface_opts->sampling_param = get_positive_int(p, "sampling timer");
+        } else {
+            capture_opts->default_options.sampling_method = CAPTURE_SAMP_BY_TIMER;
+            capture_opts->default_options.sampling_param = get_positive_int(p, "sampling timer");
+        }
     }
     *colonp = ':';
     return TRUE;
@@ -371,17 +489,160 @@ get_auth_arguments(capture_options *capture_opts, const char *arg)
     p = colonp;
     *p++ = '\0';
 
-    while (isspace((guchar)*p))
+    while (g_ascii_isspace(*p))
         p++;
 
-    capture_opts->auth_type = CAPTURE_AUTH_PWD;
-    capture_opts->auth_username = g_strdup(arg);
-    capture_opts->auth_password = g_strdup(p);
+    if (capture_opts->ifaces->len > 0) {
+        interface_options *interface_opts;
+
+        interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+        interface_opts->auth_type = CAPTURE_AUTH_PWD;
+        interface_opts->auth_username = g_strdup(arg);
+        interface_opts->auth_password = g_strdup(p);
+    } else {
+        capture_opts->default_options.auth_type = CAPTURE_AUTH_PWD;
+        capture_opts->default_options.auth_username = g_strdup(arg);
+        capture_opts->default_options.auth_password = g_strdup(p);
+    }
     *colonp = ':';
     return TRUE;
 }
 #endif
 
+#ifdef _WIN32
+static char *
+capture_opts_generate_display_name(const char *friendly_name,
+                                   const char *name _U_)
+{
+    /*
+     * Display the friendly name rather than the not-so-friendly
+     * GUID-based interface name.
+     */
+    return g_strdup(friendly_name);
+}
+#else
+static char *
+capture_opts_generate_display_name(const char *friendly_name,
+                                   const char *name)
+{
+    /*
+     * On UN*X, however, users are more used to interface names,
+     * and may find it helpful to see them.
+     */
+    return g_strdup_printf("%s: %s", friendly_name, name);
+}
+#endif
+
+static void
+fill_in_interface_opts_from_ifinfo(interface_options *interface_opts,
+                                   const if_info_t *if_info)
+{
+    interface_opts->name = g_strdup(if_info->name);
+
+    if (if_info->friendly_name != NULL) {
+        /*
+         * We have a friendly name; remember it as the
+         * description...
+         */
+        interface_opts->descr = g_strdup(if_info->friendly_name);
+        /*
+         * ...and use it in the console display name.
+         */
+        interface_opts->display_name = capture_opts_generate_display_name(if_info->friendly_name, if_info->name);
+    } else {
+        /* fallback to the interface name */
+        interface_opts->descr = NULL;
+        interface_opts->display_name = g_strdup(if_info->name);
+    }
+    interface_opts->if_type = if_info->type;
+    interface_opts->extcap = g_strdup(if_info->extcap);
+}
+
+static gboolean
+fill_in_interface_opts_from_ifinfo_by_name(interface_options *interface_opts,
+                                           const char *name)
+{
+    gboolean    matched;
+    GList       *if_list;
+    int         err;
+    GList       *if_entry;
+    if_info_t   *if_info;
+    size_t      prefix_length;
+
+    matched = FALSE;
+    if_list = capture_interface_list(&err, NULL, NULL);
+    if (if_list != NULL) {
+        /*
+         * Try and do an exact match (case insensitive) on  the
+         * interface name, the interface description, and the
+         * hardware description.
+         */
+        for (if_entry = g_list_first(if_list); if_entry != NULL;
+             if_entry = g_list_next(if_entry))
+        {
+            if_info = (if_info_t *)if_entry->data;
+
+            /*
+             * Does the specified name match the interface name
+             * with a case-insensitive match?
+             */
+            if (g_ascii_strcasecmp(if_info->name, name) == 0) {
+                /*
+                 * Yes.
+                 */
+                matched = TRUE;
+                break;
+            }
+
+            /*
+             * Does this interface have a friendly name and, if so,
+             * does the specified name match the friendly name with
+             * a case-insensitive match?
+             */
+            if (if_info->friendly_name != NULL &&
+                g_ascii_strcasecmp(if_info->friendly_name, name) == 0) {
+                /*
+                 * Yes.
+                 */
+                matched = TRUE;
+                break;
+            }
+        }
+
+        if (!matched) {
+            /*
+             * We didn't find it; attempt a case-insensitive prefix match
+             * of the friendly name.
+             */
+            prefix_length = strlen(name);
+            for (if_entry = g_list_first(if_list); if_entry != NULL;
+                 if_entry = g_list_next(if_entry))
+            {
+                if_info = (if_info_t *)if_entry->data;
+
+                if (if_info->friendly_name != NULL &&
+                    g_ascii_strncasecmp(if_info->friendly_name, name, prefix_length) == 0) {
+                    /*
+                     * We found an interface whose friendly name matches
+                     * with a case-insensitive prefix match.
+                     */
+                    matched = TRUE;
+                    break;
+                }
+            }
+        }
+    }
+
+    if (matched) {
+        /*
+         * We found an interface that matches.
+         */
+        fill_in_interface_opts_from_ifinfo(interface_opts, if_info);
+    }
+    free_interface_list(if_list);
+    return matched;
+}
+
 static int
 capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg_str_p)
 {
@@ -391,8 +652,7 @@ capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg_str
     if_info_t   *if_info;
     int         err;
     gchar       *err_str;
-    interface_options options;
-
+    interface_options interface_opts;
 
     /*
      * If the argument is a number, treat it as an index into the list
@@ -417,59 +677,109 @@ capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg_str
             cmdarg_err("There is no interface with that adapter index");
             return 1;
         }
-        if_list = capture_interface_list(&err, &err_str);
+        if_list = capture_interface_list(&err, &err_str, NULL);
         if (if_list == NULL) {
-            switch (err) {
-
-            case CANT_GET_INTERFACE_LIST:
+            if (err == 0)
+                cmdarg_err("There are no interfaces on which a capture can be done");
+            else {
                 cmdarg_err("%s", err_str);
                 g_free(err_str);
-                break;
-
-            case NO_INTERFACES_FOUND:
-                cmdarg_err("There are no interfaces on which a capture can be done");
-                break;
             }
             return 2;
         }
-        if_info = (if_info_t *)g_list_nth_data(if_list, adapter_index - 1);
+        if_info = (if_info_t *)g_list_nth_data(if_list, (int)(adapter_index - 1));
         if (if_info == NULL) {
             cmdarg_err("There is no interface with that adapter index");
             return 1;
         }
-        capture_opts->iface = g_strdup(if_info->name);
-        options.name = g_strdup(if_info->name);
-        /*  We don't set iface_descr here because doing so requires
-         *  capture_ui_utils.c which requires epan/prefs.c which is
-         *  probably a bit too much dependency for here...
-         */
+        fill_in_interface_opts_from_ifinfo(&interface_opts, if_info);
         free_interface_list(if_list);
+    } else if (capture_opts->capture_child) {
+        /*
+         * In Wireshark capture child mode, so the exact interface name
+         * is supplied, and we don't need to look it up.
+         */
+       if_info = if_info_get(optarg_str_p);
+       fill_in_interface_opts_from_ifinfo(&interface_opts, if_info);
+        if_info_free(if_info);
     } else {
-        capture_opts->iface = g_strdup(optarg_str_p);
-        options.name = g_strdup(optarg_str_p);
+        /*
+         * Search for that name in the interface list and, if we found
+         * it, fill in fields in the interface_opts structure.
+         */
+        if (!fill_in_interface_opts_from_ifinfo_by_name(&interface_opts,
+                                                        optarg_str_p)) {
+            /*
+             * We didn't find the interface in the list; just use
+             * the specified name, so that, for example, if an
+             * interface doesn't show up in the list for some
+             * reason, the user can try specifying it explicitly
+             * for testing purposes.
+             */
+            interface_opts.name = g_strdup(optarg_str_p);
+            interface_opts.descr = NULL;
+            interface_opts.display_name = g_strdup(optarg_str_p);
+            interface_opts.if_type = capture_opts->default_options.if_type;
+            interface_opts.extcap = g_strdup(capture_opts->default_options.extcap);
+        }
     }
-    options.descr = g_strdup(capture_opts->default_options.descr);
-    options.cfilter = g_strdup(capture_opts->default_options.cfilter);
-    options.snaplen = capture_opts->default_options.snaplen;
-    options.linktype = capture_opts->default_options.linktype;
-    options.promisc_mode = capture_opts->default_options.promisc_mode;
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-    options.buffer_size = capture_opts->default_options.buffer_size;
+
+    interface_opts.cfilter = g_strdup(capture_opts->default_options.cfilter);
+    interface_opts.snaplen = capture_opts->default_options.snaplen;
+    interface_opts.has_snaplen = capture_opts->default_options.has_snaplen;
+    interface_opts.linktype = capture_opts->default_options.linktype;
+    interface_opts.promisc_mode = capture_opts->default_options.promisc_mode;
+    interface_opts.extcap_fifo = g_strdup(capture_opts->default_options.extcap_fifo);
+    interface_opts.extcap_args = NULL;
+    interface_opts.extcap_pid = WS_INVALID_PID;
+    interface_opts.extcap_pipedata = NULL;
+#ifdef _WIN32
+    interface_opts.extcap_pipe_h = INVALID_HANDLE_VALUE;
+    interface_opts.extcap_control_in_h = INVALID_HANDLE_VALUE;
+    interface_opts.extcap_control_out_h = INVALID_HANDLE_VALUE;
+#endif
+    interface_opts.extcap_control_in = g_strdup(capture_opts->default_options.extcap_control_in);
+    interface_opts.extcap_control_out = g_strdup(capture_opts->default_options.extcap_control_out);
+#ifdef CAN_SET_CAPTURE_BUFFER_SIZE
+    interface_opts.buffer_size = capture_opts->default_options.buffer_size;
+#endif
+    interface_opts.monitor_mode = capture_opts->default_options.monitor_mode;
+#ifdef HAVE_PCAP_REMOTE
+    interface_opts.src_type = capture_opts->default_options.src_type;
+    interface_opts.remote_host = g_strdup(capture_opts->default_options.remote_host);
+    interface_opts.remote_port = g_strdup(capture_opts->default_options.remote_port);
+    interface_opts.auth_type = capture_opts->default_options.auth_type;
+    interface_opts.auth_username = g_strdup(capture_opts->default_options.auth_username);
+    interface_opts.auth_password = g_strdup(capture_opts->default_options.auth_password);
+    interface_opts.datatx_udp = capture_opts->default_options.datatx_udp;
+    interface_opts.nocap_rpcap = capture_opts->default_options.nocap_rpcap;
+    interface_opts.nocap_local = capture_opts->default_options.nocap_local;
 #endif
-    options.monitor_mode = capture_opts->default_options.monitor_mode;
+#ifdef HAVE_PCAP_SETSAMPLING
+    interface_opts.sampling_method = capture_opts->default_options.sampling_method;
+    interface_opts.sampling_param  = capture_opts->default_options.sampling_param;
+#endif
+    interface_opts.timestamp_type  = capture_opts->default_options.timestamp_type;
 
-    g_array_append_val(capture_opts->ifaces, options);
-    capture_opts->number_of_ifaces++;
+    g_array_append_val(capture_opts->ifaces, interface_opts);
 
     return 0;
 }
 
+
 int
 capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_str_p, gboolean *start_capture)
 {
-    int status;
+    int status, snaplen;
 
     switch(opt) {
+    case LONGOPT_NUM_CAP_COMMENT:  /* capture comment */
+        if (capture_opts->capture_comment) {
+            cmdarg_err("--capture-comment can be set only once per file");
+            return 1;
+        }
+        capture_opts->capture_comment = g_strdup(optarg_str_p);
+        break;
     case 'a':        /* autostop criteria */
         if (set_autostop_criterion(capture_opts, optarg_str_p) == FALSE) {
             cmdarg_err("Invalid or unknown -a flag \"%s\"", optarg_str_p);
@@ -491,49 +801,44 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
             return 1;
         }
         break;
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
+#ifdef CAN_SET_CAPTURE_BUFFER_SIZE
     case 'B':        /* Buffer size */
-        capture_opts->buffer_size = get_positive_int(optarg_str_p, "buffer size");
-        if (capture_opts->number_of_ifaces > 0) {
-            interface_options options;
-
-            options = g_array_index(capture_opts->ifaces, interface_options, capture_opts->number_of_ifaces - 1);
-            capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, capture_opts->number_of_ifaces - 1);
-            options.buffer_size = get_positive_int(optarg_str_p, "buffer size");
-            g_array_append_val(capture_opts->ifaces, options);
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->buffer_size = get_positive_int(optarg_str_p, "buffer size");
         } else {
             capture_opts->default_options.buffer_size = get_positive_int(optarg_str_p, "buffer size");
         }
         break;
 #endif
     case 'c':        /* Capture n packets */
+        /* XXX Use set_autostop_criterion instead? */
         capture_opts->has_autostop_packets = TRUE;
         capture_opts->autostop_packets = get_positive_int(optarg_str_p, "packet count");
         break;
     case 'f':        /* capture filter */
-        if ((!capture_opts->use_pcapng) && (capture_opts->has_cfilter)) {
-            cmdarg_err("More than one -f argument specified");
-            return 1;
-        }
-        capture_opts->has_cfilter = TRUE;
-        g_free(capture_opts->cfilter);
-        capture_opts->cfilter = g_strdup(optarg_str_p);
-        if (capture_opts->number_of_ifaces > 0) {
-            interface_options options;
-
-            options = g_array_index(capture_opts->ifaces, interface_options, capture_opts->number_of_ifaces - 1);
-            capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, capture_opts->number_of_ifaces - 1);
-            g_free(options.cfilter);
-            options.cfilter = g_strdup(capture_opts->cfilter);
-            g_array_append_val(capture_opts->ifaces, options);
-        } else {
-            g_free(capture_opts->default_options.cfilter);
-            capture_opts->default_options.cfilter = g_strdup(capture_opts->cfilter);
-        }
+        get_filter_arguments(capture_opts, optarg_str_p);
+        break;
+    case 'g':        /* enable group read access on the capture file(s) */
+        capture_opts->group_read_access = TRUE;
         break;
     case 'H':        /* Hide capture info dialog box */
         capture_opts->show_info = FALSE;
         break;
+    case LONGOPT_SET_TSTAMP_TYPE:        /* Set capture time stamp type */
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            g_free(interface_opts->timestamp_type);
+            interface_opts->timestamp_type = g_strdup(optarg_str_p);
+        } else {
+            g_free(capture_opts->default_options.timestamp_type);
+            capture_opts->default_options.timestamp_type = g_strdup(optarg_str_p);
+        }
+        break;
     case 'i':        /* Use interface x */
         status = capture_opts_add_iface_opt(capture_opts, optarg_str_p);
         if (status != 0) {
@@ -542,14 +847,11 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
         break;
 #ifdef HAVE_PCAP_CREATE
     case 'I':        /* Capture in monitor mode */
-        capture_opts->monitor_mode = TRUE;
-        if (capture_opts->number_of_ifaces > 0) {
-            interface_options options;
-
-            options = g_array_index(capture_opts->ifaces, interface_options, capture_opts->number_of_ifaces - 1);
-            capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, capture_opts->number_of_ifaces - 1);
-            options.monitor_mode = TRUE;
-            g_array_append_val(capture_opts->ifaces, options);
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->monitor_mode = TRUE;
         } else {
             capture_opts->default_options.monitor_mode = TRUE;
         }
@@ -571,45 +873,47 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
         capture_opts->use_pcapng = TRUE;
         break;
     case 'p':        /* Don't capture in promiscuous mode */
-        capture_opts->promisc_mode = FALSE;
-        if (capture_opts->number_of_ifaces > 0) {
-            interface_options options;
-
-            options = g_array_index(capture_opts->ifaces, interface_options, capture_opts->number_of_ifaces - 1);
-            capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, capture_opts->number_of_ifaces - 1);
-            options.promisc_mode = FALSE;
-            g_array_append_val(capture_opts->ifaces, options);
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->promisc_mode = FALSE;
         } else {
             capture_opts->default_options.promisc_mode = FALSE;
         }
         break;
-    case 'Q':        /* Quit after capture (just capture to file) */
-        capture_opts->quit_after_cap  = TRUE;
-        *start_capture   = TRUE;  /*** -Q implies -k !! ***/
+    case 'P':        /* Use pcap format */
+        capture_opts->use_pcapng = FALSE;
         break;
 #ifdef HAVE_PCAP_REMOTE
     case 'r':
-        capture_opts->nocap_rpcap = FALSE;
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->nocap_rpcap = FALSE;
+        } else {
+            capture_opts->default_options.nocap_rpcap = FALSE;
+        }
         break;
 #endif
     case 's':        /* Set the snapshot (capture) length */
-        capture_opts->has_snaplen = TRUE;
-        capture_opts->snaplen = get_natural_int(optarg_str_p, "snapshot length");
+        snaplen = get_natural_int(optarg_str_p, "snapshot length");
         /*
          * Make a snapshot length of 0 equivalent to the maximum packet
          * length, mirroring what tcpdump does.
          */
-        if (capture_opts->snaplen == 0)
-            capture_opts->snaplen = WTAP_MAX_PACKET_SIZE;
-        if (capture_opts->number_of_ifaces > 0) {
-            interface_options options;
-
-            options = g_array_index(capture_opts->ifaces, interface_options, capture_opts->number_of_ifaces - 1);
-            capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, capture_opts->number_of_ifaces - 1);
-            options.snaplen = capture_opts->snaplen;
-            g_array_append_val(capture_opts->ifaces, options);
+        if (snaplen == 0)
+            snaplen = WTAP_MAX_PACKET_SIZE_STANDARD;
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->has_snaplen = TRUE;
+            interface_opts->snaplen = snaplen;
         } else {
-            capture_opts->default_options.snaplen = capture_opts->snaplen;
+            capture_opts->default_options.snaplen = snaplen;
+            capture_opts->default_options.has_snaplen = TRUE;
         }
         break;
     case 'S':        /* "Real-Time" mode: used for following file ala tail -f */
@@ -617,39 +921,40 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
         break;
 #ifdef HAVE_PCAP_REMOTE
     case 'u':
-        capture_opts->datatx_udp = TRUE;
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->datatx_udp = TRUE;
+        } else {
+            capture_opts->default_options.datatx_udp = TRUE;
+        }
         break;
 #endif
     case 'w':        /* Write to capture file x */
         capture_opts->saving_to_file = TRUE;
         g_free(capture_opts->save_file);
-#if defined _WIN32 && GLIB_CHECK_VERSION(2,6,0)
-        /* since GLib 2.6, we need to convert filenames to utf8 for Win32 */
-        capture_opts->save_file = g_locale_to_utf8(optarg_str_p, -1, NULL, NULL, NULL);
-#else
         capture_opts->save_file = g_strdup(optarg_str_p);
-#endif
         status = capture_opts_output_to_pipe(capture_opts->save_file, &capture_opts->output_to_pipe);
         return status;
-    case 'g':        /* enable group read access on the capture file(s) */
-        capture_opts->group_read_access = TRUE;
-        break;
     case 'y':        /* Set the pcap data link type */
-        capture_opts->linktype = linktype_name_to_val(optarg_str_p);
-        if (capture_opts->linktype == -1) {
-            cmdarg_err("The specified data link type \"%s\" isn't valid",
-                       optarg_str_p);
-            return 1;
-        }
-        if (capture_opts->number_of_ifaces > 0) {
-            interface_options options;
-
-            options = g_array_index(capture_opts->ifaces, interface_options, capture_opts->number_of_ifaces - 1);
-            capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, capture_opts->number_of_ifaces - 1);
-            options.linktype = linktype_name_to_val(optarg_str_p);
-            g_array_append_val(capture_opts->ifaces, options);
+        if (capture_opts->ifaces->len > 0) {
+            interface_options *interface_opts;
+
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, capture_opts->ifaces->len - 1);
+            interface_opts->linktype = linktype_name_to_val(optarg_str_p);
+            if (interface_opts->linktype == -1) {
+                cmdarg_err("The specified data link type \"%s\" isn't valid",
+                           optarg_str_p);
+                return 1;
+            }
         } else {
             capture_opts->default_options.linktype = linktype_name_to_val(optarg_str_p);
+            if (capture_opts->default_options.linktype == -1) {
+                cmdarg_err("The specified data link type \"%s\" isn't valid",
+                           optarg_str_p);
+                return 1;
+            }
         }
         break;
     default:
@@ -661,26 +966,40 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
 }
 
 void
-capture_opts_print_if_capabilities(if_capabilities_t *caps,
-                                   gboolean monitor_mode)
+capture_opts_print_if_capabilities(if_capabilities_t *caps, char *name, int queries)
 {
-    GList *lt_entry;
-    data_link_info_t *data_link_info;
+    GList *lt_entry, *ts_entry;
 
-    if (caps->can_set_rfmon)
-        fprintf_stderr("Data link types when %sin monitor mode (use option -y to set):\n",
-                       monitor_mode ? "" : "not ");
-    else
-        fprintf_stderr("Data link types (use option -y to set):\n");
-    for (lt_entry = caps->data_link_types; lt_entry != NULL;
-         lt_entry = g_list_next(lt_entry)) {
-        data_link_info = (data_link_info_t *)lt_entry->data;
-        fprintf_stderr("  %s", data_link_info->name);
-        if (data_link_info->description != NULL)
-            fprintf_stderr(" (%s)", data_link_info->description);
+    if (queries & CAPS_QUERY_LINK_TYPES) {
+        if (caps->can_set_rfmon)
+            printf("Data link types of interface %s when %sin monitor mode (use option -y to set):\n",
+                   name, queries & CAPS_MONITOR_MODE ? "" : "not ");
         else
-            fprintf_stderr(" (not supported)");
-        fprintf_stderr("\n");
+            printf("Data link types of interface %s (use option -y to set):\n", name);
+        for (lt_entry = caps->data_link_types; lt_entry != NULL;
+             lt_entry = g_list_next(lt_entry)) {
+            data_link_info_t *data_link_info = (data_link_info_t *)lt_entry->data;
+            printf("  %s", data_link_info->name);
+            if (data_link_info->description != NULL)
+                printf(" (%s)", data_link_info->description);
+            else
+                printf(" (not supported)");
+            printf("\n");
+        }
+    }
+
+    if (queries & CAPS_QUERY_TIMESTAMP_TYPES) {
+        printf("Timestamp types of the interface (use option --time-stamp-type to set):\n");
+        for (ts_entry = caps->timestamp_types; ts_entry != NULL;
+             ts_entry = g_list_next(ts_entry)) {
+            timestamp_info_t *timestamp = (timestamp_info_t *)ts_entry->data;
+            printf("  %s", timestamp->name);
+            if (timestamp->description != NULL)
+                printf(" (%s)", timestamp->description);
+            else
+                printf(" (none)");
+            printf("\n");
+        }
     }
 }
 
@@ -696,39 +1015,46 @@ capture_opts_print_interfaces(GList *if_list)
     for (if_entry = g_list_first(if_list); if_entry != NULL;
          if_entry = g_list_next(if_entry)) {
         if_info = (if_info_t *)if_entry->data;
-        fprintf_stderr("%d. %s", i++, if_info->name);
+        printf("%d. %s", i++, if_info->name);
 
-        /* Print the description if it exists */
-        if (if_info->description != NULL)
-            fprintf_stderr(" (%s)", if_info->description);
-        fprintf_stderr("\n");
+        /* Print the interface friendly name, if it exists;
+          if not, fall back to the vendor description, if it exists. */
+        if (if_info->friendly_name != NULL){
+            printf(" (%s)", if_info->friendly_name);
+        } else {
+            if (if_info->vendor_description != NULL)
+                printf(" (%s)", if_info->vendor_description);
+        }
+        printf("\n");
     }
 }
 
 
-void capture_opts_trim_snaplen(capture_options *capture_opts, int snaplen_min)
+void
+capture_opts_trim_snaplen(capture_options *capture_opts, int snaplen_min)
 {
-    gint i;
-    interface_options options;
-
-    if (capture_opts->snaplen < 1)
-        capture_opts->snaplen = WTAP_MAX_PACKET_SIZE;
-    else if (capture_opts->snaplen < snaplen_min)
-        capture_opts->snaplen = snaplen_min;
-
-    for (i = 0; i < capture_opts->number_of_ifaces; i++) {
-        options = g_array_index(capture_opts->ifaces, interface_options, 0);
-        capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, 0);
-        if (options.snaplen < 1)
-            options.snaplen = WTAP_MAX_PACKET_SIZE;
-        else if (options.snaplen < snaplen_min)
-            options.snaplen = snaplen_min;
-        g_array_append_val(capture_opts->ifaces, options);
+    guint i;
+    interface_options *interface_opts;
+
+    if (capture_opts->ifaces->len > 0) {
+        for (i = 0; i < capture_opts->ifaces->len; i++) {
+            interface_opts = &g_array_index(capture_opts->ifaces, interface_options, 0);
+            if (interface_opts->snaplen < 1)
+                interface_opts->snaplen = WTAP_MAX_PACKET_SIZE_STANDARD;
+            else if (interface_opts->snaplen < snaplen_min)
+                interface_opts->snaplen = snaplen_min;
+        }
+    } else {
+        if (capture_opts->default_options.snaplen < 1)
+            capture_opts->default_options.snaplen = WTAP_MAX_PACKET_SIZE_STANDARD;
+        else if (capture_opts->default_options.snaplen < snaplen_min)
+            capture_opts->default_options.snaplen = snaplen_min;
     }
 }
 
 
-void capture_opts_trim_ring_num_files(capture_options *capture_opts)
+void
+capture_opts_trim_ring_num_files(capture_options *capture_opts)
 {
     /* Check the value range of the ring_num_files parameter */
     if (capture_opts->ring_num_files > RINGBUFFER_MAX_NUM_FILES) {
@@ -744,128 +1070,247 @@ void capture_opts_trim_ring_num_files(capture_options *capture_opts)
 #endif
 }
 
-
-gboolean capture_opts_trim_iface(capture_options *capture_opts, const char *capture_device)
+/*
+ * If no interface was specified explicitly, pick a default.
+ */
+int
+capture_opts_default_iface_if_necessary(capture_options *capture_opts,
+                                        const char *capture_device)
 {
-    GList       *if_list;
-    if_info_t   *if_info;
-    int         err;
-    gchar       *err_str;
-    interface_options options;
-
+    int status;
 
     /* Did the user specify an interface to use? */
-    if (capture_opts->number_of_ifaces == 0) {
-        /* No - is a default specified in the preferences file? */
-        if (capture_device != NULL) {
-            /* Yes - use it. */
-            capture_opts->iface = g_strdup(capture_device);
-            options.name = g_strdup(capture_device);
-            /*  We don't set iface_descr here because doing so requires
-             *  capture_ui_utils.c which requires epan/prefs.c which is
-             *  probably a bit too much dependency for here...
-             */
-        } else {
-            /* No - pick the first one from the list of interfaces. */
-            if_list = capture_interface_list(&err, &err_str);
-            if (if_list == NULL) {
-                switch (err) {
-
-                case CANT_GET_INTERFACE_LIST:
-                    cmdarg_err("%s", err_str);
-                    g_free(err_str);
-                    break;
-
-                case NO_INTERFACES_FOUND:
-                    cmdarg_err("There are no interfaces on which a capture can be done");
-                    break;
-                }
-                return FALSE;
-            }
-            if_info = (if_info_t *)if_list->data;      /* first interface */
-            capture_opts->iface = g_strdup(if_info->name);
-            options.name = g_strdup(if_info->name);
-            /*  We don't set iface_descr here because doing so requires
-             *  capture_ui_utils.c which requires epan/prefs.c which is
-             *  probably a bit too much dependency for here...
-             */
-            free_interface_list(if_list);
-        }
-        options.cfilter = g_strdup(capture_opts->default_options.cfilter);
-        options.snaplen = capture_opts->default_options.snaplen;
-        options.linktype = capture_opts->default_options.linktype;
-        options.promisc_mode = capture_opts->default_options.promisc_mode;
-#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
-        options.buffer_size = capture_opts->default_options.buffer_size;
-#endif
-        options.monitor_mode = capture_opts->default_options.monitor_mode;
-        g_array_append_val(capture_opts->ifaces, options);
-        capture_opts->number_of_ifaces++;
+    if (capture_opts->num_selected != 0 || capture_opts->ifaces->len != 0) {
+        /* yes they did, return immediately - nothing further to do here */
+        return 0;
     }
 
-    return TRUE;
+    /* No - is a default specified in the preferences file? */
+    if (capture_device != NULL) {
+        /* Yes - use it. */
+        status = capture_opts_add_iface_opt(capture_opts, capture_device);
+        return status;
+    }
+    /* No default in preferences file, just pick the first interface from the list of interfaces. */
+    return capture_opts_add_iface_opt(capture_opts, "1");
 }
 
-
-
 #ifndef S_IFIFO
-#define S_IFIFO        _S_IFIFO
+#define S_IFIFO _S_IFIFO
 #endif
 #ifndef S_ISFIFO
 #define S_ISFIFO(mode)  (((mode) & S_IFMT) == S_IFIFO)
 #endif
 
 /* copied from filesystem.c */
-static int capture_opts_test_for_fifo(const char *path)
+static int
+capture_opts_test_for_fifo(const char *path)
 {
-  ws_statb64 statb;
+    ws_statb64 statb;
+
+    if (ws_stat64(path, &statb) < 0)
+        return errno;
+
+    if (S_ISFIFO(statb.st_mode))
+        return ESPIPE;
+    else
+        return 0;
+}
 
-  if (ws_stat64(path, &statb) < 0)
-    return errno;
+static gboolean
+capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe)
+{
+    int err;
+
+    *is_pipe = FALSE;
+
+    if (save_file != NULL) {
+        /* We're writing to a capture file. */
+        if (strcmp(save_file, "-") == 0) {
+            /* Writing to stdout. */
+            /* XXX - should we check whether it's a pipe?  It's arguably
+               silly to do "-w - >output_file" rather than "-w output_file",
+               but by not checking we might be violating the Principle Of
+               Least Astonishment. */
+            *is_pipe = TRUE;
+        } else {
+            /* not writing to stdout, test for a FIFO (aka named pipe) */
+            err = capture_opts_test_for_fifo(save_file);
+            switch (err) {
+
+            case ENOENT:      /* it doesn't exist, so we'll be creating it,
+                                 and it won't be a FIFO */
+            case 0:           /* found it, but it's not a FIFO */
+                break;
+
+            case ESPIPE:      /* it is a FIFO */
+                *is_pipe = TRUE;
+                break;
+
+            default:          /* couldn't stat it              */
+                break;          /* ignore: later attempt to open */
+                /*  will generate a nice msg     */
+            }
+        }
+    }
 
-  if (S_ISFIFO(statb.st_mode))
-    return ESPIPE;
-  else
     return 0;
 }
 
-static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe)
+void
+capture_opts_del_iface(capture_options *capture_opts, guint if_index)
 {
-  int err;
-
-  *is_pipe = FALSE;
-
-  if (save_file != NULL) {
-    /* We're writing to a capture file. */
-    if (strcmp(save_file, "-") == 0) {
-      /* Writing to stdout. */
-      /* XXX - should we check whether it's a pipe?  It's arguably
-         silly to do "-w - >output_file" rather than "-w output_file",
-         but by not checking we might be violating the Principle Of
-         Least Astonishment. */
-      *is_pipe = TRUE;
-    } else {
-      /* not writing to stdout, test for a FIFO (aka named pipe) */
-      err = capture_opts_test_for_fifo(save_file);
-      switch (err) {
+    interface_options *interface_opts;
+
+    interface_opts = &g_array_index(capture_opts->ifaces, interface_options, if_index);
+    /* XXX - check if found? */
+
+    g_free(interface_opts->name);
+    g_free(interface_opts->descr);
+    g_free(interface_opts->display_name);
+    g_free(interface_opts->cfilter);
+    g_free(interface_opts->timestamp_type);
+    g_free(interface_opts->extcap);
+    g_free(interface_opts->extcap_fifo);
+    if (interface_opts->extcap_args)
+        g_hash_table_unref(interface_opts->extcap_args);
+    if (interface_opts->extcap_pid != WS_INVALID_PID)
+        ws_pipe_close((ws_pipe_t *) interface_opts->extcap_pipedata);
+    g_free(interface_opts->extcap_pipedata);
+    g_free(interface_opts->extcap_control_in);
+    g_free(interface_opts->extcap_control_out);
+#ifdef HAVE_PCAP_REMOTE
+    if (interface_opts->src_type == CAPTURE_IFREMOTE) {
+        g_free(interface_opts->remote_host);
+        g_free(interface_opts->remote_port);
+        g_free(interface_opts->auth_username);
+        g_free(interface_opts->auth_password);
+    }
+#endif
+    capture_opts->ifaces = g_array_remove_index(capture_opts->ifaces, if_index);
+}
 
-      case ENOENT:      /* it doesn't exist, so we'll be creating it,
-                           and it won't be a FIFO */
-      case 0:           /* found it, but it's not a FIFO */
-        break;
 
-      case ESPIPE:      /* it is a FIFO */
-        *is_pipe = TRUE;
-        break;
 
-      default:          /* couldn't stat it              */
-        break;          /* ignore: later attempt to open */
-                        /*  will generate a nice msg     */
-      }
+/*
+ * Add all non-hidden selected interfaces in the "all interfaces" list
+ * to the list of interfaces for the capture.
+ */
+void
+collect_ifaces(capture_options *capture_opts)
+{
+    guint i;
+    interface_t *device;
+    interface_options interface_opts;
+
+    /* Empty out the existing list of interfaces. */
+    for (i = capture_opts->ifaces->len; i != 0; i--)
+        capture_opts_del_iface(capture_opts, i-1);
+
+    /* Now fill the list up again. */
+    for (i = 0; i < capture_opts->all_ifaces->len; i++) {
+        device = &g_array_index(capture_opts->all_ifaces, interface_t, i);
+        if (!device->hidden && device->selected) {
+            interface_opts.name = g_strdup(device->name);
+            interface_opts.descr = g_strdup(device->friendly_name);
+            interface_opts.display_name = g_strdup(device->display_name);
+            interface_opts.linktype = device->active_dlt;
+            interface_opts.cfilter = g_strdup(device->cfilter);
+            interface_opts.timestamp_type = g_strdup(device->timestamp_type);
+            interface_opts.snaplen = device->snaplen;
+            interface_opts.has_snaplen = device->has_snaplen;
+            interface_opts.promisc_mode = device->pmode;
+            interface_opts.if_type = device->if_info.type;
+            interface_opts.extcap = g_strdup(device->if_info.extcap);
+            interface_opts.extcap_fifo = NULL;
+            interface_opts.extcap_pipedata = NULL;
+            interface_opts.extcap_args = device->external_cap_args_settings;
+            interface_opts.extcap_pid = WS_INVALID_PID;
+            if (interface_opts.extcap_args)
+                g_hash_table_ref(interface_opts.extcap_args);
+            interface_opts.extcap_pipedata = NULL;
+#ifdef _WIN32
+            interface_opts.extcap_pipe_h = INVALID_HANDLE_VALUE;
+            interface_opts.extcap_control_in_h = INVALID_HANDLE_VALUE;
+            interface_opts.extcap_control_out_h = INVALID_HANDLE_VALUE;
+#endif
+            interface_opts.extcap_control_in = NULL;
+            interface_opts.extcap_control_out = NULL;
+#ifdef CAN_SET_CAPTURE_BUFFER_SIZE
+            interface_opts.buffer_size =  device->buffer;
+#endif
+#ifdef HAVE_PCAP_CREATE
+            interface_opts.monitor_mode = device->monitor_mode_enabled;
+#endif
+#ifdef HAVE_PCAP_REMOTE
+            interface_opts.src_type = CAPTURE_IFREMOTE;
+            interface_opts.remote_host = g_strdup(device->remote_opts.remote_host_opts.remote_host);
+            interface_opts.remote_port = g_strdup(device->remote_opts.remote_host_opts.remote_port);
+            interface_opts.auth_type = device->remote_opts.remote_host_opts.auth_type;
+            interface_opts.auth_username = g_strdup(device->remote_opts.remote_host_opts.auth_username);
+            interface_opts.auth_password = g_strdup(device->remote_opts.remote_host_opts.auth_password);
+            interface_opts.datatx_udp = device->remote_opts.remote_host_opts.datatx_udp;
+            interface_opts.nocap_rpcap = device->remote_opts.remote_host_opts.nocap_rpcap;
+            interface_opts.nocap_local = device->remote_opts.remote_host_opts.nocap_local;
+#endif
+#ifdef HAVE_PCAP_SETSAMPLING
+            interface_opts.sampling_method = device->remote_opts.sampling_method;
+            interface_opts.sampling_param  = device->remote_opts.sampling_param;
+#endif
+            g_array_append_val(capture_opts->ifaces, interface_opts);
+        } else {
+            continue;
+        }
     }
-  }
+}
 
-  return 0;
+static void
+capture_opts_free_interface_t_links(gpointer elem, gpointer unused _U_)
+{
+    link_row* e = (link_row*)elem;
+    if (e != NULL)
+        g_free(e->name);
+    g_free(elem);
+}
+
+void
+capture_opts_free_interface_t(interface_t *device)
+{
+    if (device != NULL) {
+        g_free(device->name);
+        g_free(device->display_name);
+        g_free(device->friendly_name);
+        g_free(device->addresses);
+        g_free(device->cfilter);
+        g_free(device->timestamp_type);
+        g_list_foreach(device->links,
+                       capture_opts_free_interface_t_links, NULL);
+        g_list_free(device->links);
+#ifdef HAVE_PCAP_REMOTE
+        g_free(device->remote_opts.remote_host_opts.remote_host);
+        g_free(device->remote_opts.remote_host_opts.remote_port);
+        g_free(device->remote_opts.remote_host_opts.auth_username);
+        g_free(device->remote_opts.remote_host_opts.auth_password);
+#endif
+        g_free(device->if_info.name);
+        g_free(device->if_info.friendly_name);
+        g_free(device->if_info.vendor_description);
+        g_slist_free_full(device->if_info.addrs, g_free);
+        g_free(device->if_info.extcap);
+    }
 }
 
 #endif /* HAVE_LIBPCAP */
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */