Do not handle BER bitstring as ASCII string, because this will fail

[metze/wireshark/wip.git] / cfile.c

diff --git a/cfile.c b/cfile.c
index 225d88b863493fff3c26818deab56631d7746fcc..50c532eb6267038bbe975abfab99b9606847cc79 100644 (file)
--- a/cfile.c
+++ b/cfile.c
@@ -1,11 +1,11 @@
 /* cfile.c
- * capture_file GUI-independent manipulation 
+ * capture_file GUI-independent manipulation
  * Vassilii Khachaturov <vassilii@tarunz.org>
  *
  * $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
@@ -20,18 +20,10 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
+#include "config.h"
 
 #include <glib.h>
 
@@ -39,25 +31,33 @@
 
 #include "cfile.h"
 
+const char *
+cap_file_get_interface_name(void *data, guint32 interface_id)
+{
+  capture_file *cf = (capture_file *) data;
+  wtapng_iface_descriptions_t *idb_info;
+  const wtapng_if_descr_t *wtapng_if_descr = NULL;
+
+  idb_info = wtap_file_get_idb_info(cf->wth);
+
+  if (interface_id < idb_info->number_of_interfaces)
+    wtapng_if_descr = &g_array_index(idb_info->interface_data, wtapng_if_descr_t, interface_id);
+
+  g_free(idb_info);
+
+  if (wtapng_if_descr) {
+    if (wtapng_if_descr->if_name)
+      return wtapng_if_descr->if_name;
+    else if (wtapng_if_descr->if_description)
+      return wtapng_if_descr->if_description;
+  }
+  return "unknown";
+}
+
 void
-init_cap_file(capture_file *cf)
+cap_file_init(capture_file *cf)
 {
   /* Initialize the capture file struct */
-  cf->plist            = NULL;
-  cf->plist_end        = NULL;
-  cf->wth              = NULL;
-  cf->filename = NULL;
-  cf->user_saved       = FALSE;
-  cf->is_tempfile      = FALSE;
-  cf->rfcode           = NULL;
-  cf->dfilter          = NULL;
-  cf->dfcode           = NULL;
-#ifdef HAVE_LIBPCAP
-  cf->cfilter          = g_strdup("");
-#endif
-  cf->iface            = NULL;
-  cf->has_snap = FALSE;
-  cf->snap             = WTAP_MAX_PACKET_SIZE;
-  cf->count            = 0;
-  cf->pstats           = NULL;
+  memset(cf, 0, sizeof(capture_file));
+  cf->snap            = WTAP_MAX_PACKET_SIZE;
 }