X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Foptions.c;h=1fbe46e642c316b28096f557f5ed5dc83cae0551;hb=fb3529ccfc1868e8563a2dcfbae7b386125fccbc;hp=e93c91510e03bb53b28734a91e790e67ecb903bc;hpb=f7307b3f74f9a2fd64acc77b0c884ed1cc9afe56;p=ppp.git diff --git a/pppd/options.c b/pppd/options.c index e93c915..1fbe46e 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -54,6 +54,8 @@ #include #include #include +#include +#include #ifdef PPP_WITH_PLUGINS #include #endif @@ -136,11 +138,9 @@ char path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */ char path_ipv6down[MAXPATHLEN]; /* pathname of ipv6-down script */ #endif -#ifdef MAXOCTETS unsigned int maxoctets = 0; /* default - no limit */ int maxoctets_dir = 0; /* default - sum of traffic */ int maxoctets_timeout = 1; /* default 1 second */ -#endif extern option_t auth_options[]; @@ -182,9 +182,7 @@ static int setpassfilter(char **); static int setactivefilter(char **); #endif -#ifdef MAXOCTETS static int setmodir(char **); -#endif static int user_setenv(char **); static void user_setprint(option_t *, printer_func, void *); @@ -371,7 +369,6 @@ option_t general_options[] = { "set filter for active pkts", OPT_PRIO }, #endif -#ifdef MAXOCTETS { "maxoctets", o_int, &maxoctets, "Set connection traffic limit", OPT_PRIO | OPT_LLIMIT | OPT_NOINCR | OPT_ZEROINF }, @@ -382,7 +379,6 @@ option_t general_options[] = { "Set direction for limit traffic (sum,in,out,max)" }, { "mo-timeout", o_int, &maxoctets_timeout, "Check for traffic limit every N seconds", OPT_PRIO | OPT_LLIMIT | 1 }, -#endif /* Dummy option, does nothing */ { "noipx", o_bool, &noipx_opt, NULL, OPT_NOPRINT | 1 }, @@ -1572,7 +1568,6 @@ setlogfile(char **argv) return 1; } -#ifdef MAXOCTETS static int setmodir(char **argv) { @@ -1589,7 +1584,6 @@ setmodir(char **argv) } return 1; } -#endif #ifdef PPP_WITH_PLUGINS static int