diff options
| author | Brian Somers <brian@FreeBSD.org> | 1998-04-07 00:54:26 +0000 |
|---|---|---|
| committer | Brian Somers <brian@FreeBSD.org> | 1998-04-07 00:54:26 +0000 |
| commit | 2764b86afdc99a30f4b1a4da2c04db8aa7aa785d (patch) | |
| tree | 0cb588250996f90611161eaaa08e4d721765d9b3 /usr.sbin/ppp/main.c | |
| parent | d24f017be800e31ad16d74ae3366abab383cefe0 (diff) | |
| download | src-2764b86afdc99a30f4b1a4da2c04db8aa7aa785d.tar.gz src-2764b86afdc99a30f4b1a4da2c04db8aa7aa785d.zip | |
o Move alias function pointers into loadalias.c
o Move Var*Version into command.c
o Remove struct pppVars (and there was much rejoicing) !
o Forward-decl some structs in .h files to avoid include
ordering requirements and remove a few more redundant
#includes.
Notes
Notes:
svn path=/cvs2svn/branches/MP/; revision=35089
Diffstat (limited to 'usr.sbin/ppp/main.c')
| -rw-r--r-- | usr.sbin/ppp/main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c index 2d08733e94a8..1b40c887d487 100644 --- a/usr.sbin/ppp/main.c +++ b/usr.sbin/ppp/main.c @@ -17,12 +17,11 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.121.2.44 1998/04/05 18:25:33 brian Exp $ + * $Id: main.c,v 1.121.2.45 1998/04/06 09:12:32 brian Exp $ * * TODO: - * o Add commands for traffic summary, version display, etc. - * o Add signal handler for misc controls. */ + #include <sys/param.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -226,7 +225,7 @@ ProcessArgs(int argc, char **argv) mode &= ~MODE_INTER; #ifndef NOALIAS } else if (strcmp(cp, "alias") == 0) { - if (loadAliasHandlers(&VarAliasHandlers) == 0) + if (loadAliasHandlers() == 0) mode |= MODE_ALIAS; else LogPrintf(LogWARN, "Cannot load alias library\n"); @@ -565,7 +564,7 @@ DoLoop(struct bundle *bundle, struct prompt *prompt) #ifndef NOALIAS if (mode & MODE_ALIAS) { - VarPacketAliasIn(tun.data, sizeof tun.data); + (*PacketAlias.In)(tun.data, sizeof tun.data); n = ntohs(((struct ip *)tun.data)->ip_len); } #endif @@ -605,7 +604,7 @@ DoLoop(struct bundle *bundle, struct prompt *prompt) if (pri >= 0) { #ifndef NOALIAS if (mode & MODE_ALIAS) { - VarPacketAliasOut(tun.data, sizeof tun.data); + (*PacketAlias.Out)(tun.data, sizeof tun.data); n = ntohs(((struct ip *)tun.data)->ip_len); } #endif |