Changing MAXOCTETS to PPP_WITH_MAXOCTETS

Though, this could be renamed to PPP_WITH_SESSION_LIMITS; I don't know

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>

diff --git a/configure.ac b/configure.ac
index c04b4a21caec038110e447ec9dea8f336ba77404..6996955e3ff1848abc5fc2a9d83adcd5a8e356bf 100644 (file)
--- 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 f443a2937f1dd0cc3c4ff53a57ba0a8c8403656a..8615472d312f6419d99d3a6cdcc73a8395e5d201 100644 (file)
--- 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 e93c91510e03bb53b28734a91e790e67ecb903bc..42a3456429fb682df83bf26eb467d78c62f25985 100644 (file)
--- 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 01ea312ee1ccf91c5afb83fde2fa8de583f72e4b..968cf4422e4c1e74d9c89bc9de7f60099c84408c 100644 (file)
--- 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 a20bf0d36b1bbc16eb8cd93944950cd512db3ffa..b173aea31d9db5710593d330381bab02068003b9 100644 (file)
--- 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 d5f670fad622d8d08963cbaddd902bab9908aafb..d07e2371a433e66cd5567566c4a46afcbb45f74a 100644 (file)
--- 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