Expand the "set stopped" command so that it can

idependently time out any of the FSMs.

Split LCP logging into LCP, IPCP and CCP logging,
and make room in "struct fsm" for the log level
that the state machine should use.

1 files changed, 14 insertions, 1 deletions

diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index 0b55a8940e97..6fd4e4837c51 100644
--- a/usr.sbin/ppp/fsm.h
+++ b/usr.sbin/ppp/fsm.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: fsm.h,v 1.7 1997/02/22 16:10:14 peter Exp $
+ * $Id: fsm.h,v 1.8 1997/06/09 03:27:21 brian Exp $
  *
  *	TODO:
  */
@@ -65,6 +65,19 @@ struct fsm {
   int     reqcode;		/* Request code sent */
   struct pppTimer FsmTimer;	/* Restart Timer */
 
+  /*
+   * This timer times the ST_STOPPED state out after the given value
+   * (specified via "set stopped ...").  Although this isn't
+   * specified in the rfc, the rfc *does* say that "the application
+   * may use higher level timers to avoid deadlock".
+   * The StoppedTimer takes effect when the other side ABENDs rather
+   * than going into ST_ACKSENT (and sending the ACK), causing ppp to
+   * time out and drop into ST_STOPPED.  At this point, nothing will
+   * change this state :-(
+   */
+  struct pppTimer StoppedTimer;
+  int LogLevel;
+
   void	  (*LayerUp)(struct fsm *);
   void	  (*LayerDown)(struct fsm *);
   void	  (*LayerStart)(struct fsm *);