X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/551daa285a3c38c4467f39dda5cc1c084dce28df..2aea0b6c2a7464379697b256878fe0f15205e60e:/autothrottle.c

diff --git a/autothrottle.c b/autothrottle.c
index 118c03d..eb438b8 100644
--- a/autothrottle.c
+++ b/autothrottle.c
@@ -1,13 +1,12 @@
 #include <string.h>
-#include <malloc.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <sys/types.h>
 #include "l2tpns.h"
 #include "plugin.h"
-#include "control.h"
 
-int __plugin_api_version = 1;
+/* set up throttling based on RADIUS reply */
+
+char const *cvs_id = "$Id: autothrottle.c,v 1.11 2004-11-30 00:46:36 bodea Exp $";
+
+int plugin_api_version = PLUGIN_API_VERSION;
 struct pluginfuncs *p;
 
 #define THROTTLE_KEY "lcp:interface-config"
@@ -18,64 +17,96 @@ int plugin_radius_response(struct param_radius_response *data)
 	int i = 0;
 	int rate;
 
-	if (strncmp(data->key, THROTTLE_KEY, strlen(THROTTLE_KEY)) == 0)
+	if (strncmp(data->key, THROTTLE_KEY, sizeof(THROTTLE_KEY) - 1) == 0)
 	{
-		char *pt = strdup(data->value);
+		char *pt;
+
+		if (strncmp(data->value, "serv", 4))
+			return PLUGIN_RET_OK;
+
+		pt = strdup(data->value);
 		while ((t = strsep(&pt, " ")) != NULL)
 		{
 			if (strcmp(t, "serv") == 0)
 				i = 1;
-			else if (strcmp(t, "o") && i == 1)
-				i = 2;
-			else if (strcmp(t, "i") && i == 1)
+			else if (strcmp(t, "o") == 0 && i == 1)
 				i = 3;
-			else if (i > 1 && (rate = atoi(t)) > 0)
+			else if (strcmp(t, "i") == 0 && i == 1)
+				i = 2;
+			else if (i > 1 )
 			{
+				if ((rate = strtol(t, (char **)NULL, 10)) < 0 )
+				{
+					p->log(3, p->get_id_by_session(data->s), data->s->tunnel,
+						 "Syntax Error: rate is not a number %s\n", t);
+					free(pt);
+					return PLUGIN_RET_OK;
+				}
+
 				switch (i)
 				{
 					case 2: // output
-						data->s->throttle |= (rate & 0xFFFF);
+						data->s->throttle_out = rate;
 						free(pt);
-						p->log(3, 0, p->get_id_by_session(data->s), data->s->tunnel, "      Set output throttle rate %dkb/s\n", rate);
+						p->log(3, p->get_id_by_session(data->s), data->s->tunnel,
+							"      Set output throttle rate %dkb/s\n", rate);
+
 						return PLUGIN_RET_OK;
 
 					case 3: //input
-						data->s->throttle |= (rate << 16);
+						data->s->throttle_in = rate;
 						free(pt);
-						p->log(3, 0, p->get_id_by_session(data->s), data->s->tunnel, "      Set input throttle rate %dkb/s\n", rate);
+						p->log(3, p->get_id_by_session(data->s), data->s->tunnel,
+							"      Set input throttle rate %dkb/s\n", rate);
+
 						return PLUGIN_RET_OK;
 
 					default:
-						p->log(1, 0, p->get_id_by_session(data->s), data->s->tunnel, "Syntax error in rate limit AV pair: %s=%s\n", data->key, data->value);
+						p->log(1, p->get_id_by_session(data->s), data->s->tunnel,
+							"Syntax error in rate limit AV pair: %s=%s\n", data->key, data->value);
+
 						free(pt);
 						return PLUGIN_RET_OK;
 				}
 			}
-			else
-			{
-				free(pt);
-				p->log(1, 0, p->get_id_by_session(data->s), data->s->tunnel, "Syntax error in rate limit AV pair: %s=%s\n",
-					data->key, data->value);
-				return PLUGIN_RET_OK;
-			}
 		}
+
+		p->log(3, p->get_id_by_session(data->s), data->s->tunnel,
+			"Unknown lcp:interface-config AV pair %s=%s\n",data->key, data->value);
 		free(pt);
-	}
+		return PLUGIN_RET_OK;
+	} 
 	else if (strcmp(data->key, "throttle") == 0)
 	{
 		if (strcmp(data->value, "yes") == 0)
 		{
-			p->log(3, 0, p->get_id_by_session(data->s), data->s->tunnel, "         Throttling user\n");
-			data->s->throttle = 1;
+		    	unsigned long *rate = p->getconfig("throttle_speed", UNSIGNED_LONG);
+			if (rate)
+			{
+				if (*rate)
+					p->log(3, p->get_id_by_session(data->s), data->s->tunnel,
+						"         Throttling user to %dkb/s\n", *rate);
+				else
+					p->log(3, p->get_id_by_session(data->s), data->s->tunnel,
+						"         Not throttling user (throttle_speed=0)\n");
+
+				data->s->throttle_in = data->s->throttle_out = *rate;
+			}
+			else
+				p->log(1, p->get_id_by_session(data->s), data->s->tunnel,
+					"Not throttling user (can't get throttle_speed)\n");
 		}
 		else if (strcmp(data->value, "no") == 0)
 		{
-			p->log(3, 0, p->get_id_by_session(data->s), data->s->tunnel, "         Not throttling user\n");
-			data->s->throttle = 0;
+			p->log(3, p->get_id_by_session(data->s), data->s->tunnel,
+				"         Not throttling user\n");
+
+			data->s->throttle_in = data->s->throttle_out = 0;
 		}
 	}
 
-	p->log(4, 0, p->get_id_by_session(data->s), data->s->tunnel, "autothrottle module ignoring AV pair %s=%s\n",
+	p->log(4, p->get_id_by_session(data->s), data->s->tunnel,
+		"autothrottle module ignoring AV pair %s=%s\n",
 		data->key, data->value);
 
 	return PLUGIN_RET_OK;
@@ -85,8 +116,3 @@ int plugin_init(struct pluginfuncs *funcs)
 {
 	return ((p = funcs)) ? 1 : 0;
 }
-
-void plugin_done()
-{
-}
-