Wrap calls to "pcap_datalink()" in a routine that attempts to compensate

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.

svn path=/trunk/; revision=4184

1 files changed, 1 insertions, 13 deletions

diff --git a/util.h b/util.h
index 0bacc3804e..2c3c028c95 100644
--- 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);