diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-03-08 09:11:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-03-08 09:11:53 +0000 |
| commit | ad8856029b0faf99cfcf74fd0a83f9e1f01d2716 (patch) | |
| tree | 805d14701ec411458df35bfc3f75d09c04f230e0 /wiretap | |
| parent | c6f038a787a1abee051545360b41561dd8910b4a (diff) | |
| download | wireshark-ad8856029b0faf99cfcf74fd0a83f9e1f01d2716.tar.gz wireshark-ad8856029b0faf99cfcf74fd0a83f9e1f01d2716.tar.bz2 wireshark-ad8856029b0faf99cfcf74fd0a83f9e1f01d2716.zip | |
WTAP_ENCAP_ENC was, in fact, intended for use for DLT_ENC, so just
rename WTAP_ENCAP_ENC0 to WTAP_ENCAP_ENC.
un-#if 0 out the code to handle the value 109 for DLT_ENC, as I've just
checked in support for DLT_ENC in tcpdump.org libpcap and tcpdump, which
maps DLT_ENC to 109 in the file header.
Give packet-enc.c an RCS ID.
svn path=/trunk/; revision=7323
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 6 | ||||
| -rw-r--r-- | wiretap/wtap.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index aae2e6f428..a61835d5df 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.93 2003/03/07 16:52:46 gerald Exp $ + * $Id: libpcap.c,v 1.94 2003/03/08 09:11:53 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -213,8 +213,8 @@ static const struct { { 106, WTAP_ENCAP_LINUX_ATM_CLIP }, { 107, WTAP_ENCAP_FRELAY }, /* Frame Relay */ { 108, WTAP_ENCAP_NULL }, /* OpenBSD loopback */ -#if 0 { 109, WTAP_ENCAP_ENC }, /* OpenBSD IPSEC enc */ +#if 0 { 110, WTAP_ENCAP_LANE_802_3 },/* ATM LANE 802.3 */ { 111, WTAP_ENCAP_HIPPI }, /* NetBSD HIPPI */ #endif @@ -324,7 +324,7 @@ static const struct { #if defined(DLT_ATM_RFC1483) && (DLT_ATM_RFC1483 == 13) { 13, WTAP_ENCAP_ATM_RFC1483 }, #elif defined(DLT_ENC) && (DLT_ENC == 13) - { 13, WTAP_ENCAP_ENC0 }, + { 13, WTAP_ENCAP_ENC }, #endif /* diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 09f153e32f..572c38ea03 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.135 2003/03/07 16:52:46 gerald Exp $ + * $Id: wtap.h,v 1.136 2003/03/08 09:11:53 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -126,7 +126,7 @@ #define WTAP_ENCAP_WFLEET_HDLC 34 #define WTAP_ENCAP_SDLC 35 #define WTAP_ENCAP_TZSP 36 -#define WTAP_ENCAP_ENC0 37 +#define WTAP_ENCAP_ENC 37 /* last WTAP_ENCAP_ value + 1 */ #define WTAP_NUM_ENCAP_TYPES 38 |