If we have pcap_open, call it instead of pcap_open_live, otherwise we might
[obnox/wireshark/wip.git] / capture_opts.c
index c8302dc05dcb55b39da2da399d8d55ed3b994fc8..b39d368deac34205560697f0286926f8aea36769 100644 (file)
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * 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
 #include <string.h>
 #include <ctype.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.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 <glib.h>
 
 #include <epan/packet.h>
 
-#include "capture.h"
 #include "capture_opts.h"
 #include "ringbuffer.h"
 #include "clopts_common.h"
 #include "capture-pcap-util.h"
 #include <wiretap/file_util.h>
 
+typedef struct {
+    char *name;
+    pcap_t *pch;
+} if_stat_t;
 
 static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe);
 
@@ -51,9 +82,25 @@ static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_
 void
 capture_opts_init(capture_options *capture_opts, void *cfile)
 {
-  capture_opts->cf                      = cfile;            
+  capture_opts->cf                      = cfile;
   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;
+#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;
+#ifdef HAVE_PCAP_SETSAMPLING
+  capture_opts->sampling_method         = CAPTURE_SAMP_NONE;
+  capture_opts->sampling_param          = 0;
+#endif
+#endif
 #ifdef _WIN32
   capture_opts->buffer_size             = 1;                /* 1 MB */
 #endif
@@ -77,7 +124,7 @@ capture_opts_init(capture_options *capture_opts, void *cfile)
 
   capture_opts->has_autostop_files      = FALSE;
   capture_opts->autostop_files          = 1;
-  capture_opts->has_autostop_packets    = FALSE;            
+  capture_opts->has_autostop_packets    = FALSE;
   capture_opts->autostop_packets        = 0;
   capture_opts->has_autostop_filesize   = FALSE;
   capture_opts->autostop_filesize       = 1024;             /* 1 MB */
@@ -91,6 +138,10 @@ capture_opts_init(capture_options *capture_opts, void *cfile)
 #endif
   capture_opts->state                   = CAPTURE_STOPPED;
   capture_opts->output_to_pipe          = FALSE;
+#ifndef _WIN32
+  capture_opts->owner                   = getuid();
+  capture_opts->group                   = getgid();
+#endif
 }
 
 
@@ -101,6 +152,30 @@ capture_opts_log(const char *log_domain, GLogLevelFlags log_level, capture_optio
     g_log(log_domain, log_level, "CFile              : 0x%p", capture_opts->cf);
     g_log(log_domain, log_level, "Filter             : %s", capture_opts->cfilter);
     g_log(log_domain, log_level, "Interface          : %s", capture_opts->iface);
+    /* iface_descr may not been filled in and some C Libraries hate a null ptr for %s */
+    g_log(log_domain, log_level, "Interface Descr    : %s",
+         capture_opts->iface_descr ? capture_opts->iface_descr : "<null>");
+#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" :
+        "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        : %u", capture_opts->remote_port);
+    }
+    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" :
+        "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
 #ifdef _WIN32
     g_log(log_domain, log_level, "BufferSize         : %u (MB)", capture_opts->buffer_size);
 #endif
@@ -229,6 +304,73 @@ get_ring_arguments(capture_options *capture_opts, const char *arg)
   return TRUE;
 }
 
+#ifdef HAVE_PCAP_SETSAMPLING
+/*
+ * Given a string of the form "<sampling type>:<value>", as might appear
+ * as an argument to a "-m" option, parse it and set the arguments in
+ * question.  Return an indication of whether it succeeded or failed
+ * in some fashion.
+ */
+static gboolean
+get_sampling_arguments(capture_options *capture_opts, const char *arg)
+{
+    gchar *p = NULL, *colonp;
+
+    colonp = strchr(arg, ':');
+    if (colonp == NULL)
+        return FALSE;
+
+    p = colonp;
+    *p++ = '\0';
+
+    while (isspace((guchar)*p))
+        p++;
+    if (*p == '\0') {
+        *colonp = ':';
+        return FALSE;
+    }
+
+    if (strcmp(arg, "count") == 0) {
+        capture_opts->sampling_method = CAPTURE_SAMP_BY_COUNT;
+        capture_opts->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");
+    }
+    *colonp = ':';
+    return TRUE;
+}
+#endif
+
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Given a string of the form "<username>:<password>", as might appear
+ * as an argument to a "-A" option, parse it and set the arguments in
+ * question.  Return an indication of whether it succeeded or failed
+ * in some fashion.
+ */
+static gboolean
+get_auth_arguments(capture_options *capture_opts, const char *arg)
+{
+    gchar *p = NULL, *colonp;
+
+    colonp = strchr(arg, ':');
+    if (colonp == NULL)
+        return FALSE;
+
+    p = colonp;
+    *p++ = '\0';
+
+    while (isspace((guchar)*p))
+        p++;
+
+    capture_opts->auth_type = CAPTURE_AUTH_PWD;
+    capture_opts->auth_username = g_strdup(arg);
+    capture_opts->auth_password = g_strdup(p);
+    *colonp = ':';
+    return TRUE;
+}
+#endif
 
 static int
 capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg)
