X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=modules%2Fppp_ahdlc.c;h=1828fe1e96fb40a1f20a48eb0267975aad083178;hb=2b4e267c6dab168d8c3bb61021e285c0a43042e4;hp=208f1d682756be77668d716e0a5f388b71ae9f12;hpb=4db96bebf27071a12b82ce855703c2d0303e54f8;p=ppp.git

diff --git a/modules/ppp_ahdlc.c b/modules/ppp_ahdlc.c
index 208f1d6..1828fe1 100644
--- a/modules/ppp_ahdlc.c
+++ b/modules/ppp_ahdlc.c
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ppp_ahdlc.c,v 1.4 1996/09/14 05:19:18 paulus Exp $
+ * $Id: ppp_ahdlc.c,v 1.11 1999/09/15 23:49:05 masputra Exp $
  */
 
 /*
@@ -42,6 +42,9 @@
 #include <sys/ddi.h>
 #else
 #include <sys/user.h>
+#ifdef __osf__
+#include <sys/cmn_err.h>
+#endif
 #endif /* SVR4 */
 
 #include <net/ppp_defs.h>
@@ -68,7 +71,11 @@ static int msg_byte __P((mblk_t *, unsigned int));
 
 #define PPP_AHDL_ID 0x7d23
 static struct module_info minfo = {
+#ifdef PRIOQ
+    PPP_AHDL_ID, "ppp_ahdl", 0, INFPSZ, 640, 512
+#else
     PPP_AHDL_ID, "ppp_ahdl", 0, INFPSZ, 4096, 128
+#endif PRIOQ
 };
 
 static struct qinit rinit = {
@@ -164,7 +171,7 @@ MOD_OPEN(ahdlc_open)
 	WR(q)->q_ptr = (caddr_t) sp;
 	sp->xaccm[0] = ~0;
 	sp->xaccm[3] = 0x60000000;
-	sp->mru = 1500;
+	sp->mru = PPP_MRU;
 	++ppp_ahdlc_count;
 	qprocson(q);
     }
@@ -183,6 +190,8 @@ MOD_CLOSE(ahdlc_close)
 	    state->cur_frame = 0;
 	}
 	FREE(q->q_ptr, sizeof(ahdlc_state_t));
+	q->q_ptr = NULL;
+	OTHERQ(q)->q_ptr = NULL;
 	--ppp_ahdlc_count;
     }
     return 0;
@@ -200,6 +209,12 @@ ahdlc_wput(q, mp)
     struct ppp_stats *psp;
 
     state = (ahdlc_state_t *) q->q_ptr;
+    if (state == 0) {
+	DPRINT("state == 0 in ahdlc_wput\n");
+	freemsg(mp);
+	return 0;
+    }
+
     switch (mp->b_datap->db_type) {
     case M_DATA:
 	/*
@@ -218,6 +233,10 @@ ahdlc_wput(q, mp)
 	    if (iop->ioc_count < sizeof(u_int32_t)
 		|| iop->ioc_count > sizeof(ext_accm))
 		break;
+	    if (mp->b_cont == 0) {
+		DPRINT1("ahdlc_wput/%d: PPPIO_XACCM b_cont = 0!\n", state->unit);
+		break;
+	    }
 	    bcopy((caddr_t)mp->b_cont->b_rptr, (caddr_t)state->xaccm,
 		  iop->ioc_count);
 	    state->xaccm[2] &= ~0x40000000;	/* don't escape 0x5e */
@@ -229,6 +248,10 @@ ahdlc_wput(q, mp)
 	case PPPIO_RACCM:
 	    if (iop->ioc_count != sizeof(u_int32_t))
 		break;
+	    if (mp->b_cont == 0) {
+		DPRINT1("ahdlc_wput/%d: PPPIO_RACCM b_cont = 0!\n", state->unit);
+		break;
+	    }
 	    bcopy((caddr_t)mp->b_cont->b_rptr, (caddr_t)&state->raccm,
 		  sizeof(u_int32_t));
 	    iop->ioc_count = 0;
@@ -311,6 +334,7 @@ ahdlc_wput(q, mp)
     default:
 	putnext(q, mp);
     }
+
     return 0;
 }
 
@@ -319,10 +343,15 @@ ahdlc_rput(q, mp)
     queue_t *q;
     mblk_t *mp;
 {
-    mblk_t *np;
-    uchar_t *cp;
     ahdlc_state_t *state;
 
+    state = (ahdlc_state_t *) q->q_ptr;
+    if (state == 0) {
+	DPRINT("state == 0 in ahdlc_rput\n");
+	freemsg(mp);
+	return 0;
+    }
+
     switch (mp->b_datap->db_type) {
     case M_DATA:
 	unstuff_chars(q, mp);
@@ -330,7 +359,6 @@ ahdlc_rput(q, mp)
 	break;
 
     case M_HANGUP:
-	state = (ahdlc_state_t *) q->q_ptr;
 	if (state->cur_frame != 0) {
 	    /* XXX would like to send this up for debugging */
 	    freemsg(state->cur_frame);
@@ -357,13 +385,11 @@ stuff_frame(q, mp)
     mblk_t *mp;
 {
     ahdlc_state_t *state;
-    int ilen, olen, c, extra, i, code;
+    int ilen, olen, c, extra, code;
     mblk_t *omsg, *op, *np;
     uchar_t *sp, *sp0, *dp, *dp0, *spend;
     ushort_t fcs;
     u_int32_t *xaccm, lcp_xaccm[8];
-    static uchar_t lcphdr[PPP_HDRLEN] = { 0xff, 0x03, 0xc0, 0x21 };
-    uchar_t ppphdr[PPP_HDRLEN];
 
     state = (ahdlc_state_t *) q->q_ptr;
     ilen = msgdsize(mp);
@@ -380,12 +406,14 @@ stuff_frame(q, mp)
 	goto bomb;
 
     /*
-     * Put in an initial flag for now.  We'll remove it later
-     * if we decide we don't need it.
+     * Put in an initial flag, unless the serial driver currently has
+     * packets still to be transmitted in its queue.
      */
     dp = op->b_wptr;
-    *dp++ = PPP_FLAG;
-    --olen;
+    if (qsize(q->q_next) == 0) {
+	*dp++ = PPP_FLAG;
+	--olen;
+    }
 
     /*
      * For LCP packets with code values between 1 and 7 (Conf-Req
@@ -497,12 +525,6 @@ stuff_frame(q, mp)
     *dp++ = PPP_FLAG;
     op->b_wptr = dp;
 
-    /*
-     * Remove the initial flag, if possible.
-     */
-    if (qsize(q->q_next) > 0)
-	++omsg->b_rptr;
-
     /*
      * Update statistics.
      */
@@ -544,7 +566,7 @@ unstuff_chars(q, mp)
     ahdlc_state_t *state;
     mblk_t *om;
     uchar_t *cp, *cpend, *dp, *dp0;
-    int c, len, extra, offset;
+    int c, len, extra;
     ushort_t fcs;
 
     state = (ahdlc_state_t *) q->q_ptr;