summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>1997-06-02 00:04:40 +0000
committerbrian <brian@FreeBSD.org>1997-06-02 00:04:40 +0000
commite28b617f4a0f3f0f5f15a7a99e8593ba31422c59 (patch)
tree9b66a9a6ff85f33dee6be17f18cfdca1efcbfbca /usr.sbin
parent51bc6497ca9cfd0a9f799946bf4ef3d01b71544a (diff)
downloadFreeBSD-src-e28b617f4a0f3f0f5f15a7a99e8593ba31422c59.zip
FreeBSD-src-e28b617f4a0f3f0f5f15a7a99e8593ba31422c59.tar.gz
Back out last change (which in fact breaks rfc1661)
and modify the behaviour so that a timer is started and the restart counter is zeroed (as per the State Machine Diagram). Pointed-out-by: joerg
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ppp/fsm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 72d70fb..27f5566 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $Id: fsm.c,v 1.10 1997/05/10 01:22:10 brian Exp $
+ * $Id: fsm.c,v 1.11 1997/06/01 14:37:19 brian Exp $
*
* TODO:
* o Refer loglevel for log output
@@ -521,10 +521,11 @@ struct mbuf *bp;
NewState(fp, ST_REQSENT);
break;
case ST_OPENED:
- (fp->LayerFinish)(fp);
- /* Zero Restart counter */
+ (fp->LayerDown)(fp);
(fp->SendTerminateAck)(fp);
- NewState(fp, ST_STOPPED);
+ StartTimer(&fp->FsmTimer); /* Start restart timer */
+ fp->restart = 0;
+ NewState(fp, ST_STOPPING);
break;
}
pfree(bp);
OpenPOWER on IntegriCloud