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

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

71#endif
72#ifndef ETHERTYPE_AARP
73#define ETHERTYPE_AARP 0x80f3
74#endif
75#ifndef ETHERTYPE_8021Q
76#define ETHERTYPE_8021Q 0x8100
77#endif
78#ifndef ETHERTYPE_IPX
49#ifndef ETHERTYPE_NS
50#define ETHERTYPE_NS 0x0600
51#endif
52#ifndef ETHERTYPE_SPRITE
53#define ETHERTYPE_SPRITE 0x0500
54#endif
55#ifndef ETHERTYPE_TRAIL
56#define ETHERTYPE_TRAIL 0x1000

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

93#endif
94#ifndef ETHERTYPE_AARP
95#define ETHERTYPE_AARP 0x80f3
96#endif
97#ifndef ETHERTYPE_8021Q
98#define ETHERTYPE_8021Q 0x8100
99#endif
100#ifndef ETHERTYPE_IPX
79#define ETHERTYPE_IPX 0x8137
101#define ETHERTYPE_IPX 0x8137
80#endif
81#ifndef ETHERTYPE_IPV6
82#define ETHERTYPE_IPV6 0x86dd
83#endif
84#ifndef ETHERTYPE_PPPOED
85#define ETHERTYPE_PPPOED 0x8863
86#endif
87#ifndef ETHERTYPE_PPPOES
88#define ETHERTYPE_PPPOES 0x8864
89#endif
90#ifndef ETHERTYPE_LOOPBACK
91#define ETHERTYPE_LOOPBACK 0x9000
92#endif
102#endif
103#ifndef ETHERTYPE_IPV6
104#define ETHERTYPE_IPV6 0x86dd
105#endif
106#ifndef ETHERTYPE_PPPOED
107#define ETHERTYPE_PPPOED 0x8863
108#endif
109#ifndef ETHERTYPE_PPPOES
110#define ETHERTYPE_PPPOES 0x8864
111#endif
112#ifndef ETHERTYPE_LOOPBACK
113#define ETHERTYPE_LOOPBACK 0x9000
114#endif