xnu-1456.1.26.tar.gz

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

diff --git a/bsd/net/ppp_deflate.c b/bsd/net/ppp_deflate.c
index d05231e037d5e57a3735bb4271ec7ecd065fd834..5968578b0f53df1c38bb6a473773081932236155 100644 (file)
--- a/bsd/net/ppp_deflate.c
+++ b/bsd/net/ppp_deflate.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
@@ -50,17 +53,27 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  */
+/*
+ * 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.
+ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <net/ppp_defs.h>
-#include <net/zlib.h>
+#include <libkern/zlib.h>
 
 #define PACKETPTR      struct mbuf *
 #include <net/ppp_comp.h>
 
+#if CONFIG_MACF_NET
+#include <security/mac_framework.h>
+#endif
+
 #if DO_DEFLATE
 
 #define DEFLATE_DEBUG  1
@@ -81,24 +94,23 @@ struct deflate_state {
 
 #define DEFLATE_OVHD   2               /* Deflate overhead/packet */
 
-static void    *z_alloc __P((void *, u_int items, u_int size));
-static void    z_free __P((void *, void *ptr));
-static void    *z_comp_alloc __P((u_char *options, int opt_len));
-static void    *z_decomp_alloc __P((u_char *options, int opt_len));
-static void    z_comp_free __P((void *state));
-static void    z_decomp_free __P((void *state));
-static int     z_comp_init __P((void *state, u_char *options, int opt_len,
-                                int unit, int hdrlen, int debug));
-static int     z_decomp_init __P((void *state, u_char *options, int opt_len,
-                                    int unit, int hdrlen, int mru, int debug));
-static int     z_compress __P((void *state, struct mbuf **mret,
-                                 struct mbuf *mp, int slen, int maxolen));
-static void    z_incomp __P((void *state, struct mbuf *dmsg));
-static int     z_decompress __P((void *state, struct mbuf *cmp,
-                                   struct mbuf **dmpp));
-static void    z_comp_reset __P((void *state));
-static void    z_decomp_reset __P((void *state));
-static void    z_comp_stats __P((void *state, struct compstat *stats));
+static void    *z_alloc(void *, u_int items, u_int size);
+static void    z_free(void *, void *ptr);
+static void    *z_comp_alloc(u_char *options, int opt_len);
+static void    *z_decomp_alloc(u_char *options, int opt_len);
+static void    z_comp_free(void *state);
+static void    z_decomp_free(void *state);
+static int     z_comp_init(void *state, u_char *options, int opt_len,
+                                int unit, int hdrlen, int debug);
+static int     z_decomp_init(void *state, u_char *options, int opt_len,
+                                    int unit, int hdrlen, int mru, int debug);
+static int     z_compress(void *state, struct mbuf **mret,
+                                 struct mbuf *mp, int slen, int maxolen);
+static void    z_incomp(void *state, struct mbuf *dmsg);
+static int     z_decompress(void *state, struct mbuf *cmp, struct mbuf **dmpp);
+static void    z_comp_reset(void *state);
+static void    z_decomp_reset(void *state);
+static void    z_comp_stats(void *state, struct compstat *stats);
 
 /*
  * Procedures exported to if_ppp.c.
@@ -541,6 +553,9 @@ z_decompress(arg, mi, mop)
        mo->m_data += state->hdrlen;
        ospace -= state->hdrlen;
     }
+#if CONFIG_MACF_NET
+   mac_mbuf_label_copy(mi, mo);
+#endif
 
     /*
      * Fill in the first part of the PPP header.  The protocol field