diff options
| author | brian <brian@FreeBSD.org> | 1997-11-22 03:37:54 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 1997-11-22 03:37:54 +0000 |
| commit | a7f001c816c9390acda1c72f889fd110f8d75563 (patch) | |
| tree | 876d508224fb0bc9435a2e3b83f73719b56ad0b6 /usr.sbin/ppp/fsm.c | |
| parent | 13d351d26116b6bf544f619e0de396a53d47ccd1 (diff) | |
| download | FreeBSD-src-a7f001c816c9390acda1c72f889fd110f8d75563.zip FreeBSD-src-a7f001c816c9390acda1c72f889fd110f8d75563.tar.gz | |
Fix prototypes.
Remove extraneous decls.
Add ``const'' to several places.
Allow ``make NOALIAS=1'' to remove IP aliasing.
Merge with OpenBSD - only the Makefiles vary.
We can now survive a compile with
-Wall -Wbad-function-cast -Wcast-align -Wcast-qual
-Winline -Wmissing-declarations -Wmissing-prototypes
-Wnested-externs -Wpointer-arith -Wredundant-decls
-Wshadow -Wstrict-prototypes -Wwrite-strings -Wchar-subscripts
(although the Makefile just contains -Wall).
Diffstat (limited to 'usr.sbin/ppp/fsm.c')
| -rw-r--r-- | usr.sbin/ppp/fsm.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c index 1c787db..7bf11eb 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.20 1997/10/26 01:02:37 brian Exp $ + * $Id: fsm.c,v 1.21 1997/11/11 23:23:11 brian Exp $ * * TODO: * o Refer loglevel for log output @@ -30,6 +30,7 @@ #include <string.h> #include <termios.h> +#include "command.h" #include "mbuf.h" #include "log.h" #include "defs.h" @@ -42,7 +43,6 @@ #include "ccp.h" #include "modem.h" #include "loadalias.h" -#include "command.h" #include "vars.h" #include "pred.h" @@ -64,8 +64,10 @@ char const *StateNames[] = { }; static void -StoppedTimeout(struct fsm * fp) +StoppedTimeout(void *v) { + struct fsm *fp = (struct fsm *)v; + LogPrintf(fp->LogLevel, "Stopped timer expired\n"); if (modem != -1) DownConnection(); @@ -283,8 +285,10 @@ FsmSendConfigNak(struct fsm * fp, * Timeout actions */ static void -FsmTimeout(struct fsm * fp) +FsmTimeout(void *v) { + struct fsm *fp = (struct fsm *)v; + if (fp->restart) { switch (fp->state) { case ST_CLOSING: |
