Wrap calls to "pcap_datalink()" in a routine that attempts to compensate
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 9 Nov 2001 07:44:51 +0000 (07:44 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 9 Nov 2001 07:44:51 +0000 (07:44 +0000)
for AIX 5.x's non-standard libpcap, where "pcap_datalink()" doesn't
return DLT_ values, it returns RFC 1573 ifType values.

Put that wrapper, and the routine to get the interface list, in a
separate file, for packet-capture utility routines, so not everybody who
includes "util.h" needs to include <pcap.h>.

Fix up the Wiretap hack for dealing with said incompatibility to use the
correct ifType value for Token Ring.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4184 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.am
Makefile.nmake
capture.c
gtk/capture_dlg.c
gtk/main.c
pcap-util.c [new file with mode: 0644]
pcap-util.h [new file with mode: 0644]
tethereal.c
util.c
util.h
wiretap/libpcap.c

index c0c743895b23117e1bf7decd71ec5e5516c4b205..a03a9720bd06d87325488312633fec27c1bc0961 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.377 2001/11/06 20:30:38 guy Exp $
+# $Id: Makefile.am,v 1.378 2001/11/09 07:44:47 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -433,6 +433,8 @@ ETHEREAL_COMMON_SRC = \
        llcsaps.h      \
        nlpid.h        \
        oui.h          \
+       pcap-util.c    \
+       pcap-util.h    \
        ppptypes.h     \
        prefs.c        \
        prefs.h        \
index d7498b5365e62bc4a5bc820b98efcdba20c9b7a0..21414cfc8271b00886386368d07fb84b99b9978c 100644 (file)
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.138 2001/11/06 20:30:39 guy Exp $
+# $Id: Makefile.nmake,v 1.139 2001/11/09 07:44:47 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -242,6 +242,7 @@ ETHEREAL_COMMON_OBJECTS = \
        in_cksum.obj     \
        int-64bit.obj   \
        ipproto.obj      \
+       pcap-util.obj    \
        prefs.obj        \
        print.obj        \
        ps.obj           \
index 31ca305d4441d79a2cd412a12388d9966b8973b3..4b5c77c0c629a74c55fe16a8313f49a17c49dcd1 100644 (file)
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
 /* capture.c
  * Routines for packet capture windows
  *
- * $Id: capture.c,v 1.156 2001/10/26 18:28:15 gram Exp $
+ * $Id: capture.c,v 1.157 2001/11/09 07:44:47 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 #include "file.h"
 #include "capture.h"
 #include "util.h"
+#include "pcap-util.h"
 #include "simple_dialog.h"
 #include "prefs.h"
 #include "globals.h"
 #include "packet-ieee80211.h"
 #include "packet-chdlc.h"
 
+#ifdef WIN32
+#include "capture-wpcap.h"
+#endif
+
 static int sync_pipe[2]; /* used to sync father */
 enum PIPES { READ, WRITE }; /* Constants 0 and 1 for READ and WRITE */
 int quit_after_cap; /* Makes a "capture only mode". Implies -k */
@@ -1394,7 +1399,7 @@ capture(gboolean *stats_known, struct pcap_stat *stats)
   } else
 #endif
   {
-    pcap_encap = pcap_datalink(pch);
+    pcap_encap = get_pcap_linktype(pch, cfile.iface);
     snaplen = pcap_snapshot(pch);
   }
   ld.linktype = wtap_pcap_encap_to_wtap_encap(pcap_encap);
