From c95c6162dd3b5774ee680f9c7df60db217cae161 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Eivind=20N=C3=A6ss?= Date: Sat, 7 Aug 2021 14:48:20 -0700 Subject: [PATCH] Changing MAXOCTETS to PPP_WITH_MAXOCTETS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Though, this could be renamed to PPP_WITH_SESSION_LIMITS; I don't know Signed-off-by: Eivind Næss --- configure.ac | 2 +- pppd/auth.c | 8 ++++---- pppd/options.c | 8 ++++---- pppd/plugins/radius/radius.c | 4 ++-- pppd/pppd.h | 4 ++-- pppd/pppdconf.h.in | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index c04b4a2..6996955 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,7 @@ AM_COND_IF([PPP_WITH_CBCP], AC_ARG_ENABLE([maxoctets], AS_HELP_STRING([--disable-maxoctets], [Disable support for limiting session by maximum octets])) AS_IF([test "x$enable_maxoctets" != "xno"], - AC_DEFINE([MAXOCTETS], 1, ["Limit sessions by maximum number of octets"])) + AC_DEFINE([PPP_WITH_MAXOCTETS], 1, [Limit sessions by maximum number of octets])) # # Disable Microsoft extensions will remove CHAP and MPPE support diff --git a/pppd/auth.c b/pppd/auth.c index f443a29..8615472 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -318,7 +318,7 @@ static int set_permitted_number (char **); static void check_access (FILE *, char *); static int wordlist_count (struct wordlist *); -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS static void check_maxoctets (void *); #endif @@ -1164,7 +1164,7 @@ np_up(int unit, int proto) if (maxconnect > 0) TIMEOUT(connect_time_expired, 0, maxconnect); -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS if (maxoctets > 0) TIMEOUT(check_maxoctets, NULL, maxoctets_timeout); #endif @@ -1194,7 +1194,7 @@ np_down(int unit, int proto) if (--num_np_up == 0) { UNTIMEOUT(check_idle, NULL); UNTIMEOUT(connect_time_expired, NULL); -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS UNTIMEOUT(check_maxoctets, NULL); #endif new_phase(PHASE_NETWORK); @@ -1213,7 +1213,7 @@ np_finished(int unit, int proto) } } -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS static void check_maxoctets(void *arg) { diff --git a/pppd/options.c b/pppd/options.c index e93c915..42a3456 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -136,7 +136,7 @@ char path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */ char path_ipv6down[MAXPATHLEN]; /* pathname of ipv6-down script */ #endif -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS unsigned int maxoctets = 0; /* default - no limit */ int maxoctets_dir = 0; /* default - sum of traffic */ int maxoctets_timeout = 1; /* default 1 second */ @@ -182,7 +182,7 @@ static int setpassfilter(char **); static int setactivefilter(char **); #endif -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS static int setmodir(char **); #endif @@ -371,7 +371,7 @@ option_t general_options[] = { "set filter for active pkts", OPT_PRIO }, #endif -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS { "maxoctets", o_int, &maxoctets, "Set connection traffic limit", OPT_PRIO | OPT_LLIMIT | OPT_NOINCR | OPT_ZEROINF }, @@ -1572,7 +1572,7 @@ setlogfile(char **argv) return 1; } -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS static int setmodir(char **argv) { diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c index 01ea312..968cf44 100644 --- a/pppd/plugins/radius/radius.c +++ b/pppd/plugins/radius/radius.c @@ -607,7 +607,7 @@ radius_setparams(VALUE_PAIR *vp, char *msg, REQUEST_INFO *req_info, /* idle parameter */ idle_time_limit = vp->lvalue; break; -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS case PW_SESSION_OCTETS_LIMIT: /* Session traffic limit */ maxoctets = vp->lvalue; @@ -1090,7 +1090,7 @@ radius_acct_stop(void) av_type = PW_ACCT_SESSION_TIMEOUT; break; -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS case EXIT_TRAFFIC_LIMIT: av_type = PW_NAS_REQUEST; break; diff --git a/pppd/pppd.h b/pppd/pppd.h index a20bf0d..b173aea 100644 --- a/pppd/pppd.h +++ b/pppd/pppd.h @@ -360,7 +360,7 @@ extern char *tls_verify_method; extern char *pkcs12_file; #endif /* PPP_WITH_EAPTLS */ -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ extern int maxoctets_dir; /* Direction : 0 - in+out (default) @@ -869,7 +869,7 @@ extern void (*snoop_send_hook)(unsigned char *p, int len); #define EXIT_LOOPBACK 17 #define EXIT_INIT_FAILED 18 #define EXIT_AUTH_TOPEER_FAILED 19 -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS #define EXIT_TRAFFIC_LIMIT 20 #endif #define EXIT_CNID_AUTH_FAILED 21 diff --git a/pppd/pppdconf.h.in b/pppd/pppdconf.h.in index d5f670f..d07e237 100644 --- a/pppd/pppdconf.h.in +++ b/pppd/pppdconf.h.in @@ -21,8 +21,8 @@ /* "Have support for loadable plugins" */ #undef PPP_WITH_PLUGINS -/* "Limit sessions by maximum number of octets" */ -#undef MAXOCTETS +/* Limit sessions by maximum number of octets */ +#undef PPP_WITH_MAXOCTETS /* Have Microsoft Callback Protocol support */ #undef PPP_WITH_CBCP -- 2.39.2