@@ -238,13 +380,12 @@ capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg)
     GList       *if_list;
     if_info_t   *if_info;
     int         err;
-    gchar       err_str[CAPTURE_PCAP_ERRBUF_SIZE];
-    gchar       *cant_get_if_list_errstr;
+    gchar       *err_str;
 
 
     /*
      * If the argument is a number, treat it as an index into the list
-     * of adapters, as printed by "tethereal -D".
+     * of adapters, as printed by "tshark -D".
      *
      * This should be OK on UNIX systems, as interfaces shouldn't have
      * names that begin with digits.  It can be useful on Windows, where
@@ -262,18 +403,16 @@ capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg)
         return 1;
       }
       if (adapter_index == 0) {
-        cmdarg_err("there is no interface with that adapter index");
+        cmdarg_err("There is no interface with that adapter index");
         return 1;
       }
-      if_list = get_interface_list(&err, err_str);
+      if_list = get_interface_list(&err, &err_str);
       if (if_list == NULL) {
         switch (err) {
 
         case CANT_GET_INTERFACE_LIST:
-            cant_get_if_list_errstr =
-                cant_get_if_list_error_message(err_str);
-            cmdarg_err("%s", cant_get_if_list_errstr);
-            g_free(cant_get_if_list_errstr);
+            cmdarg_err("%s", err_str);
+            g_free(err_str);
             break;
 
         case NO_INTERFACES_FOUND:
@@ -284,10 +423,14 @@ capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg)
       }
       if_info = g_list_nth_data(if_list, adapter_index - 1);
       if (if_info == NULL) {
-        cmdarg_err("there is no interface with that adapter index");
+        cmdarg_err("There is no interface with that adapter index");
         return 1;
       }
       capture_opts->iface = 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);
     } else {
       capture_opts->iface = g_strdup(optarg);
@@ -308,6 +451,14 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg,
           return 1;
         }
         break;
+#ifdef HAVE_PCAP_REMOTE
+    case 'A':
+        if (get_auth_arguments(capture_opts, optarg) == FALSE) {
+            cmdarg_err("Invalid or unknown -A arg \"%s\"", optarg);
+            return 1;
+        }
+        break;
+#endif
     case 'b':        /* Ringbuffer option */
         capture_opts->multi_files_on = TRUE;
         if (get_ring_arguments(capture_opts, optarg) == FALSE) {
@@ -325,8 +476,12 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg,
         capture_opts->autostop_packets = get_positive_int(optarg, "packet count");
         break;
     case 'f':        /* capture filter */
-        if (capture_opts->cfilter)
-            g_free(capture_opts->cfilter);
+        if (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);
         break;
     case 'H':        /* Hide capture info dialog box */
@@ -342,6 +497,14 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg,
         *start_capture = TRUE;
         break;
     /*case 'l':*/    /* Automatic scrolling in live capture mode */
+#ifdef HAVE_PCAP_SETSAMPLING
+    case 'm':
+        if (get_sampling_arguments(capture_opts, optarg) == FALSE) {
+            cmdarg_err("Invalid or unknown -m arg \"%s\"", optarg);
+            return 1;
+        }
+        break;
+#endif
     case 'p':        /* Don't capture in promiscuous mode */
         capture_opts->promisc_mode = FALSE;
         break;
@@ -349,6 +512,11 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg,
         capture_opts->quit_after_cap  = TRUE;
         *start_capture   = TRUE;  /*** -Q implies -k !! ***/
         break;
+#ifdef HAVE_PCAP_REMOTE
+    case 'r':
+        capture_opts->nocap_rpcap = FALSE;
+        break;
+#endif
     case 's':        /* Set the snapshot (capture) length */
         capture_opts->has_snaplen = TRUE;
         capture_opts->snaplen = get_positive_int(optarg, "snapshot length");
@@ -356,9 +524,15 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg,
     case 'S':        /* "Real-Time" mode: used for following file ala tail -f */
         capture_opts->real_time_mode = TRUE;
         break;
+#ifdef HAVE_PCAP_REMOTE
+    case 'u':
+        capture_opts->datatx_udp = TRUE;
+        break;
+#endif
     case 'w':        /* Write to capture file x */
         capture_opts->saving_to_file = TRUE;
-#if defined _WIN32 && (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 6))
+        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, -1, NULL, NULL, NULL);
 #else
