X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=modules%2Fppp_comp.c;h=03140f8b3aa2a09cf95eab5903a8624881e8a224;hb=2e5bd580090480746b8193eb83f2cec41552d28f;hp=0e28c3354bb4ea1645a181c9c29f6c5883ec0a5d;hpb=5c678fe1d4c90d83236a0a7e860381002bddaf02;p=ppp.git

diff --git a/modules/ppp_comp.c b/modules/ppp_comp.c
index 0e28c33..03140f8 100644
--- a/modules/ppp_comp.c
+++ b/modules/ppp_comp.c
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ppp_comp.c,v 1.4 1996/06/26 00:54:20 paulus Exp $
+ * $Id: ppp_comp.c,v 1.7 1997/03/04 03:31:51 paulus Exp $
  */
 
 /*
@@ -79,7 +79,11 @@ static int msg_byte __P((mblk_t *, unsigned int));
 
 #define PPP_COMP_ID 0xbadf
 static struct module_info minfo = {
+#ifdef PRIOQ
+    PPP_COMP_ID, "ppp_comp", 0, INFPSZ, 16512, 16384,
+#else
     PPP_COMP_ID, "ppp_comp", 0, INFPSZ, 16384, 4096,
+#endif
 };
 
 static struct qinit r_init = {
@@ -91,6 +95,10 @@ static struct qinit w_init = {
     ppp_comp_wput, ppp_comp_wsrv, NULL, NULL, NULL, &minfo, NULL
 };
 
+#if defined(SVR4) && !defined(SOL2)
+int pcmpdevflag = 0;
+#define ppp_compinfo pcmpinfo
+#endif
 struct streamtab ppp_compinfo = {
     &r_init, &w_init, NULL, NULL
 };
@@ -136,6 +144,7 @@ extern task_t first_task;
 /* Bits in flags are as defined in pppio.h. */
 #define CCP_ERR		(CCP_ERROR | CCP_FATALERROR)
 #define LAST_MOD	0x1000000	/* no ppp modules below us */
+#define DBGLOG		0x2000000	/* log debugging stuff */
 
 #define MAX_IPHDR	128	/* max TCP/IP header size */
 #define MAX_VJHDR	20	/* max VJ compressed header size (?) */
@@ -147,8 +156,12 @@ extern task_t first_task;
  * List of compressors we know about.
  */
 
+#if DO_BSD_COMPRESS
 extern struct compressor ppp_bsd_compress;
+#endif
+#if DO_DEFLATE
 extern struct compressor ppp_deflate;
