xnu-4903.270.47.tar.gz

[apple/xnu.git] / bsd / net / ppp_comp.h

diff --git a/bsd/net/ppp_comp.h b/bsd/net/ppp_comp.h
index 4423a6b8b0419b12d3c43c56c4443d7482191056..f9f7ca6d9d8f57668a097bfd1fc5a807325295ed 100644 (file)
--- a/bsd/net/ppp_comp.h
+++ b/bsd/net/ppp_comp.h
@@ -1,17 +1,20 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, 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
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * 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,


@@ -19,8 +22,8 @@
  * 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.
  * 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@

  */
 /*
  * ppp_comp.h - Definitions for doing PPP packet compression.
  */
 /*
  * ppp_comp.h - Definitions for doing PPP packet compression.


@@ -52,59 +55,57 @@
 
 #ifndef _NET_PPP_COMP_H
 #define _NET_PPP_COMP_H
 
 #ifndef _NET_PPP_COMP_H
 #define _NET_PPP_COMP_H

-#include <sys/appleapiopts.h>
-#ifdef __APPLE_API_UNSTABLE
+#ifdef KERNEL_PRIVATE

 /*
  * The following symbols control whether we include code for
  * various compression methods.
  */
 #ifndef DO_BSD_COMPRESS
 /*
  * The following symbols control whether we include code for
  * various compression methods.
  */
 #ifndef DO_BSD_COMPRESS

-#define DO_BSD_COMPRESS        1       /* by default, include BSD-Compress */
+#define DO_BSD_COMPRESS 1       /* by default, include BSD-Compress */

 #endif
 #ifndef DO_DEFLATE
 #endif
 #ifndef DO_DEFLATE

-#define DO_DEFLATE     1       /* by default, include Deflate */
+#define DO_DEFLATE      1       /* by default, include Deflate */

 #endif
 #endif

-#define DO_PREDICTOR_1 0
-#define DO_PREDICTOR_2 0
+#define DO_PREDICTOR_1  0
+#define DO_PREDICTOR_2  0

 
 /*
  * Structure giving methods for compression/decompression.
  */
 #if PACKETPTR
 struct compressor {
 
 /*
  * Structure giving methods for compression/decompression.
  */
 #if PACKETPTR
 struct compressor {

-       int     compress_proto; /* CCP compression protocol number */
+       int     compress_proto; /* CCP compression protocol number */

 
        /* Allocate space for a compressor (transmit side) */
 
        /* Allocate space for a compressor (transmit side) */

-       void    *(*comp_alloc) __P((u_char *options, int opt_len));
+       void    *(*comp_alloc)(u_char *options, int opt_len);

        /* Free space used by a compressor */
        /* Free space used by a compressor */

-       void    (*comp_free) __P((void *state));
+       void    (*comp_free)(void *state);

        /* Initialize a compressor */
        /* Initialize a compressor */

-       int     (*comp_init) __P((void *state, u_char *options, int opt_len,
-                                 int unit, int hdrlen, int debug));
+       int     (*comp_init)(void *state, u_char *options, int opt_len,
+           int unit, int hdrlen, int debug);

        /* Reset a compressor */
        /* Reset a compressor */

-       void    (*comp_reset) __P((void *state));
+       void    (*comp_reset)(void *state);

        /* Compress a packet */
        /* Compress a packet */

-       int     (*compress) __P((void *state, PACKETPTR *mret,
-                                PACKETPTR mp, int orig_len, int max_len));
+       int     (*compress)(void *state, PACKETPTR *mret,
+           PACKETPTR mp, int orig_len, int max_len);

        /* Return compression statistics */
        /* Return compression statistics */

-       void    (*comp_stat) __P((void *state, struct compstat *stats));
+       void    (*comp_stat)(void *state, struct compstat *stats);

 
        /* Allocate space for a decompressor (receive side) */
 
        /* Allocate space for a decompressor (receive side) */

-       void    *(*decomp_alloc) __P((u_char *options, int opt_len));
+       void    *(*decomp_alloc)(u_char *options, int opt_len);

        /* Free space used by a decompressor */
        /* Free space used by a decompressor */

-       void    (*decomp_free) __P((void *state));
+       void    (*decomp_free)(void *state);

        /* Initialize a decompressor */
        /* Initialize a decompressor */

-       int     (*decomp_init) __P((void *state, u_char *options, int opt_len,
-                                   int unit, int hdrlen, int mru, int debug));
+       int     (*decomp_init)(void *state, u_char *options, int opt_len,
+           int unit, int hdrlen, int mru, int debug);

        /* Reset a decompressor */
        /* Reset a decompressor */

-       void    (*decomp_reset) __P((void *state));
+       void    (*decomp_reset)(void *state);

        /* Decompress a packet. */
        /* Decompress a packet. */

-       int     (*decompress) __P((void *state, PACKETPTR mp,
-                                  PACKETPTR *dmpp));
+       int     (*decompress)(void *state, PACKETPTR mp, PACKETPTR *dmpp);

        /* Update state for an incompressible packet received */
        /* Update state for an incompressible packet received */

-       void    (*incomp) __P((void *state, PACKETPTR mp));
+       void    (*incomp)(void *state, PACKETPTR mp);

        /* Return decompression statistics */
        /* Return decompression statistics */

-       void    (*decomp_stat) __P((void *state, struct compstat *stats));
+       void    (*decomp_stat)(void *state, struct compstat *stats);

 };
 #endif /* PACKETPTR */
 
 };
 #endif /* PACKETPTR */
 


