diff options
| author | brian <brian@FreeBSD.org> | 1997-09-10 21:33:32 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 1997-09-10 21:33:32 +0000 |
| commit | 49b883a1dd5b5019c848e73206a2e4e81476c5ee (patch) | |
| tree | 3de8de5bf4eee5d3aaef4b8536e7882b6c6344a1 /usr.sbin/ppp/ccp.c | |
| parent | d4697c2a95a093188f9d457064f3a6fc4e97b9ef (diff) | |
| download | FreeBSD-src-49b883a1dd5b5019c848e73206a2e4e81476c5ee.zip FreeBSD-src-49b883a1dd5b5019c848e73206a2e4e81476c5ee.tar.gz | |
o Initialize the PRED1 input queue when we
receive the ResetAck, NOT when we send the
ResetReq (as per the rfc).
o SILENTLY ignore CCPs that arrive *before*
the network phase (as per the rfc).
o Check that we've actually negotiated PRED1
before sending PRED1 output.
This bug has been around for a *VERY* long
time ! We shouldn't need to explicitly disable
PRED1 now :-)
Diffstat (limited to 'usr.sbin/ppp/ccp.c')
| -rw-r--r-- | usr.sbin/ppp/ccp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c index d42e9bf..f4a3a56 100644 --- a/usr.sbin/ppp/ccp.c +++ b/usr.sbin/ppp/ccp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ccp.c,v 1.14 1997/08/20 23:47:40 brian Exp $ + * $Id: ccp.c,v 1.15 1997/08/25 00:29:06 brian Exp $ * * TODO: * o Support other compression protocols @@ -130,7 +130,6 @@ CcpSendConfigReq(struct fsm * fp) void CcpSendResetReq(struct fsm * fp) { - Pred1Init(1); /* Initialize Input part */ LogPrintf(LogCCP, "CcpSendResetReq\n"); FsmOutput(fp, CODE_RESETREQ, fp->reqid, NULL, 0); } @@ -258,7 +257,8 @@ CcpInput(struct mbuf * bp) if (phase == PHASE_NETWORK) FsmInput(&CcpFsm, bp); else { - LogPrintf(LogERROR, "Unexpected CCP in phase %d\n", phase); + if (phase > PHASE_NETWORK) + LogPrintf(LogERROR, "Unexpected CCP in phase %d\n", phase); pfree(bp); } } |
