diff options
author | brian <brian@FreeBSD.org> | 1997-10-26 01:04:02 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 1997-10-26 01:04:02 +0000 |
commit | 486b8925ecb0d408e403474828e20c1cce8aaec8 (patch) | |
tree | cca66974908224bf517868aaafb2e4acd1abe88d /usr.sbin/ppp/vars.h | |
parent | 1d2927c9fac7bcfe68bf6ab502c716adc91d6f09 (diff) | |
download | FreeBSD-src-486b8925ecb0d408e403474828e20c1cce8aaec8.zip FreeBSD-src-486b8925ecb0d408e403474828e20c1cce8aaec8.tar.gz |
Cosmetic (no functional changes):
o Add missing $Id$s
o Move extern decls from .c -> .h files
o Staticize
o Remove #includes from .h files
o style(9)ify includes
o bcopy -> memcpy
bzero -> memset
bcmp -> memcmp
index -> strchr
rindex -> strrchr
o Move timeout.h -> timer.h (making it consistent w/ timer.c)
o Add -Wmissing-prototypes
Diffstat (limited to 'usr.sbin/ppp/vars.h')
-rw-r--r-- | usr.sbin/ppp/vars.h | 94 |
1 files changed, 50 insertions, 44 deletions
diff --git a/usr.sbin/ppp/vars.h b/usr.sbin/ppp/vars.h index 1134985..db6bb24 100644 --- a/usr.sbin/ppp/vars.h +++ b/usr.sbin/ppp/vars.h @@ -15,16 +15,11 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: vars.h,v 1.29 1997/09/25 00:52:37 brian Exp $ + * $Id: vars.h,v 1.30 1997/09/26 00:23:36 brian Exp $ * * TODO: */ -#ifndef _VARS_H_ -#define _VARS_H_ - -#include <sys/param.h> - struct confdesc { char *name; int myside, hisside; @@ -97,39 +92,39 @@ struct pppvars { struct aliasHandlers handler; /* Alias function pointers */ }; -#define VarAccmap pppVars.var_accmap -#define VarMRU pppVars.var_mru -#define VarPrefMTU pppVars.pref_mtu -#define VarDevice pppVars.modem_dev -#define VarBaseDevice pppVars.base_modem_dev -#define VarSpeed pppVars.modem_speed -#define VarParity pppVars.modem_parity -#define VarCtsRts pppVars.modem_ctsrts -#define VarOpenMode pppVars.open_mode -#define VarLocalAuth pppVars.lauth -#define VarDialScript pppVars.dial_script -#define VarHangupScript pppVars.hangup_script -#define VarLoginScript pppVars.login_script -#define VarIdleTimeout pppVars.idle_timeout -#define VarLqrTimeout pppVars.lqr_timeout -#define VarRetryTimeout pppVars.retry_timeout -#define VarAuthKey pppVars.auth_key -#define VarAuthName pppVars.auth_name +#define VarAccmap pppVars.var_accmap +#define VarMRU pppVars.var_mru +#define VarPrefMTU pppVars.pref_mtu +#define VarDevice pppVars.modem_dev +#define VarBaseDevice pppVars.base_modem_dev +#define VarSpeed pppVars.modem_speed +#define VarParity pppVars.modem_parity +#define VarCtsRts pppVars.modem_ctsrts +#define VarOpenMode pppVars.open_mode +#define VarLocalAuth pppVars.lauth +#define VarDialScript pppVars.dial_script +#define VarHangupScript pppVars.hangup_script +#define VarLoginScript pppVars.login_script +#define VarIdleTimeout pppVars.idle_timeout +#define VarLqrTimeout pppVars.lqr_timeout +#define VarRetryTimeout pppVars.retry_timeout +#define VarAuthKey pppVars.auth_key +#define VarAuthName pppVars.auth_name #ifdef HAVE_DES -#define VarMSChap pppVars.use_MSChap +#define VarMSChap pppVars.use_MSChap #endif -#define VarPhoneList pppVars.phone_numbers -#define VarPhoneCopy pppVars.phone_copy -#define VarNextPhone pppVars.next_phone -#define VarAltPhone pppVars.alt_phone -#define VarShortHost pppVars.shostname -#define VarReconnectTimer pppVars.reconnect_timer -#define VarReconnectTries pppVars.reconnect_tries -#define VarRedialTimeout pppVars.redial_timeout -#define VarRedialNextTimeout pppVars.redial_next_timeout -#define VarDialTries pppVars.dial_tries -#define VarLoopback pppVars.loopback -#define VarTerm pppVars.termfp +#define VarPhoneList pppVars.phone_numbers +#define VarPhoneCopy pppVars.phone_copy +#define VarNextPhone pppVars.next_phone +#define VarAltPhone pppVars.alt_phone +#define VarShortHost pppVars.shostname +#define VarReconnectTimer pppVars.reconnect_timer +#define VarReconnectTries pppVars.reconnect_tries +#define VarRedialTimeout pppVars.redial_timeout +#define VarRedialNextTimeout pppVars.redial_next_timeout +#define VarDialTries pppVars.dial_tries +#define VarLoopback pppVars.loopback +#define VarTerm pppVars.termfp #define VarAliasHandlers pppVars.handler #define VarPacketAliasGetFragment (*pppVars.handler.PacketAliasGetFragment) @@ -144,13 +139,20 @@ struct pppvars { #define VarPacketAliasSetMode (*pppVars.handler.PacketAliasSetMode) #define VarPacketAliasFragmentIn (*pppVars.handler.PacketAliasFragmentIn) -#define DEV_IS_SYNC (VarSpeed == 0) +#define DEV_IS_SYNC (VarSpeed == 0) extern struct pppvars pppVars; - -int Utmp; /* Are we in /etc/utmp ? */ -int ipInOctets, ipOutOctets, ipKeepAlive; -int ipConnectSecs, ipIdleSecs; +extern char VarVersion[]; +extern char VarLocalVersion[]; + +extern int Utmp; /* Are we in /etc/utmp ? */ +extern int ipInOctets; +extern int ipOutOctets; +extern int ipKeepAlive; +extern int ipConnectSecs; +extern int ipIdleSecs; +extern int reconnectState; +extern int reconnectCount; #define RECON_TRUE (1) #define RECON_FALSE (2) @@ -165,7 +167,6 @@ int ipConnectSecs, ipIdleSecs; } \ while(0) -int reconnectState, reconnectCount; /* * This is the logic behind the reconnect variables: @@ -190,4 +191,9 @@ int reconnectState, reconnectCount; * */ -#endif +extern int EnableCommand(struct cmdtab *, int, char **); +extern int DisableCommand(struct cmdtab *, int, char **); +extern int AcceptCommand(struct cmdtab *, int, char **); +extern int DenyCommand(struct cmdtab *, int, char **); +extern int LocalAuthCommand(struct cmdtab *, int, char **); +extern int DisplayCommand(void); |