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, 18 insertions, 16 deletions

diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index 3a68cbf..0b52876 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -1,22 +1,24 @@
 #define LogMIN		(1)
 #define LogASYNC	(1)	/* syslog(LOG_INFO, ....)	*/
 #define LogCARRIER	(2)
-#define LogCHAT		(3)
-#define LogCOMMAND	(4)
-#define LogCONNECT	(5)
-#define LogDEBUG	(6)	/* syslog(LOG_DEBUG, ....)	*/
-#define LogHDLC		(7)
-#define LogLCP		(8)
-#define LogLINK		(9)
-#define LogLQM		(10)
-#define LogPHASE	(11)
-#define LogTCPIP	(12)
-#define LogTUN		(13)	/* If set, tun%d is output with each message */
-#define LogMAXCONF	(13)
-#define LogWARN		(14)	/* Sent to VarTerm else syslog(LOG_WARNING, ) */
-#define LogERROR	(15)	/* syslog(LOG_ERR, ....), + sent to VarTerm */
-#define LogALERT	(16)	/* syslog(LOG_ALERT, ....)	*/
-#define LogMAX		(16)
+#define LogCCP		(3)
+#define LogCHAT		(4)
+#define LogCOMMAND	(5)
+#define LogCONNECT	(6)
+#define LogDEBUG	(7)	/* syslog(LOG_DEBUG, ....)	*/
+#define LogHDLC		(8)
+#define LogIPCP		(9)
+#define LogLCP		(10)
+#define LogLINK		(11)
+#define LogLQM		(12)
+#define LogPHASE	(13)
+#define LogTCPIP	(14)
+#define LogTUN		(15)	/* If set, tun%d is output with each message */
+#define LogMAXCONF	(15)
+#define LogWARN		(16)	/* Sent to VarTerm else syslog(LOG_WARNING, ) */
+#define LogERROR	(17)	/* syslog(LOG_ERR, ....), + sent to VarTerm */
+#define LogALERT	(18)	/* syslog(LOG_ALERT, ....)	*/
+#define LogMAX		(18)
 
 /* The first int arg for all of the following is one of the above values */
 extern const char *LogName(int);