@@ -116,75 +117,75 @@ struct compressor {
  * a patent held by Motorola.
  * Don't you just lurve software patents.
  */
  * a patent held by Motorola.
  * Don't you just lurve software patents.
  */

-#define DECOMP_OK              0       /* everything went OK */
-#define DECOMP_ERROR           1       /* error detected before decomp. */
-#define DECOMP_FATALERROR      2       /* error detected after decomp. */
+#define DECOMP_OK               0       /* everything went OK */
+#define DECOMP_ERROR            1       /* error detected before decomp. */
+#define DECOMP_FATALERROR       2       /* error detected after decomp. */

 
 /*
  * CCP codes.
  */
 
 /*
  * CCP codes.
  */

-#define CCP_CONFREQ    1
-#define CCP_CONFACK    2
-#define CCP_TERMREQ    5
-#define CCP_TERMACK    6
-#define CCP_RESETREQ   14
-#define CCP_RESETACK   15
+#define CCP_CONFREQ     1
+#define CCP_CONFACK     2
+#define CCP_TERMREQ     5
+#define CCP_TERMACK     6
+#define CCP_RESETREQ    14
+#define CCP_RESETACK    15

 
 /*
  * Max # bytes for a CCP option
  */
 
 /*
  * Max # bytes for a CCP option
  */

-#define CCP_MAX_OPTION_LENGTH  32
+#define CCP_MAX_OPTION_LENGTH   32

 
 /*
  * Parts of a CCP packet.
  */
 
 /*
  * Parts of a CCP packet.
  */

-#define CCP_CODE(dp)           ((dp)[0])
-#define CCP_ID(dp)             ((dp)[1])
-#define CCP_LENGTH(dp)         (((dp)[2] << 8) + (dp)[3])
-#define CCP_HDRLEN             4
+#define CCP_CODE(dp)            ((dp)[0])
+#define CCP_ID(dp)              ((dp)[1])
+#define CCP_LENGTH(dp)          (((dp)[2] << 8) + (dp)[3])
+#define CCP_HDRLEN              4

 
 

-#define CCP_OPT_CODE(dp)       ((dp)[0])
-#define CCP_OPT_LENGTH(dp)     ((dp)[1])
-#define CCP_OPT_MINLEN         2
+#define CCP_OPT_CODE(dp)        ((dp)[0])
+#define CCP_OPT_LENGTH(dp)      ((dp)[1])
+#define CCP_OPT_MINLEN          2

 
 /*
  * Definitions for BSD-Compress.
  */
 
 /*
  * Definitions for BSD-Compress.
  */

-#define CI_BSD_COMPRESS                21      /* config. option for BSD-Compress */
-#define CILEN_BSD_COMPRESS     3       /* length of config. option */
+#define CI_BSD_COMPRESS         21      /* config. option for BSD-Compress */
+#define CILEN_BSD_COMPRESS      3       /* length of config. option */

 
 /* Macros for handling the 3rd byte of the BSD-Compress config option. */
 
 /* Macros for handling the 3rd byte of the BSD-Compress config option. */

-#define BSD_NBITS(x)           ((x) & 0x1F)    /* number of bits requested */
-#define BSD_VERSION(x)         ((x) >> 5)      /* version of option format */
-#define BSD_CURRENT_VERSION    1               /* current version number */
-#define BSD_MAKE_OPT(v, n)     (((v) << 5) | (n))
+#define BSD_NBITS(x)            ((x) & 0x1F)    /* number of bits requested */
+#define BSD_VERSION(x)          ((x) >> 5)      /* version of option format */
+#define BSD_CURRENT_VERSION     1               /* current version number */
+#define BSD_MAKE_OPT(v, n)      (((v) << 5) | (n))

 
 

-#define BSD_MIN_BITS           9       /* smallest code size supported */
-#define BSD_MAX_BITS           15      /* largest code size supported */
+#define BSD_MIN_BITS            9       /* smallest code size supported */
+#define BSD_MAX_BITS            15      /* largest code size supported */

 
 /*
  * Definitions for Deflate.
  */
 
 /*
  * Definitions for Deflate.
  */

-#define CI_DEFLATE             26      /* config option for Deflate */
-#define CI_DEFLATE_DRAFT       24      /* value used in original draft RFC */
-#define CILEN_DEFLATE          4       /* length of its config option */
-
-#define DEFLATE_MIN_SIZE       8
-#define DEFLATE_MAX_SIZE       15
-#define DEFLATE_METHOD_VAL     8
-#define DEFLATE_SIZE(x)                (((x) >> 4) + DEFLATE_MIN_SIZE)
-#define DEFLATE_METHOD(x)      ((x) & 0x0F)
-#define DEFLATE_MAKE_OPT(w)    ((((w) - DEFLATE_MIN_SIZE) << 4) \
-                                + DEFLATE_METHOD_VAL)
-#define DEFLATE_CHK_SEQUENCE   0
+#define CI_DEFLATE              26      /* config option for Deflate */
+#define CI_DEFLATE_DRAFT        24      /* value used in original draft RFC */
+#define CILEN_DEFLATE           4       /* length of its config option */
+
+#define DEFLATE_MIN_SIZE        8
+#define DEFLATE_MAX_SIZE        15
+#define DEFLATE_METHOD_VAL      8
+#define DEFLATE_SIZE(x)         (((x) >> 4) + DEFLATE_MIN_SIZE)
+#define DEFLATE_METHOD(x)       ((x) & 0x0F)
+#define DEFLATE_MAKE_OPT(w)     ((((w) - DEFLATE_MIN_SIZE) << 4) \
+                                + DEFLATE_METHOD_VAL)
+#define DEFLATE_CHK_SEQUENCE    0

 
 /*
  * Definitions for other, as yet unsupported, compression methods.
  */
 
 /*
  * Definitions for other, as yet unsupported, compression methods.
  */

-#define CI_PREDICTOR_1         1       /* config option for Predictor-1 */
-#define CILEN_PREDICTOR_1      2       /* length of its config option */
-#define CI_PREDICTOR_2         2       /* config option for Predictor-2 */
-#define CILEN_PREDICTOR_2      2       /* length of its config option */
+#define CI_PREDICTOR_1          1       /* config option for Predictor-1 */
+#define CILEN_PREDICTOR_1       2       /* length of its config option */
+#define CI_PREDICTOR_2          2       /* config option for Predictor-2 */
+#define CILEN_PREDICTOR_2       2       /* length of its config option */

 
 

-#endif /* __APPLE_API_UNSTABLE */
+#endif /* KERNEL_PRIVATE */

 #endif /* _NET_PPP_COMP_H */
 #endif /* _NET_PPP_COMP_H */