Overhaul ppp:

  o Use syslog
  o Remove references to stdout/stderr (incl perror())
  o Introduce VarTerm - the interactive terminal or zero
  o Allow "set timeout" to affect current session
  o Change "set debug" to "set log"
  o Allow "set log [+|-]flag"
  o Make MSEXT and PASSWDAUTH stuff the default
  o Move all #ifdef DEBUG stuff into the code - this
    shouldn't be too much overhead.  It's now controlled
    with "set log +debug"
  o Add "set log command, debug, tun, warn, error, alert"
  o Remove cdefs.h, and assume an ansi compiler.
  o Improve all diagnostic output
  o Don't trap SIGSEGV
  o SIGHUP now terminates again (log files are controlled
    by syslog)
  o Call CloseModem() when changing devices
  o Fix parsing of third arg of "delete"

I think this fixes the "magic is same" problems that some
people have been experiencing.
The man page is being rewritten.  It'll follow soon.

1 files changed, 25 insertions, 26 deletions

diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index 1709a4146fa0..0b55a8940e97 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$
+ * $Id: fsm.h,v 1.7 1997/02/22 16:10:14 peter Exp $
  *
  *	TODO:
  */
@@ -26,7 +26,6 @@
 #include "defs.h"
 #include <netinet/in.h>
 #include "timeout.h"
-#include "cdefs.h"
 
 /*
  *  State of machine
@@ -66,15 +65,15 @@ struct fsm {
   int     reqcode;		/* Request code sent */
   struct pppTimer FsmTimer;	/* Restart Timer */
 
-  void	  (*LayerUp) __P((struct fsm *));
-  void	  (*LayerDown) __P((struct fsm *));
-  void	  (*LayerStart) __P((struct fsm *));
-  void	  (*LayerFinish) __P((struct fsm *));
-  void	  (*InitRestartCounter) __P((struct fsm *));
-  void	  (*SendConfigReq) __P((struct fsm *));
-  void	  (*SendTerminateReq) __P((struct fsm *));
-  void	  (*SendTerminateAck) __P((struct fsm *));
-  void	  (*DecodeConfig) __P((u_char *, int, int));
+  void	  (*LayerUp)(struct fsm *);
+  void	  (*LayerDown)(struct fsm *);
+  void	  (*LayerStart)(struct fsm *);
+  void	  (*LayerFinish)(struct fsm *);
+  void	  (*InitRestartCounter)(struct fsm *);
+  void	  (*SendConfigReq)(struct fsm *);
+  void	  (*SendTerminateReq)(struct fsm *);
+  void	  (*SendTerminateAck)(struct fsm *);
+  void	  (*DecodeConfig)(u_char *, int, int);
 };
 
 struct fsmheader {
@@ -100,7 +99,7 @@ struct fsmheader {
 #define	CODE_RESETACK	15		/* Used in CCP */
 
 struct fsmcodedesc {
-  void (*action) __P((struct fsm *, struct fsmheader *, struct mbuf *));
+  void (*action)(struct fsm *, struct fsmheader *, struct mbuf *);
   char *name;
 };
 
@@ -117,20 +116,20 @@ u_char ReqBuff[200];
 u_char *ackp, *nakp, *rejp;
 
 extern char const *StateNames[];
-extern void FsmInit __P((struct fsm *));
-extern void NewState __P((struct fsm *, int));
-extern void FsmOutput __P((struct fsm *, u_int, u_int, u_char *, int));
-extern void FsmOpen __P((struct fsm *));
-extern void FsmUp __P((struct fsm *));
-extern void FsmDown __P((struct fsm *));
-extern void FsmInput __P((struct fsm *, struct mbuf *));
-
-extern void FsmRecvConfigReq __P((struct fsm *, struct fsmheader *, struct mbuf *));
-extern void FsmRecvConfigAck __P((struct fsm *, struct fsmheader *, struct mbuf *));
-extern void FsmRecvConfigNak __P((struct fsm *, struct fsmheader *, struct mbuf *));
-extern void FsmRecvTermReq __P((struct fsm *, struct fsmheader *, struct mbuf *));
-extern void FsmRecvTermAck __P((struct fsm *, struct fsmheader *, struct mbuf *));
-extern void FsmClose __P((struct fsm *fp));
+extern void FsmInit(struct fsm *);
+extern void NewState(struct fsm *, int);
+extern void FsmOutput(struct fsm *, u_int, u_int, u_char *, int);
+extern void FsmOpen(struct fsm *);
+extern void FsmUp(struct fsm *);
+extern void FsmDown(struct fsm *);
+extern void FsmInput(struct fsm *, struct mbuf *);
+
+extern void FsmRecvConfigReq(struct fsm *, struct fsmheader *, struct mbuf *);
+extern void FsmRecvConfigAck(struct fsm *, struct fsmheader *, struct mbuf *);
+extern void FsmRecvConfigNak(struct fsm *, struct fsmheader *, struct mbuf *);
+extern void FsmRecvTermReq(struct fsm *, struct fsmheader *, struct mbuf *);
+extern void FsmRecvTermAck(struct fsm *, struct fsmheader *, struct mbuf *);
+extern void FsmClose(struct fsm *fp);
 
 extern struct fsm LcpFsm, IpcpFsm, CcpFsm;