diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-29 08:44:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-29 08:44:53 +0000 |
| commit | c873f79156f1ad7cd04168d9dca7d3a322c7ae3f (patch) | |
| tree | ad1052c0e6fa256db7900ff529de5064cb607e6e /wiretap/libpcap.c | |
| parent | d76a4172a628adee57cf34155782a31a9444b930 (diff) | |
Support for capturing on, and reading captures from, OpenBSD firewall
logging virtual interface, from Mike Frantzen.
svn path=/trunk/; revision=4616
Diffstat (limited to 'wiretap/libpcap.c')
| -rw-r--r-- | wiretap/libpcap.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index b10d1d2317..b4c1bad05c 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.62 2001/12/04 07:32:05 guy Exp $ + * $Id: libpcap.c,v 1.63 2002/01/29 08:44:53 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -230,7 +230,12 @@ static const struct { /* * 17 is DLT_LANE8023 in SuSE 6.3 libpcap; we don't currently * handle it. + * It is also used as the PF (Packet Filter) logging format beginning + * with OpenBSD 3.0. */ +#if defined(DLT_PFLOG) && (DLT_PFLOG == 17) + { 17, WTAP_ENCAP_PFLOG }, +#endif /* * 18 is DLT_CIP in SuSE 6.3 libpcap; if it's the same as the @@ -366,6 +371,13 @@ static const struct { { 114, WTAP_ENCAP_LOCALTALK }, /* Localtalk */ + /* + * The tcpdump.org version of libpcap uses 117, rather than 17, + * for OpenBSD packet filter logging, so as to avoid conflicting + * with DLT_LANE8023 in SuSE 6.3 libpcap. + */ + { 117, WTAP_ENCAP_PFLOG }, + { 118, WTAP_ENCAP_CISCO_IOS }, { 119, WTAP_ENCAP_PRISM_HEADER }, /* Prism monitor mode hdr */ }; |