Deleted Added
full compact
ethertype.h (127675) ethertype.h (146778)
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.20 2003/07/01 19:10:26 guy Exp $ (LBL)
22 *
21 *
23 * $FreeBSD: head/contrib/tcpdump/ethertype.h 127675 2004-03-31 14:57:24Z bms $
22 * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.24 2004/10/07 16:04:07 hannes Exp $ (LBL)
23 * $FreeBSD: head/contrib/tcpdump/ethertype.h 146778 2005-05-29 19:09:28Z sam $
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
32 * of these values.
33 *
34 * We declare all of them here so that no file has to include
35 * <netinet/if_ether.h> if all it needs are ETHERTYPE_ values.
36 */
37
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
32 * of these values.
33 *
34 * We declare all of them here so that no file has to include
35 * <netinet/if_ether.h> if all it needs are ETHERTYPE_ values.
36 */
37
38#ifndef ETHERTYPE_LEN
39#define ETHERTYPE_LEN 2
40#endif
41
42#ifndef ETHERTYPE_GRE_ISO
43#define ETHERTYPE_GRE_ISO 0x00FE /* not really an ethertype only used in GRE */
44#endif
38#ifndef ETHERTYPE_PUP
39#define ETHERTYPE_PUP 0x0200 /* PUP protocol */
40#endif
41#ifndef ETHERTYPE_IP
42#define ETHERTYPE_IP 0x0800 /* IP protocol */
43#endif
44#ifndef ETHERTYPE_ARP
45#define ETHERTYPE_ARP 0x0806 /* Addr. resolution protocol */

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

117#define ETHERTYPE_PPPOES 0x8864
118#endif
119#ifndef ETHERTYPE_PPPOED2
120#define ETHERTYPE_PPPOED2 0x3c12
121#endif
122#ifndef ETHERTYPE_PPPOES2
123#define ETHERTYPE_PPPOES2 0x3c13
124#endif
45#ifndef ETHERTYPE_PUP
46#define ETHERTYPE_PUP 0x0200 /* PUP protocol */
47#endif
48#ifndef ETHERTYPE_IP
49#define ETHERTYPE_IP 0x0800 /* IP protocol */
50#endif
51#ifndef ETHERTYPE_ARP
52#define ETHERTYPE_ARP 0x0806 /* Addr. resolution protocol */

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

124#define ETHERTYPE_PPPOES 0x8864
125#endif
126#ifndef ETHERTYPE_PPPOED2
127#define ETHERTYPE_PPPOED2 0x3c12
128#endif
129#ifndef ETHERTYPE_PPPOES2
130#define ETHERTYPE_PPPOES2 0x3c13
131#endif
132#ifndef ETHERTYPE_JUMBO
133#define ETHERTYPE_JUMBO 0x8870
134#endif
135#ifndef ETHERTYPE_EAPOL
136#define ETHERTYPE_EAPOL 0x888e
137#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[];
138#ifndef ETHERTYPE_LOOPBACK
139#define ETHERTYPE_LOOPBACK 0x9000
140#endif
141#ifndef ETHERTYPE_VMAN
142#define ETHERTYPE_VMAN 0x9100 /* Extreme VMAN Protocol */
143#endif
144#ifndef ETHERTYPE_ISO
145#define ETHERTYPE_ISO 0xfefe /* nonstandard - used in Cisco HDLC encapsulation */
146#endif
147
148extern const struct tok ethertype_values[];