Deleted Added
full compact
ip.h (112985) ip.h (121684)
1/*
2 * Copyright (c) 1982, 1986, 1993
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 the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)ip.h 8.2 (Berkeley) 6/1/94
1/*
2 * Copyright (c) 1982, 1986, 1993
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 the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)ip.h 8.2 (Berkeley) 6/1/94
34 * $FreeBSD: head/sys/netinet/ip.h 112985 2003-04-02 20:14:44Z mdodd $
34 * $FreeBSD: head/sys/netinet/ip.h 121684 2003-10-29 15:07:04Z ume $
35 */
36
37#ifndef _NETINET_IP_H_
38#define _NETINET_IP_H_
39
40#include <sys/cdefs.h>
41
42/*

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

79
80/*
81 * Definitions for IP type of service (ip_tos)
82 */
83#define IPTOS_LOWDELAY 0x10
84#define IPTOS_THROUGHPUT 0x08
85#define IPTOS_RELIABILITY 0x04
86#define IPTOS_MINCOST 0x02
35 */
36
37#ifndef _NETINET_IP_H_
38#define _NETINET_IP_H_
39
40#include <sys/cdefs.h>
41
42/*

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

79
80/*
81 * Definitions for IP type of service (ip_tos)
82 */
83#define IPTOS_LOWDELAY 0x10
84#define IPTOS_THROUGHPUT 0x08
85#define IPTOS_RELIABILITY 0x04
86#define IPTOS_MINCOST 0x02
87/* ECN bits proposed by Sally Floyd */
88#define IPTOS_CE 0x01 /* congestion experienced */
89#define IPTOS_ECT 0x02 /* ECN-capable transport */
87#if 1
88/* ECN RFC3168 obsoletes RFC2481, and these will be deprecated soon. */
89#define IPTOS_CE 0x01
90#define IPTOS_ECT 0x02
91#endif
90
92
91
92/*
93 * Definitions for IP precedence (also in ip_tos) (hopefully unused)
94 */
95#define IPTOS_PREC_NETCONTROL 0xe0
96#define IPTOS_PREC_INTERNETCONTROL 0xc0
97#define IPTOS_PREC_CRITIC_ECP 0xa0
98#define IPTOS_PREC_FLASHOVERRIDE 0x80
99#define IPTOS_PREC_FLASH 0x60
100#define IPTOS_PREC_IMMEDIATE 0x40
101#define IPTOS_PREC_PRIORITY 0x20
102#define IPTOS_PREC_ROUTINE 0x00
103
104/*
93/*
94 * Definitions for IP precedence (also in ip_tos) (hopefully unused)
95 */
96#define IPTOS_PREC_NETCONTROL 0xe0
97#define IPTOS_PREC_INTERNETCONTROL 0xc0
98#define IPTOS_PREC_CRITIC_ECP 0xa0
99#define IPTOS_PREC_FLASHOVERRIDE 0x80
100#define IPTOS_PREC_FLASH 0x60
101#define IPTOS_PREC_IMMEDIATE 0x40
102#define IPTOS_PREC_PRIORITY 0x20
103#define IPTOS_PREC_ROUTINE 0x00
104
105/*
106 * ECN (Explicit Congestion Notification) codepoints in RFC3168
107 * mapped to the lower 2 bits of the TOS field.
108 */
109#define IPTOS_ECN_NOTECT 0x00 /* not-ECT */
110#define IPTOS_ECN_ECT1 0x01 /* ECN-capable transport (1) */
111#define IPTOS_ECN_ECT0 0x02 /* ECN-capable transport (0) */
112#define IPTOS_ECN_CE 0x03 /* congestion experienced */
113#define IPTOS_ECN_MASK 0x03 /* ECN field mask */
114
115/*
105 * Definitions for options.
106 */
107#define IPOPT_COPIED(o) ((o)&0x80)
108#define IPOPT_CLASS(o) ((o)&0x60)
109#define IPOPT_NUMBER(o) ((o)&0x1f)
110
111#define IPOPT_CONTROL 0x00
112#define IPOPT_RESERVED1 0x20

--- 73 unchanged lines hidden ---
116 * Definitions for options.
117 */
118#define IPOPT_COPIED(o) ((o)&0x80)
119#define IPOPT_CLASS(o) ((o)&0x60)
120#define IPOPT_NUMBER(o) ((o)&0x1f)
121
122#define IPOPT_CONTROL 0x00
123#define IPOPT_RESERVED1 0x20

--- 73 unchanged lines hidden ---