+#endif
 
 struct compressor *ppp_compressors[] = {
 #if DO_BSD_COMPRESS
@@ -300,7 +313,7 @@ ppp_comp_wput(q, mp)
 {
     struct iocblk *iop;
     comp_state_t *cp;
-    int error, len;
+    int error, len, n;
     int flags, mask;
     mblk_t *np;
     struct compressor **comp;
@@ -531,6 +544,20 @@ ppp_comp_wput(q, mp)
 	    error = 0;
 	    break;
 
+	case PPPIO_DEBUG:
+	    if (iop->ioc_count != sizeof(int))
+		break;
+	    n = *(int *)mp->b_cont->b_rptr;
+	    if (n == PPPDBG_LOG + PPPDBG_COMP) {
+		DPRINT1("ppp_comp%d: debug log enabled\n", cp->unit);
+		cp->flags |= DBGLOG;
+		error = 0;
+		iop->ioc_count = 0;
+	    } else {
+		error = -1;
+	    }
+	    break;
+
 	case PPPIO_LASTMOD:
 	    cp->flags |= LAST_MOD;
 	    error = 0;
@@ -587,7 +614,11 @@ ppp_comp_wsrv(q)
     cp = (comp_state_t *) q->q_ptr;
     while ((mp = getq(q)) != 0) {
 	/* assert(mp->b_datap->db_type == M_DATA) */
-	if (!canputnext(q)) {
+#ifdef PRIOQ
+        if (!bcanputnext(q,mp->b_band)) {
+#else
+        if (!canputnext(q)) {
+#endif PRIOQ
 	    putbq(q, mp);
 	    return;
 	}
@@ -609,9 +640,9 @@ ppp_comp_wsrv(q)
 	 * Make sure we've got enough data in the first mblk
 	 * and that we are its only user.
 	 */
-	if (proto = PPP_CCP)
+	if (proto == PPP_CCP)
 	    hlen = len;
-	else if (proto = PPP_IP)
+	else if (proto == PPP_IP)
 	    hlen = PPP_HDRLEN + MAX_IPHDR;
 	else
 	    hlen = PPP_HDRLEN;
@@ -626,7 +657,6 @@ ppp_comp_wsrv(q)
 		continue;
 	    }
 	}
-	proto = PPP_PROTOCOL(mp->b_rptr);
 
 	/*
 	 * Do VJ compression if requested.
@@ -663,6 +693,9 @@ ppp_comp_wsrv(q)
 	    (*cp->xcomp->compress)(cp->xstate, &cmp, mp, len,
 				   (cp->flags & CCP_ISUP? cp->mtu: 0));
 	    if (cmp != NULL) {
+#ifdef PRIOQ
+		cmp->b_band=mp->b_band;
+#endif PRIOQ
 		freemsg(mp);
 		mp = cmp;
 	    }
@@ -901,7 +934,8 @@ ppp_comp_rsrv(q)
 		 * First reset compressor if an input error has occurred.
 		 */
 		if (cp->stats.ppp_ierrors != cp->vj_last_ierrors) {
-		    DPRINT1("ppp%d: resetting VJ\n", cp->unit);
+		    if (cp->flags & DBGLOG)
+			DPRINT1("ppp%d: resetting VJ\n", cp->unit);
 		    vj_uncompress_err(&cp->vj_comp);
 		    cp->vj_last_ierrors = cp->stats.ppp_ierrors;
 		}
@@ -909,17 +943,9 @@ ppp_comp_rsrv(q)
 		vjlen = vj_uncompress_tcp(dp, np->b_wptr - dp, len,
 					  &cp->vj_comp, &iphdr, &iphlen);
 		if (vjlen < 0) {
-#if DEBUG > 1
-		    int i;
-		    DPRINT2("ppp%d: vj_uncomp_tcp failed, pkt len %d [",
-			    cp->unit, len);
-		    for (i = 0; i < len && i < 8; ++i)
-			DPRINT1(" %x", dp[i]);
-		    DPRINT3("] c=%d u=%d e=%d\n",
-			    cp->vj_comp.stats.vjs_compressedin,
-			    cp->vj_comp.stats.vjs_uncompressedin,
-			    cp->vj_comp.stats.vjs_errorin);
-#endif
+		    if (cp->flags & DBGLOG)
+			DPRINT2("ppp%d: vj_uncomp_tcp failed, pkt len %d\n",
+				cp->unit, len);
 		    ++cp->vj_last_ierrors;  /* so we don't reset next time */
 		    goto bad;
 		}
@@ -965,10 +991,9 @@ ppp_comp_rsrv(q)
 		 */
 		cp->vj_last_ierrors = cp->stats.ppp_ierrors;
 		if (!vj_uncompress_uncomp(dp, hlen, &cp->vj_comp)) {
-#if DEBUG > 1
-		    DPRINT2("ppp%d: vj_uncomp_uncomp failed, pkt len %d\n",
-			    cp->unit, len);
-#endif
+		    if (cp->flags & DBGLOG)
+			DPRINT2("ppp%d: vj_uncomp_uncomp failed, pkt len %d\n",
+				cp->unit, len);
 		    ++cp->vj_last_ierrors;  /* don't need to reset next time */
 		    goto bad;
 		}
@@ -1027,13 +1052,13 @@ ppp_comp_ccp(q, mp, rcvd)
 		if (cp->xstate != NULL
 		    && (*cp->xcomp->comp_init)
 		        (cp->xstate, dp + CCP_HDRLEN, clen - CCP_HDRLEN,
-			 cp->unit, 0, 0))
+			 cp->unit, 0, ((cp->flags & DBGLOG) != 0)))
 		    cp->flags |= CCP_COMP_RUN;
 	    } else {
 		if (cp->rstate != NULL
 		    && (*cp->rcomp->decomp_init)
 		        (cp->rstate, dp + CCP_HDRLEN, clen - CCP_HDRLEN,
-			 cp->unit, 0, cp->mru, 0))
+			 cp->unit, 0, cp->mru, ((cp->flags & DBGLOG) != 0)))
 		    cp->flags = (cp->flags & ~CCP_ERR) | CCP_DECOMP_RUN;
 	    }
 	}
@@ -1055,7 +1080,7 @@ ppp_comp_ccp(q, mp, rcvd)
     }
 }
 
-#if DEBUG
+#if 0
 dump_msg(mp)
     mblk_t *mp;
 {