aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorgram <gram@f5534014-38df-0310-8fa8-9805f1628bb7>2001-11-02 13:00:30 +0000
committergram <gram@f5534014-38df-0310-8fa8-9805f1628bb7>2001-11-02 13:00:30 +0000
commitcb895f9411ea4cfb31087592aa22946e4845eab8 (patch)
treea8123e835acba97063cd1da62dfb5fe085b7317f /wiretap
parent87692118161441ab042f5f106a263d5844ffeaae (diff)
Support DLT_CISCO_IOS.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4126 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/libpcap.c4
-rw-r--r--wiretap/wtap.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 715161cd6c..a92787a9a9 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1,6 +1,6 @@
/* libpcap.c
*
- * $Id: libpcap.c,v 1.52 2001/10/25 20:29:23 gram Exp $
+ * $Id: libpcap.c,v 1.53 2001/11/02 13:00:30 gram Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -363,6 +363,8 @@ static const struct {
* of libpcap.
*/
{ 113, WTAP_ENCAP_SLL }, /* Linux cooked capture */
+
+ { 118, WTAP_ENCAP_CISCO_IOS },
};
#define NUM_PCAP_ENCAPS (sizeof pcap_to_wtap_map / sizeof pcap_to_wtap_map[0])
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 5de6e536d6..45b7b6532c 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1,6 +1,6 @@
/* wtap.h
*
- * $Id: wtap.h,v 1.91 2001/10/19 20:18:48 guy Exp $
+ * $Id: wtap.h,v 1.92 2001/11/02 13:00:30 gram Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -98,9 +98,10 @@
#define WTAP_ENCAP_SLL 19
#define WTAP_ENCAP_FRELAY 20
#define WTAP_ENCAP_CHDLC 21
+#define WTAP_ENCAP_CISCO_IOS 22
/* last WTAP_ENCAP_ value + 1 */
-#define WTAP_NUM_ENCAP_TYPES 22
+#define WTAP_NUM_ENCAP_TYPES 23
/* File types that can be read by wiretap.
We support writing some many of these file types, too, so we