xnu-1228.15.4.tar.gz

[apple/xnu.git] / bsd / netinet / ip.h

diff --git a/bsd/netinet/ip.h b/bsd/netinet/ip.h
index bf81e1aa52688ee039a4fed012810263ee2a0e04..c21698f61e541225cdb54ebb732519700f9d9f9b 100644 (file)
--- a/bsd/netinet/ip.h
+++ b/bsd/netinet/ip.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -52,10 +58,16 @@
  * SUCH DAMAGE.
  *
  *     @(#)ip.h        8.2 (Berkeley) 6/1/94
+ * $FreeBSD: src/sys/netinet/ip.h,v 1.17 1999/12/22 19:13:20 shin Exp $
  */
 
 #ifndef _NETINET_IP_H_
 #define _NETINET_IP_H_
+#include <sys/appleapiopts.h>
+#include <sys/types.h>         /* XXX temporary hack to get u_ types */
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+
 
 /*
  * Definitions for internet protocol version 4.
@@ -109,12 +121,22 @@ struct ip {
 #define        IPTOS_THROUGHPUT        0x08
 #define        IPTOS_RELIABILITY       0x04
 #define        IPTOS_MINCOST           0x02
-#if 1 /* ALTQ_ECN */
-/* ECN bits proposed by Sally Floyd */
-#define IPTOS_CE               0x01    /* congestion experienced */
-#define IPTOS_ECT              0x02    /* ECN-capable transport */
+#if 1
+/* ECN RFC3168 obsoletes RFC2481, and these will be deprecated soon. */
+#define        IPTOS_CE                0x01
+#define        IPTOS_ECT               0x02
 #endif
 
+/*
+ * ECN (Explicit Congestion Notification) codepoints in RFC3168
+ * mapped to the lower 2 bits of the TOS field.
+ */
+#define        IPTOS_ECN_NOTECT        0x00    /* not-ECT */
+#define        IPTOS_ECN_ECT1          0x01    /* ECN-capable transport (1) */
+#define        IPTOS_ECN_ECT0          0x02    /* ECN-capable transport (0) */
+#define        IPTOS_ECN_CE            0x03    /* congestion experienced */
+#define        IPTOS_ECN_MASK          0x03    /* ECN field mask */
+
 /*
  * Definitions for IP precedence (also in ip_tos) (hopefully unused)
  */