Deleted Added
full compact
ethertype.h (56889) ethertype.h (75107)
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/libpcap/ethertype.h,v 1.7 1999/10/30 04:30:13 itojun Exp $ (LBL)
21 * @(#) $Header: /tcpdump/master/libpcap/ethertype.h,v 1.11 2000/10/22 04:15:55 guy Exp $ (LBL)
22 */
23
22 */
23
24/* Types missing from some systems */
24/*
25 * Ethernet types.
26 *
27 * We wrap the declarations with #ifdef, so that if a file includes
28 * <netinet/if_ether.h>, which may declare some of these, we don't
29 * get a bunch of complaints from the C compiler about redefinitions
30 * of these values.
31 *
32 * We declare all of them here so that no file has to include
33 * <netinet/if_ether.h> if all it needs are ETHERTYPE_ values.
34 */
25
35
36#ifndef ETHERTYPE_PUP
37#define ETHERTYPE_PUP 0x0200 /* PUP protocol */
38#endif
39#ifndef ETHERTYPE_IP
40#define ETHERTYPE_IP 0x0800 /* IP protocol */
41#endif
42#ifndef ETHERTYPE_ARP
43#define ETHERTYPE_ARP 0x0806 /* Addr. resolution protocol */
44#endif
45#ifndef ETHERTYPE_REVARP
46#define ETHERTYPE_REVARP 0x8035 /* reverse Addr. resolution protocol */
47#endif
26#ifndef ETHERTYPE_NS
27#define ETHERTYPE_NS 0x0600
28#endif
29#ifndef ETHERTYPE_SPRITE
30#define ETHERTYPE_SPRITE 0x0500
31#endif
32#ifndef ETHERTYPE_TRAIL
33#define ETHERTYPE_TRAIL 0x1000

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

67#endif
68#ifndef ETHERTYPE_ATALK
69#define ETHERTYPE_ATALK 0x809b
70#endif
71#ifndef ETHERTYPE_AARP
72#define ETHERTYPE_AARP 0x80f3
73#endif
74#ifndef ETHERTYPE_IPV6
48#ifndef ETHERTYPE_NS
49#define ETHERTYPE_NS 0x0600
50#endif
51#ifndef ETHERTYPE_SPRITE
52#define ETHERTYPE_SPRITE 0x0500
53#endif
54#ifndef ETHERTYPE_TRAIL
55#define ETHERTYPE_TRAIL 0x1000

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

89#endif
90#ifndef ETHERTYPE_ATALK
91#define ETHERTYPE_ATALK 0x809b
92#endif
93#ifndef ETHERTYPE_AARP
94#define ETHERTYPE_AARP 0x80f3
95#endif
96#ifndef ETHERTYPE_IPV6
75#define ETHERTYPE_IPV6 0x80f3
97#define ETHERTYPE_IPV6 0x86dd
76#endif
98#endif
99#ifndef ETHERTYPE_8021Q
100#define ETHERTYPE_8021Q 0x8100
101#endif
77#ifndef ETHERTYPE_LOOPBACK
78#define ETHERTYPE_LOOPBACK 0x9000
79#endif
102#ifndef ETHERTYPE_LOOPBACK
103#define ETHERTYPE_LOOPBACK 0x9000
104#endif