@@ -366,7 +540,6 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg,
 #endif
         status = capture_opts_output_to_pipe(capture_opts->save_file, &capture_opts->output_to_pipe);
         return status;
-        break;
     case 'y':        /* Set the pcap data link type */
 #ifdef HAVE_PCAP_DATALINK_NAME_TO_VAL
         capture_opts->linktype = linktype_name_to_val(optarg);
@@ -388,71 +561,85 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg,
     return 0;
 }
 
-
-int capture_opts_list_link_layer_types(capture_options *capture_opts)
+/*
+ * If you change the output format of this function, you MUST update
+ * capture_sync.c:sync_linktype_list_open() accordingly!
+ */
+int
+capture_opts_list_link_layer_types(capture_options *capture_opts, gboolean machine_readable)
 {
-    gchar err_str[CAPTURE_PCAP_ERRBUF_SIZE];
+    gchar *err_str, *desc_str;
     GList *lt_list, *lt_entry;
     data_link_info_t *data_link_info;
 
     /* Get the list of link-layer types for the capture device. */
-    lt_list = get_pcap_linktype_list(capture_opts->iface, err_str);
+    lt_list = get_pcap_linktype_list(capture_opts->iface, &err_str);
     if (lt_list == NULL) {
-      if (err_str[0] != '\0') {
+      if (err_str != NULL) {
         cmdarg_err("The list of data link types for the capture device \"%s\" could not be obtained (%s)."
          "Please check to make sure you have sufficient permissions, and that\n"
          "you have the proper interface or pipe specified.\n", capture_opts->iface, err_str);
+        g_free(err_str);
       } else
         cmdarg_err("The capture device \"%s\" has no data link types.", capture_opts->iface);
       return 2;
     }
-    cmdarg_err_cont("Data link types (use option -y to set):");
-    for (lt_entry = lt_list; lt_entry != NULL;
-         lt_entry = g_list_next(lt_entry)) {
-      data_link_info = lt_entry->data;
-      cmdarg_err_cont("  %s", data_link_info->name);
-      if (data_link_info->description != NULL)
-        cmdarg_err_cont(" (%s)", data_link_info->description);
-      else
-        cmdarg_err_cont(" (not supported)");
-      putchar('\n');
+    if (machine_readable) {    /* tab-separated values to stdout */
+        for (lt_entry = lt_list; lt_entry != NULL; lt_entry = g_list_next(lt_entry)) {
+          data_link_info = lt_entry->data;
+          if (data_link_info->description != NULL)
+              desc_str = data_link_info->description;
+          else
+              desc_str = "(not supported)";
+          printf("%d\t%s\t%s\n", data_link_info->dlt, data_link_info->name,
+              desc_str);
+        }
+    } else {
+        cmdarg_err_cont("Data link types (use option -y to set):");
+        for (lt_entry = lt_list; lt_entry != NULL;
+             lt_entry = g_list_next(lt_entry)) {
+          data_link_info = lt_entry->data;
+          cmdarg_err_cont("  %s", data_link_info->name);
+          if (data_link_info->description != NULL)
+            cmdarg_err_cont(" (%s)", data_link_info->description);
+          else
+            cmdarg_err_cont(" (not supported)");
+          putchar('\n');
+        }
     }
     free_pcap_linktype_list(lt_list);
 
     return 0;
 }
 
-
-int capture_opts_list_interfaces()
+/* Return an ASCII-formatted list of interfaces. */
+#define ADDRSTRLEN 46 /* Covers IPv4 & IPv6 */
+int
+capture_opts_list_interfaces(gboolean machine_readable)
 {
     GList       *if_list;
     GList       *if_entry;
     if_info_t   *if_info;
     int         err;
-    gchar       err_str[CAPTURE_PCAP_ERRBUF_SIZE];
-    gchar       *cant_get_if_list_errstr;
+    gchar       *err_str;
     int         i;
-#if 0
     GSList      *ip_addr;
     if_addr_t   *if_addr;
-    guint8      ipv4[4];
-#endif
+    char        addr_str[ADDRSTRLEN];
 
-
-    if_list = get_interface_list(&err, err_str);
+    if_list = get_interface_list(&err, &err_str);
     if (if_list == NULL) {
         switch (err) {
         case CANT_GET_INTERFACE_LIST:
-            cant_get_if_list_errstr = cant_get_if_list_error_message(err_str);
-            cmdarg_err("%s", cant_get_if_list_errstr);
-            g_free(cant_get_if_list_errstr);
+            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;
+        return err;
     }
 
     i = 1;  /* Interface id number */
@@ -460,29 +647,147 @@ int capture_opts_list_interfaces()
     if_entry = g_list_next(if_entry)) {
         if_info = if_entry->data;
         printf("%d. %s", i++, if_info->name);
-        if (if_info->description != NULL)
-            printf(" (%s)", if_info->description);
-#if 0
-        for(ip_addr = g_slist_nth(if_info->ip_addr, 0); ip_addr != NULL;
-        ip_addr = g_slist_next(ip_addr)) {
-            if_addr = ip_addr->data;
-            switch(if_addr->type) {
-            case AT_IPv4:
-                memcpy(ipv4, (void *) &if_addr->ip_addr.ip4_addr, 4);
-                printf(" %u.%u.%u.%u", ipv4[0], ipv4[1], ipv4[2], ipv4[3]);
-                break;
-            case AT_IPv6:
-                /* XXX - display the IPv6 address without using stuff from epan */
-                printf(" XXX-IPv6");
-                break;
-            default:
-                printf(" unknown address type %u", if_addr->type);
+
+        if (!machine_readable) {
+            /* Add the description if it exists */
+            if (if_info->description != NULL)
+                printf(" (%s)", if_info->description);
+        } else {
+            /*
+             * Add the contents of the if_entry struct in a parseable format.
+             * Each if_entry element is tab-separated.  Addresses are comma-
+             * separated.
+             */
+            /* XXX - Make sure our description doesn't contain a tab */
+            if (if_info->description != NULL)
+                printf("\t%s\t", if_info->description);
+            else
+                printf("\t\t");
+
+            for(ip_addr = g_slist_nth(if_info->ip_addr, 0); ip_addr != NULL;
+                        ip_addr = g_slist_next(ip_addr)) {
+                if (ip_addr != g_slist_nth(if_info->ip_addr, 0))
+                    printf(",");
+
+                if_addr = ip_addr->data;
+                switch(if_addr->type) {
+                case AT_IPv4:
+                    if (inet_ntop(AF_INET, &if_addr->ip_addr.ip4_addr, addr_str,
+                                ADDRSTRLEN)) {
+                        printf(addr_str);
+                    } else {
+                        printf("<unknown IPv4>");
+                    }
+                    break;
+                case AT_IPv6:
+                    if (inet_ntop(AF_INET6, &if_addr->ip_addr.ip6_addr,
+                                addr_str, ADDRSTRLEN)) {
+                        printf(addr_str);
+                    } else {
+                        printf("<unknown IPv6>");
+                    }
+                    break;
+                default:
+                    printf("<type unknown %u>", if_addr->type);
+                }
             }
+
+            if (if_info->loopback)
+                printf("\tloopback");
+            else
+                printf("\tnetwork");
+
         }
+       printf("\n");
+    }
+    free_interface_list(if_list);
+
+    return 0;
+}
+
+/* Print the number of packets captured for each interface until we're killed. */
+int
+capture_opts_print_statistics(gboolean machine_readable)
+{
+    GList       *if_list, *if_entry, *stat_list = NULL, *stat_entry;
+    if_info_t   *if_info;
+    if_stat_t   *if_stat;
+    int         err;
+    gchar       *err_str;
+    pcap_t      *pch;
+    char        errbuf[PCAP_ERRBUF_SIZE];
+    struct pcap_stat ps;
+
+    if_list = get_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 err;
+    }
+
+    for (if_entry = g_list_first(if_list); if_entry != NULL; if_entry = g_list_next(if_entry)) {
+        if_info = if_entry->data;
+#ifdef HAVE_PCAP_OPEN
+        pch = pcap_open(if_info->name, MIN_PACKET_SIZE, 0, 0, NULL, errbuf);
+#else
+        pch = pcap_open_live(if_info->name, MIN_PACKET_SIZE, 0, 0, errbuf);
+#endif
+
+        if (pch) {
+            if_stat = g_malloc(sizeof(if_stat_t));
+            if_stat->name = g_strdup(if_info->name);
+            if_stat->pch = pch;
+            stat_list = g_list_append(stat_list, if_stat);
+        }
+    }
+
+    if (!stat_list) {
+        cmdarg_err("There are no interfaces on which a capture can be done");
+        return 2;
+    }
+
+    if (!machine_readable) {
+        printf("%-15s  %10s  %10s\n", "Interface", "Received",
+            "Dropped");
+    }
+
+    while (1) {    /* XXX - Add signal handling? */
+        for (stat_entry = g_list_first(stat_list); stat_entry != NULL; stat_entry = g_list_next(stat_entry)) {
+            if_stat = stat_entry->data;
+            pcap_stats(if_stat->pch, &ps);
+
+            if (!machine_readable) {
+                printf("%-15s  %10d  %10d\n", if_stat->name,
+                    ps.ps_recv, ps.ps_drop);
+            } else {
+                printf("%s\t%d\t%d\n", if_stat->name,
+                    ps.ps_recv, ps.ps_drop);
+                fflush(stdout);
+            }
+        }
+#ifdef _WIN32
+        Sleep(1 * 1000);
+#else
+        sleep(1);
 #endif
+    }
 
-        printf("\n");
+    /* XXX - Not reached.  Should we look for 'q' in stdin? */
+    for (stat_entry = g_list_first(stat_list); stat_entry != NULL; stat_entry = g_list_next(stat_entry)) {
+        if_stat = stat_entry->data;
+        pcap_close(if_stat->pch);
+        g_free(if_stat->name);
+        g_free(if_stat);
     }
+    g_list_free(stat_list);
     free_interface_list(if_list);
 
     return 0;
@@ -515,8 +820,7 @@ gboolean capture_opts_trim_iface(capture_options *capture_opts, const char *capt
     GList       *if_list;
     if_info_t   *if_info;
     int         err;
-    gchar       err_str[CAPTURE_PCAP_ERRBUF_SIZE];
-    gchar       *cant_get_if_list_errstr;
+    gchar       *err_str;
 
 
     /* Did the user specify an interface to use? */
@@ -525,16 +829,19 @@ gboolean capture_opts_trim_iface(capture_options *capture_opts, const char *capt
       if (capture_device != NULL) {
           /* Yes - use it. */
           capture_opts->iface = 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 = get_interface_list(&err, err_str);
+        if_list = get_interface_list(&err, &err_str);
         if (if_list == NULL) {
           switch (err) {
 
           case CANT_GET_INTERFACE_LIST:
-              cant_get_if_list_errstr = cant_get_if_list_error_message(err_str);
-              cmdarg_err("%s", cant_get_if_list_errstr);
-              g_free(cant_get_if_list_errstr);
+              cmdarg_err("%s", err_str);
+              g_free(err_str);
               break;
 
           case NO_INTERFACES_FOUND:
@@ -545,6 +852,10 @@ gboolean capture_opts_trim_iface(capture_options *capture_opts, const char *capt
         }
         if_info = if_list->data;       /* first interface */
         capture_opts->iface = 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);
       }
     }
@@ -579,6 +890,8 @@ static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_
 {
   int err;
 
+  *is_pipe = FALSE;
+
   if (save_file != NULL) {
     /* We're writing to a capture file. */
     if (strcmp(save_file, "-") == 0) {
@@ -589,7 +902,7 @@ static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_
          Least Astonishment. */
       *is_pipe = TRUE;
     } else {
-      /* not a capture file, test for a FIFO (aka named pipe) */
+      /* not writing to stdout, test for a FIFO (aka named pipe) */
       err = capture_opts_test_for_fifo(save_file);
       switch (err) {
 
@@ -602,16 +915,13 @@ static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_
         *is_pipe = TRUE;
         break;
 
-      default:         /* couldn't stat it */
-        cmdarg_err("Error testing whether capture file is a pipe: %s",
-                strerror(errno));
-        return 2;
+      default:         /* couldn't stat it              */
+        break;         /* ignore: later attempt to open */
+                        /*  will generate a nice msg     */
       }
     }
   }
 
-  *is_pipe = FALSE;
-
   return 0;
 }