diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-12-23 08:06:16 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-12-23 08:06:16 +0000 |
| commit | 039805843b58e5f329fbd176a2fbfa5769d9d89c (patch) | |
| tree | 38e10b3769821310c71b5ae2ffd72a572a98a782 /wiretap/libpcap.c | |
| parent | d9c2256fa29e4c27616de7619795bee31d8d4656 (diff) | |
Add support for the DLT_LINUX_SLL capture type in the current CVS
version of libpcap; that's used on Linux for captures on the "any"
device (which captures from all interfaces simultaneously) and for
captures on devices whose link-layer type libpcap doesn't (yet) support
natively.
The spanning tree code, when checking for GV{M,R,...}P packets, must
first check whether the link-layer destination address is, in fact, an
Ethernet-style address; on Linux cooked captures, there *is* no
destination address, so it's of type AT_NONE, not AT_ETHER.
svn path=/trunk/; revision=2772
Diffstat (limited to 'wiretap/libpcap.c')
| -rw-r--r-- | wiretap/libpcap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 3eac15b74a..52b65bed73 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.44 2000/11/15 05:41:47 guy Exp $ + * $Id: libpcap.c,v 1.45 2000/12/23 08:06:15 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org> @@ -338,6 +338,12 @@ static const struct { { 111, WTAP_ENCAP_HIPPI }, /* NetBSD HIPPI */ { 112, WTAP_ENCAP_HDLC }, /* NetBSD HDLC framing */ #endif + + /* + * Linux "cooked mode" captures, used by the current CVS version + * of libpcap. + */ + { 113, WTAP_ENCAP_SLL }, /* Linux cooked capture */ }; #define NUM_PCAP_ENCAPS (sizeof pcap_to_wtap_map / sizeof pcap_to_wtap_map[0]) |