syslog stuff back to main.c; take out npmode setting in sifup

[ppp.git] / modules / bsd-comp.c

diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c
index d30e0d25f69da08dc4781cdfc6e1b58e85f0e9c0..d9e9fe9f1a7764c85cb8a5ce5c38116fd1f95201 100644 (file)
--- a/modules/bsd-comp.c
+++ b/modules/bsd-comp.c
@@ -39,42 +39,38 @@
 
 /*
  * This version is for use with STREAMS under SunOS 4.x,
- * DEC Alpha OSF/1, and AIX 4.x.
+ * DEC Alpha OSF/1, AIX 4.x, and SVR4 systems including Solaris 2.
  *
- * $Id: bsd-comp.c,v 1.8 1994/12/08 00:35:33 paulus Exp $
+ * $Id: bsd-comp.c,v 1.18 1996/01/18 03:12:53 paulus Exp $
  */
 
-#ifdef __aix4__
+#ifdef AIX4
 #include <net/net_globals.h>
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stream.h>
-#include <sys/socket.h>
-#include <net/if.h>
 #include <net/ppp_defs.h>
-#include <net/ppp_str.h>
+#include "ppp_mod.h"
 
-#ifdef sun
-#include <sys/kmem_alloc.h>
-#define ALLOCATE(n)    kmem_alloc((n), KMEM_NOSLEEP)
-#define FREE(p, n)     kmem_free((p), (n))
+#ifdef SVR4
+#include <sys/byteorder.h>
+#ifndef _BIG_ENDIAN
+#define BSD_LITTLE_ENDIAN
 #endif
-
-#ifdef __osf__
-#include <kern/kalloc.h>
-#define ALLOCATE(n)    kalloc((n))
-#define FREE(p, n)     kfree((p), (n))
 #endif
 
-#ifdef __aix4__
-#define ALLOCATE(n)    xmalloc((n), 0, pinned_heap)
-#define FREE(p, n)     xmfree((p), pinned_heap)
+#ifdef OSF1
+#undef FIRST
+#undef LAST
+#define BSD_LITTLE_ENDIAN
 #endif
 
 #define PACKETPTR      mblk_t *
 #include <net/ppp-comp.h>
 
+#if DO_BSD_COMPRESS
+
 /*
  * PPP "BSD compress" compression
  *  The differences between this compression and the classic BSD LZW
@@ -97,15 +93,6 @@
  *         compression is not going well.
  */
 
-/*
- * Macros to extract protocol version and number of bits
- * from the third byte of the BSD Compress CCP configuration option.
- */
-#define BSD_VERSION(x) ((x) >> 5)
-#define BSD_NBITS(x)   ((x) & 0x1F)
-
-#define BSD_CURRENT_VERSION    1
-
 /*
  * A dictionary for doing BSD compress.
  */
@@ -155,15 +142,13 @@ struct bsd_db {
 };
 
 #define BSD_OVHD       2               /* BSD compress overhead/packet */
-#define MIN_BSD_BITS   9
-#define BSD_INIT_BITS  MIN_BSD_BITS
-#define MAX_BSD_BITS   15
+#define BSD_INIT_BITS  BSD_MIN_BITS
 
 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 debug));
+                                  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, mblk_t **mret,
@@ -177,7 +162,7 @@ static void bsd_comp_stats __P((void *state, struct compstat *stats));
  * Procedures exported to ppp_comp.c.
  */
 struct compressor ppp_bsd_compress = {
-    0x21,                      /* compress_proto */
+    CI_BSD_COMPRESS,           /* compress_proto */
     bsd_comp_alloc,            /* comp_alloc */
     bsd_free,                  /* comp_free */
     bsd_comp_init,             /* comp_init */
@@ -202,7 +187,7 @@ struct compressor ppp_bsd_compress = {
 #define LAST   255
 
 #define MAXCODE(b)     ((1 << (b)) - 1)
-#define BADCODEM1      MAXCODE(MAX_BSD_BITS);
+#define BADCODEM1      MAXCODE(BSD_MAX_BITS)
 
 #define BSD_HASH(prefix,suffix,hshift) ((((u_int32_t)(suffix)) << (hshift)) \
                                         ^ (u_int32_t)(prefix))
@@ -338,7 +323,7 @@ bsd_alloc(options, opt_len, decomp)
     u_int newlen, hsize, hshift, maxmaxcode;
     struct bsd_db *db;
 
-    if (opt_len != 3 || options[0] != 0x21 || options[1] != 3
+    if (opt_len != 3 || options[0] != CI_BSD_COMPRESS || options[1] != 3
        || BSD_VERSION(options[2]) != BSD_CURRENT_VERSION)
        return NULL;
     bits = BSD_NBITS(options[2]);
@@ -372,7 +357,7 @@ bsd_alloc(options, opt_len, decomp)
 
     maxmaxcode = MAXCODE(bits);
     newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0]));
-    db = (struct bsd_db *) ALLOCATE(newlen);
+    db = (struct bsd_db *) ALLOC_NOSLEEP(newlen);
     if (!db)
        return NULL;
     bzero(db, sizeof(*db) - sizeof(db->dict));
@@ -380,7 +365,7 @@ bsd_alloc(options, opt_len, decomp)
     if (!decomp) {
        db->lens = NULL;
     } else {
-       db->lens = (u_short *) ALLOCATE((maxmaxcode+1) * sizeof(db->lens[0]));
+       db->lens = (u_short *) ALLOC_NOSLEEP((maxmaxcode+1) * sizeof(db->lens[0]));
        if (!db->lens) {
            FREE(db, newlen);
            return NULL;
@@ -434,7 +419,8 @@ bsd_init(db, options, opt_len, unit, hdrlen, mru, debug, decomp)
 {
     int i;
 
-    if (opt_len != 3 || options[0] != 0x21 || options[1] != 3
+    if (opt_len < CILEN_BSD_COMPRESS
+       || options[0] != CI_BSD_COMPRESS || options[1] != CILEN_BSD_COMPRESS
        || BSD_VERSION(options[2]) != BSD_CURRENT_VERSION
        || BSD_NBITS(options[2]) != db->maxbits
        || decomp && db->lens == NULL)
@@ -463,13 +449,13 @@ bsd_init(db, options, opt_len, unit, hdrlen, mru, debug, decomp)
 }
 
 static int
-bsd_comp_init(state, options, opt_len, unit, debug)
+bsd_comp_init(state, options, opt_len, unit, hdrlen, debug)
     void *state;
     u_char *options;
-    int opt_len, unit, debug;
+    int opt_len, unit, hdrlen, debug;
 {
     return bsd_init((struct bsd_db *) state, options, opt_len,
-                   unit, 0, 0, debug, 0);
+                   unit, hdrlen, 0, debug, 0);
 }
 
 static int
@@ -487,6 +473,8 @@ bsd_decomp_init(state, options, opt_len, unit, hdrlen, mru, debug)
  * compress a packet
  *     One change from the BSD compress command is that when the
  *     code size expands, we do not output a bunch of padding.
+ *
+ * N.B. at present, we ignore the hdrlen specified in the comp_init call.
  */
 static int                     /* new slen */
 bsd_compress(state, mretp, mp, slen, maxolen)
@@ -1118,3 +1106,4 @@ bsd_decompress(state, cmsg, dmpp)
     *dmpp = mret;
     return DECOMP_OK;
 }
+#endif /* DO_BSD_COMPRESS */