index e0720d4cb28c2388031bbf7a1590fdd26fd79928..e141456a9b274bdc962ee4382844ea12cc473ce0 100644 (file)
@@ -1,7 +1,7 @@
 /* capture_dlg.c
  * Routines for packet capture windows
  *
- * $Id: capture_dlg.c,v 1.47 2001/10/31 07:11:08 guy Exp $
+ * $Id: capture_dlg.c,v 1.48 2001/11/09 07:44:49 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -54,7 +54,7 @@
 #include "filter_prefs.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "util.h"
+#include "pcap-util.h"
 #include "prefs.h"
 
 #ifdef _WIN32
index af37b3650b117c97d2c74aca39cc6bd60f92bdee..7f6cb4abccefc5357476e5f094fd9ec7e09009cf 100644 (file)
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.209 2001/11/04 02:50:21 guy Exp $
+ * $Id: main.c,v 1.210 2001/11/09 07:44:50 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 #include "column.h"
 #include "print.h"
 #include "resolv.h"
-#include "util.h"
+#ifdef HAVE_LIBPCAP
+#include "pcap-util.h"
+#endif
 #include "statusbar.h"
 #include "simple_dialog.h"
 #include "proto_draw.h"
diff --git a/pcap-util.c b/pcap-util.c
new file mode 100644 (file)
index 0000000..4de6ad6
--- /dev/null
@@ -0,0 +1,439 @@
+/* pcap-util.c
+ * Utility routines for packet capture
+ *
+ * $Id: pcap-util.c,v 1.1 2001/11/09 07:44:48 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_LIBPCAP
+
+#include <glib.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#include <pcap.h>
+
+#ifndef WIN32
+#include <net/if.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKIO_H
+# include <sys/sockio.h>
+#endif
+
+#include "globals.h"
+
+#ifdef WIN32
+#include "capture-wpcap.h"
+#endif
+
+#include "pcap-util.h"
+
+/*
+ * Get the data-link type for a libpcap device.
+ * This works around AIX 5.x's non-standard and incompatible-with-the-
+ * rest-of-the-universe libpcap.
+ */
+int
+get_pcap_linktype(pcap_t *pch, char *devname)
+{
+       int linktype;
+#ifdef AIX
+       char *ifacename;
+#endif
+
+       linktype = pcap_datalink(pch);
+#ifdef AIX
+
+       /*
+        * The libpcap that comes with AIX 5.x uses RFC 1573 ifType values
+        * rather than DLT_ values for link-layer types; the ifType values
+        * for LAN devices are:
+        *
+        *      Ethernet        6
+        *      802.3           7
+        *      Token Ring      9
+        *      FDDI            15
+        *
+        * The AIX names for LAN devices begin with:
+        *
+        *      Ethernet                en
+        *      802.3                   et
+        *      Token Ring              tr
+        *      FDDI                    fi
+        *
+        * (The difference between "Ethernet" and "802.3" is presumably
+        * whether packets have an Ethernet header, with a packet type,
+        * or an 802.3 header, with a packet length, followed by an 802.2
+        * header and possibly a SNAP header.)
+        *
+        * If the device name matches "linktype" interpreted as an ifType
+        * value, rather than as a DLT_ value, we will assume this is AIX's
+        * non-standard, incompatible libpcap, rather than a standard libpcap,
+        * and will map the link-layer type to the standard DLT_ value for
+        * that link-layer type, as that's what the rest of Ethereal expects.
+        *
+        * (This means the capture files won't be readable by a tcpdump
+        * linked with AIX's non-standard libpcap, but so it goes.  They
+        * *will* be readable by standard versions of tcpdump, Ethereal,
+        * and so on.)
+        */
+
+       /*
+        * Find the last component of the device name, which is the
+        * interface name.
+        */
+       ifacename = strchr(devname, '/');
+       if (ifacename == NULL)
+               ifacename = devnames;
+
+       /* See if it matches any of the LAN device names. */
+       if (strncmp(ifacename, "en", 2) == 0) {
+               if (linktype == 6) {
+                       /*
+                        * That's the RFC 1573 value for Ethernet; map it
+                        * to DLT_EN10MB.
+                        */
+                       linktype = 1;
+               }
+       } else if (strncmp(ifacename, "et", 2) == 0) {
+               if (linktype == 7) {
+                       /*
+                        * That's the RFC 1573 value for 802.3; map it to
+                        * DLT_EN10MB.
+                        * (libpcap, tcpdump, Ethereal, etc. don't care if
+                        * it's Ethernet or 802.3.)
+                        */
+                       linktype = 1;
+               }
+       } else if (strncmp(ifacename, "tr") == 0) {
+               if (linktype == 9) {
+                       /*
+                        * That's the RFC 1573 value for 802.5 (Token Ring);
+                        * map it to DLT_IEEE802, which is what's used for
+                        * Token Ring.
+                        */
+                       linktype = 6;
+               }
+       } else if (strncmp(ifacename, "fi") == 0) {
+               if (linktype == 15) {
+                       /*
+                        * That's the RFC 1573 value for FDDI; map it to
+                        * DLT_FDDI.
+                        */
+                       linktype = 10;
+               }
+       }
+#endif
+
+       return linktype;
+}
+
+/*
+ * If the ability to capture packets is added to Wiretap, these
+ * routines should be moved to the Wiretap source (with
+ * "get_interface_list()" and "free_interface_list()" renamed to
+ * "wtap_get_interface_list()" and "wtap_free_interface_list()",
+ * and modified to use Wiretap routines to attempt to open the
+ * interface.
+ */
+
+struct search_user_data {
+       char    *name;
+       int     found;
+};
+
+static void
+search_for_if_cb(gpointer data, gpointer user_data);
+
+static void
+free_if_cb(gpointer data, gpointer user_data);
+
+#ifndef WIN32
+GList *
+get_interface_list(int *err, char *err_str)
+{
+       GList  *il = NULL;
+       gint    nonloopback_pos = 0;
+       struct  ifreq *ifr, *last;
+       struct  ifconf ifc;
+       struct  ifreq ifrflags;
+       int     sock = socket(AF_INET, SOCK_DGRAM, 0);
+       struct search_user_data user_data;
+       pcap_t *pch;
+       int len, lastlen;
+       char *buf;
+
+       if (sock < 0) {
+               sprintf(err_str, "Error opening socket: %s",
+                   strerror(errno));
+               return NULL;
+       }
+
+       /*
+        * This code came from: W. Richard Stevens: "UNIX Network Programming",
+        * Networking APIs: Sockets and XTI, Vol 1, page 434.
+        */
+       lastlen = 0;
+       len = 100 * sizeof(struct ifreq);
+       for ( ; ; ) {
+               buf = g_malloc(len);
+               ifc.ifc_len = len;
+               ifc.ifc_buf = buf;
+               memset (buf, 0, len);
+               if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
+                       if (errno != EINVAL || lastlen != 0) {
+                               sprintf(err_str,
+                                       "SIOCGIFCONF ioctl error getting list of interfaces: %s",
+                                       strerror(errno));
+                               goto fail;
+                       }
+               } else {
+                       if ((unsigned) ifc.ifc_len < sizeof(struct ifreq)) {
+                               sprintf(err_str,
+                                       "SIOCGIFCONF ioctl gave too small return buffer");
+                               goto fail;
+                       }
+                       if (ifc.ifc_len == lastlen)
+                               break;                  /* success, len has not changed */
+                       lastlen = ifc.ifc_len;
+               }
+               len += 10 * sizeof(struct ifreq);       /* increment */
+               g_free(buf);
+       }
+       ifr = (struct ifreq *) ifc.ifc_req;
+       last = (struct ifreq *) ((char *) ifr + ifc.ifc_len);
+       while (ifr < last) {
+               /*
+                * Skip addresses that begin with "dummy", or that include
+                * a ":" (the latter are Solaris virtuals).
+                */
+               if (strncmp(ifr->ifr_name, "dummy", 5) == 0 ||
+                   strchr(ifr->ifr_name, ':') != NULL)
+                       goto next;
+
+               /*
+                * If we already have this interface name on the list,
+                * don't add it (SIOCGIFCONF returns, at least on
+                * BSD-flavored systems, one entry per interface *address*;
+                * if an interface has multiple addresses, we get multiple
+                * entries for it).
+                */
+               user_data.name = ifr->ifr_name;
+               user_data.found = FALSE;
+               g_list_foreach(il, search_for_if_cb, &user_data);
+               if (user_data.found)
+                       goto next;
+
+               /*
+                * Get the interface flags.
+                */
+               memset(&ifrflags, 0, sizeof ifrflags);
+               strncpy(ifrflags.ifr_name, ifr->ifr_name,
+                   sizeof ifrflags.ifr_name);
+               if (ioctl(sock, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
+                       if (errno == ENXIO)
+                               goto next;
+                       sprintf(err_str, "SIOCGIFFLAGS error getting flags for interface %s: %s",
+                           ifr->ifr_name, strerror(errno));
+                       goto fail;
+               }
+
+               /*
+                * Skip interfaces that aren't up.
+                */
+               if (!(ifrflags.ifr_flags & IFF_UP))
+                       goto next;
+
+               /*
+                * Skip interfaces that we can't open with "libpcap".
+                * Open with the minimum packet size - it appears that the
+                * IRIX SIOCSNOOPLEN "ioctl" may fail if the capture length
+                * supplied is too large, rather than just truncating it.
+                */
+               pch = pcap_open_live(ifr->ifr_name, MIN_PACKET_SIZE, 0, 0,
+                   err_str);
+               if (pch == NULL)
+                       goto next;
+               pcap_close(pch);
+
+               /*
+                * If it's a loopback interface, add it at the end of the
+                * list, otherwise add it after the last non-loopback
+                * interface, so all loopback interfaces go at the end - we
+                * don't want a loopback interface to be the default capture
+                * device unless there are no non-loopback devices.
+                */
+               if ((ifrflags.ifr_flags & IFF_LOOPBACK) ||
+                   strncmp(ifr->ifr_name, "lo", 2) == 0)
+                       il = g_list_insert(il, g_strdup(ifr->ifr_name), -1);
+               else {
+                       il = g_list_insert(il, g_strdup(ifr->ifr_name),
+                           nonloopback_pos);
+                       /*
+                        * Insert the next non-loopback interface after this
+                        * one.
+                        */
+                       nonloopback_pos++;
+               }
+
+       next:
+#ifdef HAVE_SA_LEN
+               ifr = (struct ifreq *) ((char *) ifr + ifr->ifr_addr.sa_len + IFNAMSIZ);
+#else
+               ifr = (struct ifreq *) ((char *) ifr + sizeof(struct ifreq));
+#endif
+       }
+
+#ifdef linux
+       /*
+        * OK, maybe we have support for the "any" device, to do a cooked
+        * capture on all interfaces at once.
+        * Try opening it and, if that succeeds, add it to the end of
+        * the list of interfaces.
+        */
+       pch = pcap_open_live("any", MIN_PACKET_SIZE, 0, 0, err_str);
+       if (pch != NULL) {
+               /*
+                * It worked; we can use the "any" device.
+                */
+               il = g_list_insert(il, g_strdup("any"), -1);
+               pcap_close(pch);
+       }
+#endif
+
+       g_free(ifc.ifc_buf);
+       close(sock);
+
+       if (il == NULL) {
+               /*
+                * No interfaces found.
+                */
+               *err = NO_INTERFACES_FOUND;
+       }
+       return il;
+
+fail:
+       if (il != NULL) {
+               g_list_foreach(il, free_if_cb, NULL);
+               g_list_free(il);
+       }
+       g_free(ifc.ifc_buf);
+       close(sock);
+       *err = CANT_GET_INTERFACE_LIST;
+       return NULL;
+}
+
+static void
+search_for_if_cb(gpointer data, gpointer user_data)
+{
+       struct search_user_data *search_user_data = user_data;
+
+       if (strcmp((char *)data, search_user_data->name) == 0)
+               search_user_data->found = TRUE;
+}
+#else
+GList *
+get_interface_list(int *err, char *err_str) {
+  GList  *il = NULL;
+  wchar_t *names;
+  char *win95names; 
+  char newname[255];
+  int i, j, done;
+  
+  names = (wchar_t *)pcap_lookupdev(err_str);
+  i = done = 0;
+
+  if (names) {
+         if (names[0]<256) { 
+                 /* If names[0] is less than 256 it means the first byte is 0
+                    This implies that we are using unicode characters */
+                 do 
+                 { 
+                         j = 0; 
+                         while (names[i] != 0) 
+                                 newname[j++] = names[i++]; 
+                         i++; 
+                         if (names[i] == 0) 
+                                 done = 1; 
+                         newname[j++] = 0; 
+                         il = g_list_append(il, g_strdup(newname)); 
+                 } while (!done); 
+         } 
+         else { 
+                 /* Otherwise we are in Windows 95/98 and using ascii(8 bit)
+                    characters */
+                 do 
+                 { 
+                         win95names=(char *)names; 
+                         j = 0; 
+                         while (win95names[i] != 0) 
+                                 newname[j++] = win95names[i++]; 
+                         i++; 
+                         if (win95names[i] == 0) 
+                                 done = 1; 
+                         newname[j++] = 0; 
+                         il = g_list_append(il, g_strdup(newname)); 
+                 } while (!done); 
+         } 
+  }
+  return(il);
+}
+#endif
+
+static void
+free_if_cb(gpointer data, gpointer user_data)
+{
+       g_free(data);
+}
+
+void
+free_interface_list(GList *if_list)
+{
+       while (if_list != NULL) {
+               g_free(if_list->data);
+               if_list = g_list_remove_link(if_list, if_list);
+       }
+}
+
+#endif /* HAVE_LIBPCAP */
diff --git a/pcap-util.h b/pcap-util.h
new file mode 100644 (file)
index 0000000..7b2f6ca
--- /dev/null
@@ -0,0 +1,50 @@
+/* pcap-util.h
+ * Utility definitions for packet capture
+ *
+ * $Id: pcap-util.h,v 1.1 2001/11/09 07:44:48 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * 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.
+ */
+
+#ifndef __PCAP_UTIL_H__
+#define __PCAP_UTIL_H__
+
+#ifdef HAVE_LIBPCAP
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+int get_pcap_linktype(pcap_t *pch, char *devname);
+
+GList *get_interface_list(int *err, char *err_str);
+
+/* Error values from "get_interface_list()". */
+#define        CANT_GET_INTERFACE_LIST 0       /* error getting list */
+#define        NO_INTERFACES_FOUND     1       /* list is empty */
+
+void free_interface_list(GList *if_list);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* HAVE_LIBPCAP */
+
+#endif /* __PCAP_UTIL_H__ */
index 75de86f80edd67607da4b6f498eaaed6e601a286..75318067d735d6061306d2cd3e1f7ea25e7d3730 100644 (file)
@@ -1,6 +1,6 @@
 /* tethereal.c
  *
- * $Id: tethereal.c,v 1.96 2001/11/04 02:50:19 guy Exp $
+ * $Id: tethereal.c,v 1.97 2001/11/09 07:44:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -96,6 +96,9 @@
 #include "print.h"
 #include "resolv.h"
 #include "util.h"
+#ifdef HAVE_LIBPCAP
+#include "pcap-util.h"
+#endif
 #include "conversation.h"
 #include "reassemble.h"
 #include "plugins.h"
@@ -745,7 +748,8 @@ capture(int packet_count, int out_file_type)
     }
   }
 
-  ld.linktype = wtap_pcap_encap_to_wtap_encap(pcap_datalink(ld.pch));
+  ld.linktype = wtap_pcap_encap_to_wtap_encap(get_pcap_linktype(ld.pch,
+       cfile.iface));
   if (cfile.save_file != NULL) {
     /* Set up to write to the capture file. */
     if (ld.linktype == WTAP_ENCAP_UNKNOWN) {
diff --git a/util.c b/util.c
index ea2d62971c2f22c1e3c6f7c6b66b7295a5b17acf..45b89ab59515cc9d2d81247b50c13bd22b728df1 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,7 +1,7 @@
 /* util.c
  * Utility routines
  *
- * $Id: util.c,v 1.53 2001/10/26 18:28:17 gram Exp $
+ * $Id: util.c,v 1.54 2001/11/09 07:44:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
 # include "snprintf.h"
 #endif
 
-#ifndef WIN32
-#include <pwd.h>
-#endif
-
 #ifdef NEED_MKSTEMP
 #include "mkstemp.h"
 #endif
 
-#include "util.h"
-
 #ifdef HAVE_IO_H
 #include <io.h>
 typedef int mode_t;    /* for win32 */
 #endif
 
-#ifdef HAVE_LIBPCAP
-
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
-#include <pcap.h>
-
-#ifndef WIN32
-#include <net/if.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKIO_H
-# include <sys/sockio.h>
-#endif
-
-#include "globals.h"
-
-#endif
+#include "util.h"
 
 /*
  * Collect command-line arguments as a string consisting of the arguments,
@@ -339,278 +311,6 @@ EBCDIC_to_ASCII1(guint8 c)
        return EBCDIC_translate_ASCII[c];
 }
 
-#ifdef HAVE_LIBPCAP
-
-/*
- * If the ability to capture packets is added to Wiretap, these
- * routines should be moved to the Wiretap source (with
- * "get_interface_list()" and "free_interface_list()" renamed to
- * "wtap_get_interface_list()" and "wtap_free_interface_list()",
- * and modified to use Wiretap routines to attempt to open the
- * interface.
- */
-
-struct search_user_data {
-       char    *name;
-       int     found;
-};
-
-static void
-search_for_if_cb(gpointer data, gpointer user_data);
-
-static void
-free_if_cb(gpointer data, gpointer user_data);
-
-#ifndef WIN32
-GList *
-get_interface_list(int *err, char *err_str)
-{
-       GList  *il = NULL;
-       gint    nonloopback_pos = 0;
-       struct  ifreq *ifr, *last;
-       struct  ifconf ifc;
-       struct  ifreq ifrflags;
-       int     sock = socket(AF_INET, SOCK_DGRAM, 0);
-       struct search_user_data user_data;
-       pcap_t *pch;
-       int len, lastlen;
-       char *buf;
-
-       if (sock < 0) {
-               sprintf(err_str, "Error opening socket: %s",
-                   strerror(errno));
-               return NULL;
-       }
-
-       /*
-        * This code came from: W. Richard Stevens: "UNIX Network Programming",
-        * Networking APIs: Sockets and XTI, Vol 1, page 434.
-        */
-       lastlen = 0;
-       len = 100 * sizeof(struct ifreq);
-       for ( ; ; ) {
-               buf = g_malloc(len);
-               ifc.ifc_len = len;
-               ifc.ifc_buf = buf;
-               memset (buf, 0, len);
-               if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) {
-                       if (errno != EINVAL || lastlen != 0) {
-                               sprintf(err_str,
-                                       "SIOCGIFCONF ioctl error getting list of interfaces: %s",
-                                       strerror(errno));
-                               goto fail;
-                       }
-               } else {
-                       if ((unsigned) ifc.ifc_len < sizeof(struct ifreq)) {
-                               sprintf(err_str,
-                                       "SIOCGIFCONF ioctl gave too small return buffer");
-                               goto fail;
-                       }
-                       if (ifc.ifc_len == lastlen)
-                               break;                  /* success, len has not changed */
-                       lastlen = ifc.ifc_len;
-               }
-               len += 10 * sizeof(struct ifreq);       /* increment */
-               g_free(buf);
-       }
-       ifr = (struct ifreq *) ifc.ifc_req;
-       last = (struct ifreq *) ((char *) ifr + ifc.ifc_len);
-       while (ifr < last) {
-               /*
-                * Skip addresses that begin with "dummy", or that include
-                * a ":" (the latter are Solaris virtuals).
-                */
-               if (strncmp(ifr->ifr_name, "dummy", 5) == 0 ||
-                   strchr(ifr->ifr_name, ':') != NULL)
-                       goto next;
-
-               /*
-                * If we already have this interface name on the list,
-                * don't add it (SIOCGIFCONF returns, at least on
-                * BSD-flavored systems, one entry per interface *address*;
-                * if an interface has multiple addresses, we get multiple
-                * entries for it).
-                */
-               user_data.name = ifr->ifr_name;
-               user_data.found = FALSE;
-               g_list_foreach(il, search_for_if_cb, &user_data);
-               if (user_data.found)
-                       goto next;
-
-               /*
-                * Get the interface flags.
-                */
-               memset(&ifrflags, 0, sizeof ifrflags);
-               strncpy(ifrflags.ifr_name, ifr->ifr_name,
-                   sizeof ifrflags.ifr_name);
-               if (ioctl(sock, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
-                       if (errno == ENXIO)
-                               goto next;
-                       sprintf(err_str, "SIOCGIFFLAGS error getting flags for interface %s: %s",
-                           ifr->ifr_name, strerror(errno));
-                       goto fail;
-               }
-
-               /*
-                * Skip interfaces that aren't up.
-                */
-               if (!(ifrflags.ifr_flags & IFF_UP))
-                       goto next;
-
-               /*
-                * Skip interfaces that we can't open with "libpcap".
-                * Open with the minimum packet size - it appears that the
-                * IRIX SIOCSNOOPLEN "ioctl" may fail if the capture length
-                * supplied is too large, rather than just truncating it.
-                */
-               pch = pcap_open_live(ifr->ifr_name, MIN_PACKET_SIZE, 0, 0,
-                   err_str);
-               if (pch == NULL)
-                       goto next;
-               pcap_close(pch);
-
-               /*
-                * If it's a loopback interface, add it at the end of the
-                * list, otherwise add it after the last non-loopback
-                * interface, so all loopback interfaces go at the end - we
-                * don't want a loopback interface to be the default capture
-                * device unless there are no non-loopback devices.
-                */
-               if ((ifrflags.ifr_flags & IFF_LOOPBACK) ||
-                   strncmp(ifr->ifr_name, "lo", 2) == 0)
-                       il = g_list_insert(il, g_strdup(ifr->ifr_name), -1);
-               else {
-                       il = g_list_insert(il, g_strdup(ifr->ifr_name),
-                           nonloopback_pos);
-                       /*
-                        * Insert the next non-loopback interface after this
-                        * one.
-                        */
-                       nonloopback_pos++;
-               }
-
-       next:
-#ifdef HAVE_SA_LEN
-               ifr = (struct ifreq *) ((char *) ifr + ifr->ifr_addr.sa_len + IFNAMSIZ);
-#else
-               ifr = (struct ifreq *) ((char *) ifr + sizeof(struct ifreq));
-#endif
-       }
-
-#ifdef linux
-       /*
-        * OK, maybe we have support for the "any" device, to do a cooked
-        * capture on all interfaces at once.
-        * Try opening it and, if that succeeds, add it to the end of
-        * the list of interfaces.
-        */
-       pch = pcap_open_live("any", MIN_PACKET_SIZE, 0, 0, err_str);
-       if (pch != NULL) {
-               /*
-                * It worked; we can use the "any" device.
-                */
-               il = g_list_insert(il, g_strdup("any"), -1);
-               pcap_close(pch);
-       }
-#endif
-
-       g_free(ifc.ifc_buf);
-       close(sock);
-
-       if (il == NULL) {
-               /*
-                * No interfaces found.
-                */
-               *err = NO_INTERFACES_FOUND;
-       }
-       return il;
-
-fail:
-       if (il != NULL) {
-               g_list_foreach(il, free_if_cb, NULL);
-               g_list_free(il);
-       }
-       g_free(ifc.ifc_buf);
-       close(sock);
-       *err = CANT_GET_INTERFACE_LIST;
-       return NULL;
-}
-
-static void
-search_for_if_cb(gpointer data, gpointer user_data)
-{
-       struct search_user_data *search_user_data = user_data;
-
-       if (strcmp((char *)data, search_user_data->name) == 0)
-               search_user_data->found = TRUE;
-}
-#else
-GList *
-get_interface_list(int *err, char *err_str) {
-  GList  *il = NULL;
-  wchar_t *names;
-  char *win95names; 
-  char newname[255];
-  int i, j, done;
-  
-  names = (wchar_t *)pcap_lookupdev(err_str);
-  i = done = 0;
-
-  if (names) {
-         if (names[0]<256) { 
-                 /* If names[0] is less than 256 it means the first byte is 0
-                    This implies that we are using unicode characters */
-                 do 
-                 { 
-                         j = 0; 
-                         while (names[i] != 0) 
-                                 newname[j++] = names[i++]; 
-                         i++; 
-                         if (names[i] == 0) 
-                                 done = 1; 
-                         newname[j++] = 0; 
-                         il = g_list_append(il, g_strdup(newname)); 
-                 } while (!done); 
-         } 
-         else { 
-                 /* Otherwise we are in Windows 95/98 and using ascii(8 bit)
-                    characters */
-                 do 
-                 { 
-                         win95names=(char *)names; 
-                         j = 0; 
-                         while (win95names[i] != 0) 
-                                 newname[j++] = win95names[i++]; 
-                         i++; 
-                         if (win95names[i] == 0) 
-                                 done = 1; 
-                         newname[j++] = 0; 
-                         il = g_list_append(il, g_strdup(newname)); 
-                 } while (!done); 
-         } 
-  }
-  return(il);
-}
-#endif
-
-static void
-free_if_cb(gpointer data, gpointer user_data)
-{
-       g_free(data);
-}
-
-void
-free_interface_list(GList *if_list)
-{
-       while (if_list != NULL) {
-               g_free(if_list->data);
-               if_list = g_list_remove_link(if_list, if_list);
-       }
-}
-
-#endif /* HAVE_LIBPCAP */
-
-
 /* Compute the difference between two seconds/microseconds time stamps. */
 void
 compute_timestamp_diff(gint *diffsec, gint *diffusec,
diff --git a/util.h b/util.h
index 0bacc3804ee2f96314128d74c4ae27a3b8f4afa0..2c3c028c955e001c7c0ec3313dcaa45420456bac 100644 (file)
--- a/util.h
+++ b/util.h
@@ -1,7 +1,7 @@
 /* util.h
  * Utility definitions
  *
- * $Id: util.h,v 1.24 2001/08/21 06:39:15 guy Exp $
+ * $Id: util.h,v 1.25 2001/11/09 07:44:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -42,18 +42,6 @@ guint8 ASCII_to_EBCDIC1(guint8 c);
 void EBCDIC_to_ASCII(guint8 *buf, guint bytes);
 guint8 EBCDIC_to_ASCII1(guint8 c);
 
-#ifdef HAVE_LIBPCAP
-
-GList *get_interface_list(int *err, char *err_str);
-
-/* Error values from "get_interface_list()". */
-#define        CANT_GET_INTERFACE_LIST 0       /* error getting list */
-#define        NO_INTERFACES_FOUND     1       /* list is empty */
-
-void free_interface_list(GList *if_list);
-
-#endif
-
 /* Compute the difference between two seconds/microseconds time stamps. */
 void compute_timestamp_diff(gint *, gint *, guint32, guint32, guint32, guint32);
 
index ae5f4ad81c54d1db82a4748640fdbfe0f16f0d59..7138d928f8ba86597411798e11f461a30cdcc24d 100644 (file)
@@ -1,6 +1,6 @@
 /* libpcap.c
  *
- * $Id: libpcap.c,v 1.55 2001/11/07 08:16:26 guy Exp $
+ * $Id: libpcap.c,v 1.56 2001/11/09 07:44:51 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -462,21 +462,22 @@ int libpcap_open(wtap *wth, int *err)
         * are:
         *
         *      Ethernet        6
-        *      Token Ring      8
+        *      Token Ring      9
         *      FDDI            15
         *
         * which correspond to DLT_IEEE802 (used for Token Ring),
-        * DLT_SLIP, and DLT_SLIP_BSDOS, respectively.  We shall
+        * DLT_PPP, and DLT_SLIP_BSDOS, respectively.  We shall
         * assume that if the minor version number is 2, and
-        * the network type is 6, 8, or 15, that it's AIX libpcap;
+        * the network type is 6, 9, or 15, that it's AIX libpcap;
+        *
         * I'm assuming those older versions of libpcap didn't
         * use DLT_IEEE802 for Token Ring, and didn't use DLT_SLIP_BSDOS
         * as that came later.  It may have used DLT_SLIP, however, in
         * which case we're out of luck; we assume it's Token Ring
-        * in AIX libpcap rather than SLIP in standard libpcap, as
+        * in AIX libpcap rather than PPP in standard libpcap, as
         * you're probably more likely to be handing an AIX libpcap
-        * capture than an old (pre-libpcap 0.4) SLIP capture to
-        * Ethereal.
+        * token-ring capture than an old (pre-libpcap 0.4) PPP capture
+        * to Ethereal.
         */
        aix = FALSE;    /* assume it's not AIX */
        if (hdr.version_major == 2 && hdr.version_minor == 2) {