xnu-792.6.61.tar.gz

[apple/xnu.git] / bsd / netinet / ip_ecn.c

diff --git a/bsd/netinet/ip_ecn.c b/bsd/netinet/ip_ecn.c
index 33211a3d543eb6b0e312b88c390e6b814c678c46..2dfc497e870db294050e780bd1efc85f0d1b5e85 100644 (file)
--- a/bsd/netinet/ip_ecn.c
+++ b/bsd/netinet/ip_ecn.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (C) 1999 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,7 +34,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -47,51 +47,43 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ip_ecn.c,v 1.3 2000/11/22 01:12:12 zarzycki Exp $
  */
 /*
  * ECN consideration on tunnel ingress/egress operation.
  * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
  */
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-#include "opt_inet.h"
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 
-#if INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#endif
-
 #if INET6
-#ifndef INET
-#include <netinet/in.h>
-#endif
 #include <netinet/ip6.h>
 #endif
 
 #include <netinet/ip_ecn.h>
+#if INET6
+#include <netinet6/ip6_ecn.h>
+#endif
 
 /*
  * modify outer ECN (TOS) field on ingress operation (tunnel encapsulation).
- * call it after you've done the default initialization/copy for the outer.
  */
 void
 ip_ecn_ingress(mode, outer, inner)
        int mode;
        u_int8_t *outer;
-       u_int8_t *inner;
+       const u_int8_t *inner;
 {
        if (!outer || !inner)
                panic("NULL pointer passed to ip_ecn_ingress");
 
+       *outer = *inner;
        switch (mode) {
        case ECN_ALLOWED:               /* ECN allowed */
                *outer &= ~IPTOS_CE;
@@ -106,12 +98,11 @@ ip_ecn_ingress(mode, outer, inner)
 
 /*
  * modify inner ECN (TOS) field on egress operation (tunnel decapsulation).
- * call it after you've done the default initialization/copy for the inner.
  */
 void
 ip_ecn_egress(mode, outer, inner)
        int mode;
-       u_int8_t *outer;
+       const u_int8_t *outer;
        u_int8_t *inner;
 {
        if (!outer || !inner)
@@ -133,14 +124,13 @@ void
 ip6_ecn_ingress(mode, outer, inner)
        int mode;
        u_int32_t *outer;
-       u_int32_t *inner;
+       const u_int32_t *inner;
 {
        u_int8_t outer8, inner8;
 
        if (!outer || !inner)
                panic("NULL pointer passed to ip6_ecn_ingress");
 
-       outer8 = (ntohl(*outer) >> 20) & 0xff;
        inner8 = (ntohl(*inner) >> 20) & 0xff;
        ip_ecn_ingress(mode, &outer8, &inner8);
        *outer &= ~htonl(0xff << 20);
@@ -150,7 +140,7 @@ ip6_ecn_ingress(mode, outer, inner)
 void
 ip6_ecn_egress(mode, outer, inner)
        int mode;
-       u_int32_t *outer;
+       const u_int32_t *outer;
        u_int32_t *inner;
 {
        u_int8_t outer8, inner8;
@@ -159,7 +149,6 @@ ip6_ecn_egress(mode, outer, inner)
                panic("NULL pointer passed to ip6_ecn_egress");
 
        outer8 = (ntohl(*outer) >> 20) & 0xff;
-       inner8 = (ntohl(*inner) >> 20) & 0xff;
        ip_ecn_egress(mode, &outer8, &inner8);
        *inner &= ~htonl(0xff << 20);
        *inner |= htonl((u_int32_t)inner8 << 20);