Deleted Added
full compact
ethertype.h (98527) ethertype.h (127675)
1/*
2 * Copyright (c) 1993, 1994, 1996
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 4 unchanged lines hidden (view full) ---

13 * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
14 * the University nor the names of its contributors may be used to endorse
15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
1/*
2 * Copyright (c) 1993, 1994, 1996
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 4 unchanged lines hidden (view full) ---

13 * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
14 * the University nor the names of its contributors may be used to endorse
15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.16 2001/06/21 17:56:02 itojun Exp $ (LBL)
21 * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.20 2003/07/01 19:10:26 guy Exp $ (LBL)
22 *
22 *
23 * $FreeBSD: head/contrib/tcpdump/ethertype.h 98527 2002-06-21 00:49:02Z fenner $
23 * $FreeBSD: head/contrib/tcpdump/ethertype.h 127675 2004-03-31 14:57:24Z bms $
24 */
25
26/*
27 * Ethernet types.
28 *
29 * We wrap the declarations with #ifdef, so that if a file includes
30 * <netinet/if_ether.h>, which may declare some of these, we don't
31 * get a bunch of complaints from the C compiler about redefinitions

--- 34 unchanged lines hidden (view full) ---

66#define ETHERTYPE_DN 0x6003
67#endif
68#ifndef ETHERTYPE_LAT
69#define ETHERTYPE_LAT 0x6004
70#endif
71#ifndef ETHERTYPE_SCA
72#define ETHERTYPE_SCA 0x6007
73#endif
24 */
25
26/*
27 * Ethernet types.
28 *
29 * We wrap the declarations with #ifdef, so that if a file includes
30 * <netinet/if_ether.h>, which may declare some of these, we don't
31 * get a bunch of complaints from the C compiler about redefinitions

--- 34 unchanged lines hidden (view full) ---

66#define ETHERTYPE_DN 0x6003
67#endif
68#ifndef ETHERTYPE_LAT
69#define ETHERTYPE_LAT 0x6004
70#endif
71#ifndef ETHERTYPE_SCA
72#define ETHERTYPE_SCA 0x6007
73#endif
74#ifndef ETHERTYPE_REVARP
75#define ETHERTYPE_REVARP 0x8035
76#endif
77#ifndef ETHERTYPE_LANBRIDGE
78#define ETHERTYPE_LANBRIDGE 0x8038
79#endif
80#ifndef ETHERTYPE_DECDNS
81#define ETHERTYPE_DECDNS 0x803c
82#endif
83#ifndef ETHERTYPE_DECDTS
84#define ETHERTYPE_DECDTS 0x803e

--- 38 unchanged lines hidden (view full) ---

123#define ETHERTYPE_PPPOED2 0x3c12
124#endif
125#ifndef ETHERTYPE_PPPOES2
126#define ETHERTYPE_PPPOES2 0x3c13
127#endif
128#ifndef ETHERTYPE_LOOPBACK
129#define ETHERTYPE_LOOPBACK 0x9000
130#endif
74#ifndef ETHERTYPE_LANBRIDGE
75#define ETHERTYPE_LANBRIDGE 0x8038
76#endif
77#ifndef ETHERTYPE_DECDNS
78#define ETHERTYPE_DECDNS 0x803c
79#endif
80#ifndef ETHERTYPE_DECDTS
81#define ETHERTYPE_DECDTS 0x803e

--- 38 unchanged lines hidden (view full) ---

120#define ETHERTYPE_PPPOED2 0x3c12
121#endif
122#ifndef ETHERTYPE_PPPOES2
123#define ETHERTYPE_PPPOES2 0x3c13
124#endif
125#ifndef ETHERTYPE_LOOPBACK
126#define ETHERTYPE_LOOPBACK 0x9000
127#endif
128#ifndef ETHERTYPE_VMAN
129#define ETHERTYPE_VMAN 0x9100 /* Extreme VMAN Protocol */
130#endif
131#ifndef ETHERTYPE_ISO
132#define ETHERTYPE_ISO 0xfefe /* nonstandard - used in Cisco HDLC encapsulation */
133#endif
134
135extern const struct tok ethertype_values[];