diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-05-15 07:14:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-05-15 07:14:46 +0000 |
| commit | 86f3c38c4aef93560541c50e2f501e94802b337d (patch) | |
| tree | ada44233717d4e44f714b769a32c266591b0aa57 /wiretap | |
| parent | 64840abd9f877dc56d773fc1c3884dc1f171b249 (diff) | |
| download | wireshark-86f3c38c4aef93560541c50e2f501e94802b337d.tar.gz wireshark-86f3c38c4aef93560541c50e2f501e94802b337d.tar.bz2 wireshark-86f3c38c4aef93560541c50e2f501e94802b337d.zip | |
From Can Erkin Acar: OpenBSD is now using tcpdump.org-assigned DLT_
value for DLT_PFLOG, and that goes along with a change to the link-layer
header for DLT_PFLOG - support both the old and new values and format.
svn path=/trunk/; revision=7676
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 4 | ||||
| -rw-r--r-- | wiretap/wtap.c | 10 | ||||
| -rw-r--r-- | wiretap/wtap.h | 7 |
3 files changed, 14 insertions, 7 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index c2eeeed9a0..4d4c3d0fa9 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.95 2003/03/25 06:04:54 guy Exp $ + * $Id: libpcap.c,v 1.96 2003/05/15 07:14:45 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -385,7 +385,7 @@ static const struct { * defined with the value 17. */ #if !defined(DLT_LANE8023) || (DLT_LANE8023 != 17) - { 17, WTAP_ENCAP_PFLOG }, + { 17, WTAP_ENCAP_OLD_PFLOG }, #endif /* diff --git a/wiretap/wtap.c b/wiretap/wtap.c index fece9a54e3..e38c5cca6a 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.81 2003/03/04 02:38:02 guy Exp $ + * $Id: wtap.c,v 1.82 2003/05/15 07:14:45 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -147,7 +147,7 @@ static const struct encap_type_info { { "IEEE 802.11 plus Prism II monitor mode header", "prism" }, /* WTAP_ENCAP_PFLOG */ - { "OpenBSD PF Firewall logs", "pflog" }, + { "OpenBSD PF Firewall logs, pre-3.4", "pflog-old" }, /* WTAP_ENCAP_HHDLC */ { "HiPath HDLC", "hhdlc" }, @@ -169,6 +169,12 @@ static const struct encap_type_info { /* WTAP_ENCAP_TZSP */ { "Tazmen sniffer protocol", "tzsp" }, + + /* WTAP_ENCAP_ENC */ + { " OpenBSD enc(4) encapsulating interface", "enc" }, + + /* WTAP_ENCAP_PFLOG */ + { "OpenBSD PF Firewall logs", "pflog" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 572c38ea03..903da1b15d 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.136 2003/03/08 09:11:53 guy Exp $ + * $Id: wtap.h,v 1.137 2003/05/15 07:14:46 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -118,7 +118,7 @@ #define WTAP_ENCAP_CISCO_IOS 26 #define WTAP_ENCAP_LOCALTALK 27 #define WTAP_ENCAP_PRISM_HEADER 28 -#define WTAP_ENCAP_PFLOG 29 +#define WTAP_ENCAP_OLD_PFLOG 29 #define WTAP_ENCAP_HHDLC 30 #define WTAP_ENCAP_DOCSIS 31 #define WTAP_ENCAP_COSINE 32 @@ -127,9 +127,10 @@ #define WTAP_ENCAP_SDLC 35 #define WTAP_ENCAP_TZSP 36 #define WTAP_ENCAP_ENC 37 +#define WTAP_ENCAP_PFLOG 38 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 38 +#define WTAP_NUM_ENCAP_TYPES 39 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |