diff options
| author | bms <bms@FreeBSD.org> | 2004-03-31 14:57:24 +0000 |
|---|---|---|
| committer | bms <bms@FreeBSD.org> | 2004-03-31 14:57:24 +0000 |
| commit | 55b12ee1997869e5aed19e4145ad34c6d874a423 (patch) | |
| tree | 5b810dd82a76f16819dd3cc55ffa53ff444b2d5a /contrib/tcpdump/ethertype.h | |
| parent | 34f833a812abe250ad28d7dadb1fdc086b1d4ecd (diff) | |
| download | FreeBSD-src-55b12ee1997869e5aed19e4145ad34c6d874a423.zip FreeBSD-src-55b12ee1997869e5aed19e4145ad34c6d874a423.tar.gz | |
Merge of tcpdump 3.8.3 from tcpdump.org, with the following caveats:
print-atm.c no longer performs special handling for FORE headers; these
can no doubt be re-added at a later date.
print-fr.c is effectively a no-op.
print-llc.c has had the default_print_unaligned() call removed as
tcpdump no longer defines this function, however the prototype is still
present. Suggest we roll in a diff to use print_unknown_data().
Diffstat (limited to 'contrib/tcpdump/ethertype.h')
| -rw-r--r-- | contrib/tcpdump/ethertype.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/contrib/tcpdump/ethertype.h b/contrib/tcpdump/ethertype.h index caff2579..63c0c29 100644 --- a/contrib/tcpdump/ethertype.h +++ b/contrib/tcpdump/ethertype.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.16 2001/06/21 17:56:02 itojun Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.20 2003/07/01 19:10:26 guy Exp $ (LBL) * * $FreeBSD$ */ @@ -71,9 +71,6 @@ #ifndef ETHERTYPE_SCA #define ETHERTYPE_SCA 0x6007 #endif -#ifndef ETHERTYPE_REVARP -#define ETHERTYPE_REVARP 0x8035 -#endif #ifndef ETHERTYPE_LANBRIDGE #define ETHERTYPE_LANBRIDGE 0x8038 #endif @@ -128,3 +125,11 @@ #ifndef ETHERTYPE_LOOPBACK #define ETHERTYPE_LOOPBACK 0x9000 #endif +#ifndef ETHERTYPE_VMAN +#define ETHERTYPE_VMAN 0x9100 /* Extreme VMAN Protocol */ +#endif +#ifndef ETHERTYPE_ISO +#define ETHERTYPE_ISO 0xfefe /* nonstandard - used in Cisco HDLC encapsulation */ +#endif + +extern const struct tok ethertype_values[]; |
