diff options
| author | James Carlson <carlsonj@workingcode.com> | 2002-09-18 02:14:10 +0000 |
|---|---|---|
| committer | James Carlson <carlsonj@workingcode.com> | 2002-09-18 02:14:10 +0000 |
| commit | c1ed80aebc4cc9a3747371ce1e2419b3d1d857dd (patch) | |
| tree | f893338da0cafcc5c08301fae64f4f90bfe645f3 /modules | |
| parent | d022609f9d30bbde0dd46b02f86d17a7f426ce26 (diff) | |
| download | ppp-c1ed80aebc4cc9a3747371ce1e2419b3d1d857dd.tar.gz | |
Repaired handling of multiple chained mblks on rput side.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ppp_ahdlc.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/modules/ppp_ahdlc.c b/modules/ppp_ahdlc.c index 4254bd7..1be0692 100644 --- a/modules/ppp_ahdlc.c +++ b/modules/ppp_ahdlc.c @@ -41,7 +41,7 @@ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, * OR MODIFICATIONS. * - * $Id: ppp_ahdlc.c,v 1.16 2000/03/06 19:38:12 masputra Exp $ + * $Id: ppp_ahdlc.c,v 1.17 2002/09/18 02:14:10 carlsonj Exp $ */ /* @@ -527,7 +527,6 @@ ahdlc_rput(q, mp) switch (mp->b_datap->db_type) { case M_DATA: ahdlc_decode(q, mp); - freemsg(mp); break; case M_HANGUP: @@ -715,26 +714,6 @@ ahdlc_decode(q, mp) ahdlc_state_t *state; mblk_t *om; uchar_t *dp; - ushort_t fcs; -#if defined(SOL2) - mblk_t *zmp; -#endif /* SOL2 */ - -#if defined(SOL2) - /* - * In case the driver (or something below) doesn't send - * data upstream in one message block, concatenate everything - */ - if (!((mp->b_wptr - mp->b_rptr == msgdsize(mp)) && - ((intpointer_t)mp->b_rptr % sizeof(intpointer_t) == 0))) { - - zmp = msgpullup(mp, -1); - freemsg(mp); - mp = zmp; - if (mp == 0) - return; - } -#endif /* SOL2 */ state = (ahdlc_state_t *) q->q_ptr; @@ -744,6 +723,7 @@ ahdlc_decode(q, mp) state->stats.ppp_ibytes += msgdsize(mp); + for (; mp != 0; om = mp->b_cont, freeb(mp), mp = om) for (dp = mp->b_rptr; dp < mp->b_wptr; dp++) { /* |