diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-01-29 08:55:24 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-01-29 08:55:24 +0000 |
| commit | 5cf3587feba3e8d0a897d6a88ac8685cea5837b3 (patch) | |
| tree | 0b090b66f0ab477154c21dff8d09916f2251e521 /wiretap | |
| parent | c873f79156f1ad7cd04168d9dca7d3a322c7ae3f (diff) | |
| download | wireshark-5cf3587feba3e8d0a897d6a88ac8685cea5837b3.tar.gz wireshark-5cf3587feba3e8d0a897d6a88ac8685cea5837b3.tar.bz2 wireshark-5cf3587feba3e8d0a897d6a88ac8685cea5837b3.zip | |
Support a libpcap link-layer type of 17 as DLT_PFLOG unless DLT_LANE8023
is defined as 17.
svn path=/trunk/; revision=4617
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index b4c1bad05c..c77af6f9fb 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.63 2002/01/29 08:44:53 guy Exp $ + * $Id: libpcap.c,v 1.64 2002/01/29 08:55:24 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -231,9 +231,10 @@ 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. + * with OpenBSD 3.0; we use 17 for PF logs unless DLT_LANE8023 is + * defined with the value 17. */ -#if defined(DLT_PFLOG) && (DLT_PFLOG == 17) +#if !defined(DLT_LANE8023) || (DLT_LANE8023 != 17) { 17, WTAP_ENCAP_PFLOG }, #endif |