d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Increment expected MP fragment numbers correctly,

Browse Source 
according to SHORTSEQ negotiation.
o Don't forget to attach incoming fragments with a
  number greater than everything else in the queue
  (rather than leaking memory).
o Output the link name with the ``other'' hdlc
  diagnostic message.
o Correct a VJ diagnostic (`COMPPROTO', not `proto').
This commit is contained in:
Brian Somers 1998-05-04 03:00:09 +00:00
parent 9c53a7b1c5
commit 147613eadf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/cvs2svn/branches/MP/; revision=35667
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/ppp/hdlc.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: hdlc.c,v 1.28.2.31 1998/05/01 19:24:37 brian Exp $
* $Id: hdlc.c,v 1.28.2.32 1998/05/03 11:24:13 brian Exp $
*
* TODO:
*/
@ -599,7 +599,8 @@ hdlc_ReportTime(void *v)
if (memcmp(&hdlc->laststats, &hdlc->stats, sizeof hdlc->stats)) {
log_Printf(LogPHASE,
"HDLC errors -> FCS: %u, ADDR: %u, COMD: %u, PROTO: %u\n",
"%s: HDLC errors -> FCS: %u, ADDR: %u, COMD: %u, PROTO: %u\n",
hdlc->lqm.owner->fsm.link->name,
hdlc->stats.badfcs - hdlc->laststats.badfcs,
hdlc->stats.badaddr - hdlc->laststats.badaddr,
hdlc->stats.badcommand - hdlc->laststats.badcommand,

29
usr.sbin/ppp/mp.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mp.c,v 1.1.2.20 1998/05/02 21:57:49 brian Exp $
* $Id: mp.c,v 1.1.2.21 1998/05/03 22:13:12 brian Exp $
*/
#include <sys/types.h>
@ -94,10 +94,10 @@ peerid_Equal(const struct peerid *p1, const struct peerid *p2)
}
static u_int32_t
inc_seq(struct mp *mp, u_int32_t seq)
inc_seq(unsigned is12bit, u_int32_t seq)
{
seq++;
if (mp->peer_is12bit) {
if (is12bit) {
if (seq & 0xfffff000)
seq = 0;
} else if (seq & 0xff000000)
@ -394,7 +394,7 @@ mp_Input(struct mp *mp, struct mbuf *m, struct physical *p)
* packets that have already been received.
*/
mp->seq.next_in = seq = h.seq + 1;
mp->seq.next_in = seq = inc_seq(mp->local_is12bit, h.seq);
last = NULL;
q = mp->inbufs;
} else
@ -457,12 +457,12 @@ mp_Input(struct mp *mp, struct mbuf *m, struct physical *p)
hdlc_DecodePacket(mp->bundle, proto, q, &mp->link);
}
mp->seq.next_in = seq = h.seq + 1;
mp->seq.next_in = seq = inc_seq(mp->local_is12bit, h.seq);
last = NULL;
q = mp->inbufs;
} else {
/* Look for the next fragment */
seq++;
seq = inc_seq(mp->local_is12bit, seq);
last = q;
q = q->pnext;
}
@ -473,16 +473,15 @@ mp_Input(struct mp *mp, struct mbuf *m, struct physical *p)
last = NULL;
for (q = mp->inbufs; q; last = q, q = q->pnext) {
mp_ReadHeader(mp, q, &h);
if (h.seq > mh.seq) {
/* Our received fragment fits in before this one, so link it in */
if (last)
last->pnext = m;
else
mp->inbufs = m;
m->pnext = q;
if (h.seq > mh.seq)
break;
}
}
/* Our received fragment fits in here */
if (last)
last->pnext = m;
else
mp->inbufs = m;
m->pnext = q;
}
}
@ -510,7 +509,7 @@ mp_Output(struct mp *mp, struct link *l, struct mbuf *m, int begin, int end)
if (log_IsKept(LogDEBUG))
log_Printf(LogDEBUG, "MP[frag %d]: Send %d bytes on link `%s'\n",
mp->out.seq, mbuf_Length(mo), l->name);
mp->out.seq = inc_seq(mp, mp->out.seq);
mp->out.seq = inc_seq(mp->peer_is12bit, mp->out.seq);
hdlc_Output(l, PRI_NORMAL, PROTO_MP, mo);
}

4
usr.sbin/ppp/vjcomp.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* $Id: vjcomp.c,v 1.16.2.15 1998/04/28 01:25:46 brian Exp $
* $Id: vjcomp.c,v 1.16.2.16 1998/05/01 19:26:11 brian Exp $
*
* TODO:
*/
@ -59,7 +59,7 @@ vj_SendFrame(struct link *l, struct mbuf * bp, struct bundle *bundle)
u_short proto;
u_short cproto = bundle->ncp.ipcp.peer_compproto >> 16;
log_Printf(LogDEBUG, "vj_SendFrame: proto = %x\n",
log_Printf(LogDEBUG, "vj_SendFrame: COMPPROTO = %x\n",
bundle->ncp.ipcp.peer_compproto);
if (((struct ip *) MBUF_CTOP(bp))->ip_p == IPPROTO_TCP
&& cproto == PROTO_VJCOMP) {