diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | wiretap/libpcap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 5 |
4 files changed, 10 insertions, 4 deletions
@@ -906,6 +906,7 @@ Andrew C. Feren <aferen[AT]cetacean.com> { Tomas Kukosa <tomas.kukosa[AT]anfdata.cz> { Additional routines made available to plugins + Support in Wiretap for DLT_HHDLC } Andreas Stockmeier <a.stockmeier[AT]avm.de> { diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index c77af6f9fb..05a13a64d1 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.64 2002/01/29 08:55:24 guy Exp $ + * $Id: libpcap.c,v 1.65 2002/02/07 20:41:28 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -381,6 +381,7 @@ static const struct { { 118, WTAP_ENCAP_CISCO_IOS }, { 119, WTAP_ENCAP_PRISM_HEADER }, /* Prism monitor mode hdr */ + { 121, WTAP_ENCAP_HHDLC }, /* HiPath HDLC */ }; #define NUM_PCAP_ENCAPS (sizeof pcap_to_wtap_map / sizeof pcap_to_wtap_map[0]) diff --git a/wiretap/wtap.c b/wiretap/wtap.c index e77644057c..b9ba2e1558 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.60 2002/01/29 09:45:58 guy Exp $ + * $Id: wtap.c,v 1.61 2002/02/07 20:41:28 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -139,6 +139,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_AIROPEEK */ { "IEEE 802.11 plus AiroPeek header", "airopeek" }, + + /* WTAP_ENCAP_HHDLC */ + { "HiPath HDLC", "hhdlc" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index f2a71d0e02..dfc2f779d7 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.104 2002/02/01 00:10:03 guy Exp $ + * $Id: wtap.h,v 1.105 2002/02/07 20:41:28 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -106,9 +106,10 @@ #define WTAP_ENCAP_PRISM_HEADER 24 #define WTAP_ENCAP_PFLOG 25 #define WTAP_ENCAP_AIROPEEK 26 +#define WTAP_ENCAP_HHDLC 27 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 27 +#define WTAP_NUM_ENCAP_TYPES 28 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |