xnu-1699.26.8.tar.gz

[apple/xnu.git] / bsd / net / bsd_comp.c

diff --git a/bsd/net/bsd_comp.c b/bsd/net/bsd_comp.c
index d81e66f93b0267dc31e0e6b6b94afa485afe8fb1..3dd6734c0e2aad39926b1d8f908eb9065e3fe14b 100644 (file)
--- a/bsd/net/bsd_comp.c
+++ b/bsd/net/bsd_comp.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2007 Apple 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,
  * 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@

  */
 /* Because this code is derived from the 4.3BSD compress source:
  *
  */
 /* Because this code is derived from the 4.3BSD compress source:
  *


@@ -57,6 +63,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */

+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */

 
 /*
  * This version is for use with mbufs on BSD-derived systems.
 
 /*
  * This version is for use with mbufs on BSD-derived systems.


@@ -72,6 +84,10 @@
 #define PACKETPTR      struct mbuf *
 #include <net/ppp_comp.h>
 
 #define PACKETPTR      struct mbuf *
 #include <net/ppp_comp.h>
 

+#if CONFIG_MACF_NET
+#include <security/mac_framework.h>
+#endif /* MAC_NET */
+

 #if DO_BSD_COMPRESS
 /*
  * PPP "BSD compress" compression
 #if DO_BSD_COMPRESS
 /*
  * PPP "BSD compress" compression


@@ -146,26 +162,27 @@ struct bsd_db {
 #define BSD_OVHD       2               /* BSD compress overhead/packet */
 #define BSD_INIT_BITS  BSD_MIN_BITS
 
 #define BSD_OVHD       2               /* BSD compress overhead/packet */
 #define BSD_INIT_BITS  BSD_MIN_BITS
 

-static void    bsd_clear __P((struct bsd_db *db));
-static int     bsd_check __P((struct bsd_db *db));
-static void    *bsd_alloc __P((u_char *options, int opt_len, int decomp));
-static int     bsd_init_comp_db __P((struct bsd_db *db, u_char *options, int opt_len,
+static void    bsd_clear(struct bsd_db *db);
+static int     bsd_check(struct bsd_db *db);
+static void    *bsd_alloc(u_char *options, int opt_len, int decomp);
+static int     bsd_init_comp_db(struct bsd_db *db, u_char *options,
+                             int opt_len,

                              int unit, int hdrlen, int mru, int debug,
                              int unit, int hdrlen, int mru, int debug,

-                             int decomp));
-static void    *bsd_comp_alloc __P((u_char *options, int opt_len));
-static void    *bsd_decomp_alloc __P((u_char *options, int opt_len));
-static void    bsd_free __P((void *state));
-static int     bsd_comp_init __P((void *state, u_char *options, int opt_len,
-                                  int unit, int hdrlen, int debug));
-static int     bsd_decomp_init __P((void *state, u_char *options, int opt_len,
-                                    int unit, int hdrlen, int mru, int debug));
-static int     bsd_compress __P((void *state, struct mbuf **mret,
-                                 struct mbuf *mp, int slen, int maxolen));
-static void    bsd_incomp __P((void *state, struct mbuf *dmsg));
-static int     bsd_decompress __P((void *state, struct mbuf *cmp,
-                                   struct mbuf **dmpp));
-static void    bsd_reset __P((void *state));
-static void    bsd_comp_stats __P((void *state, struct compstat *stats));
+                             int decomp);
+static void    *bsd_comp_alloc(u_char *options, int opt_len);
+static void    *bsd_decomp_alloc(u_char *options, int opt_len);
+static void    bsd_free(void *state);
+static int     bsd_comp_init(void *state, u_char *options, int opt_len,
+                                  int unit, int hdrlen, int debug);
+static int     bsd_decomp_init(void *state, u_char *options, int opt_len,
+                                    int unit, int hdrlen, int mru, int debug);
+static int     bsd_compress(void *state, struct mbuf **mret,
+                                 struct mbuf *mp, int slen, int maxolen);
+static void    bsd_incomp(void *state, struct mbuf *dmsg);
+static int     bsd_decompress(void *state, struct mbuf *cmp,
+                                   struct mbuf **dmpp);
+static void    bsd_reset(void *state);
+static void    bsd_comp_stats(void *state, struct compstat *stats);

 
 /*
  * Procedures exported to if_ppp.c.
 
 /*
  * Procedures exported to if_ppp.c.


@@ -448,10 +465,10 @@ bsd_init_comp_db(db, options, opt_len, unit, hdrlen, mru, debug, decomp)
     db->unit = unit;
     db->hdrlen = hdrlen;
     db->mru = mru;
     db->unit = unit;
     db->hdrlen = hdrlen;
     db->mru = mru;

-#ifndef DEBUG
+#if !DEBUG

     if (debug)
 #endif
     if (debug)
 #endif

-       db->debug = 1;
+        db->debug = 1;

 
     bsd_reset(db);
 
 
     bsd_reset(db);
 


@@ -898,6 +915,9 @@ bsd_decompress(state, cmp, dmpp)
     dmp->m_data += db->hdrlen;
     wptr = mtod(dmp, u_char *);
     space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1;
     dmp->m_data += db->hdrlen;
     wptr = mtod(dmp, u_char *);
     space = M_TRAILINGSPACE(dmp) - PPP_HDRLEN + 1;

+#if CONFIG_MACF_NET
+    mac_mbuf_label_copy(cmp, dmp);
+#endif

 
     /*
      * Fill in the ppp header, but not the last byte of the protocol
 
     /*
      * Fill in the ppp header, but not the last byte of the protocol


@@ -984,7 +1004,7 @@ bsd_decompress(state, cmp, dmpp)
            m_freem(mret);
            if (db->debug) {
                printf("bsd_decomp%d: ran out of mru\n", db->unit);
            m_freem(mret);
            if (db->debug) {
                printf("bsd_decomp%d: ran out of mru\n", db->unit);

-#ifdef DEBUG
+#if DEBUG

                while ((cmp = cmp->m_next) != NULL)
                    len += cmp->m_len;
                printf("  len=%d, finchar=0x%x, codelen=%d, explen=%d\n",
                while ((cmp = cmp->m_next) != NULL)
                    len += cmp->m_len;
                printf("  len=%d, finchar=0x%x, codelen=%d, explen=%d\n",


@@ -1025,7 +1045,7 @@ bsd_decompress(state, cmp, dmpp)
        p = (wptr += codelen);
        while (finchar > LAST) {
            dictp = &db->dict[db->dict[finchar].cptr];
        p = (wptr += codelen);
        while (finchar > LAST) {
            dictp = &db->dict[db->dict[finchar].cptr];

-#ifdef DEBUG
+#if DEBUG

            if (--codelen <= 0 || dictp->codem1 != finchar-1)
                goto bad;
 #endif
            if (--codelen <= 0 || dictp->codem1 != finchar-1)
                goto bad;
 #endif


@@ -1034,7 +1054,7 @@ bsd_decompress(state, cmp, dmpp)
        }
        *--p = finchar;
 
        }
        *--p = finchar;
 

-#ifdef DEBUG
+#if DEBUG

        if (--codelen != 0)
            printf("bsd_decomp%d: short by %d after code 0x%x, max_ent=0x%x\n",
                   db->unit, codelen, incode, max_ent);
        if (--codelen != 0)
            printf("bsd_decomp%d: short by %d after code 0x%x, max_ent=0x%x\n",
                   db->unit, codelen, incode, max_ent);


@@ -1114,7 +1134,7 @@ bsd_decompress(state, cmp, dmpp)
     *dmpp = mret;
     return DECOMP_OK;
 
     *dmpp = mret;
     return DECOMP_OK;
 

-#ifdef DEBUG
+#if DEBUG

  bad:
     if (codelen <= 0) {
        printf("bsd_decomp%d: fell off end of chain ", db->unit);
  bad:
     if (codelen <= 0) {
        printf("bsd_decomp%d: fell off end of chain ", db->unit);