From: Alexandr D. Kanevskiy <kad@blackcatlinux.com>
Date: Tue, 16 Jul 2002 13:11:43 +0000 (+0000)
Subject: sync constant and attributes names with
X-Git-Tag: ppp-2.4.7~406
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=c2134507ca4699d192d79337a8fd2e947803dad9;p=ppp.git

sync constant and attributes names with
andrew pavlov <and@kremenchug.net>
---

diff --git a/pppd/auth.c b/pppd/auth.c
index 1e2602b..469b0f8 100644
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -32,7 +32,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define RCSID	"$Id: auth.c,v 1.79 2002/07/15 11:04:18 kad Exp $"
+#define RCSID	"$Id: auth.c,v 1.80 2002/07/16 13:11:43 kad Exp $"
 
 #include <stdio.h>
 #include <stddef.h>
@@ -893,8 +893,8 @@ check_maxoctets(arg)
 	case PPP_OCTETS_DIRECTION_OUT:
 	    used = link_stats.bytes_out;
 	    break;
-	case PPP_OCTETS_DIRECTION_MAX:
-	case PPP_OCTETS_DIRECTION_MAX2:
+	case PPP_OCTETS_DIRECTION_MAXOVERAL:
+	case PPP_OCTETS_DIRECTION_MAXSESSION:
 	    used = (link_stats.bytes_in > link_stats.bytes_out) ? link_stats.bytes_in : link_stats.bytes_out;
 	    break;
 	default:
diff --git a/pppd/plugins/radius/radiusclient/etc/dictionary b/pppd/plugins/radius/radiusclient/etc/dictionary
index 0778aa9..8f6263c 100644
--- a/pppd/plugins/radius/radiusclient/etc/dictionary
+++ b/pppd/plugins/radius/radiusclient/etc/dictionary
@@ -242,6 +242,7 @@ VALUE		Add-Port-To-IP-Address	Yes			1
 VALUE		Octets-Direction        Sum			0
 VALUE		Octets-Direction        Input			1
 VALUE		Octets-Direction        Output			2
-VALUE		Octets-Direction        Maximum			3
+VALUE		Octets-Direction        MaxOveral		3
+VALUE		Octets-Direction        MaxSession		4
 
 INCLUDE /etc/radiusclient/dictionary.microsoft
diff --git a/pppd/pppd.h b/pppd/pppd.h
index 2d1cd17..e2cc428 100644
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pppd.h,v 1.70 2002/07/15 11:04:18 kad Exp $
+ * $Id: pppd.h,v 1.71 2002/07/16 13:11:43 kad Exp $
  */
 
 /*
@@ -295,12 +295,12 @@ extern int       maxoctets_dir;      /* Direction :
 				      2 - out
 				      3 - max(in,out) */
 extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
-#define PPP_OCTETS_DIRECTION_SUM 	0
-#define PPP_OCTETS_DIRECTION_IN  	1
-#define PPP_OCTETS_DIRECTION_OUT 	2
-#define PPP_OCTETS_DIRECTION_MAX 	3
+#define PPP_OCTETS_DIRECTION_SUM        0
+#define PPP_OCTETS_DIRECTION_IN         1
+#define PPP_OCTETS_DIRECTION_OUT        2
+#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
 /* same as previos, but little different on RADIUS side */
-#define PPP_OCTETS_DIRECTION_MAX2 	4	
+#define PPP_OCTETS_DIRECTION_MAXSESSION 4	
 #endif
 
 #ifdef PPP_FILTER