Support for capturing on encrypted CIPE tunnels in IRIX, from Franz

Schaefer <[email protected]>.

diff --git a/CREDITS b/CREDITS
index 4b1fd6ca93f137a301ae1e9ff5aac45d6621677c..40f8a07c56dcd2942ad034954d3e76956bfc4640 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -19,6 +19,7 @@ Additional people who have contributed patches:
        Chris G. Demetriou              <[email protected]>
        Chris Pepper                    <[email protected]>
        Darren Reed                     <[email protected]>
+       Franz Schaefer                  <[email protected]>
        Greg Troxel                     <[email protected]>
        Igor Khristophorov              <[email protected]>
        Jason R. Thorpe                 <[email protected]>

diff --git a/pcap-snoop.c b/pcap-snoop.c
index 82e51c4f55494189766fbc82e6c28baa0dead3fb..4eccc80e763256a190a16739b094ddf7577850a1 100644 (file)
--- a/pcap-snoop.c
+++ b/pcap-snoop.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.30 2000-10-28 00:01:30 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.31 2001-06-05 03:48:41 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -179,6 +179,7 @@ pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
            strncmp("vfe", device, 3) == 0 ||   /* Challenge VME 100Mbit */
            strncmp("fa", device, 2) == 0 ||
            strncmp("qaa", device, 3) == 0 ||
+           strncmp("cip", device, 3) == 0 ||
            strncmp("el", device, 2) == 0) {
                p->linktype = DLT_EN10MB;
                p->offset = RAW_HDRPAD(sizeof(struct ether_header));