- fix case where ll_delete removes the last entry

[l2tpns.git] / autothrottle.c

diff --git a/autothrottle.c b/autothrottle.c
index 118c03d..9973a4f 100644 (file)
--- a/autothrottle.c
+++ b/autothrottle.c
@@ -1,13 +1,12 @@
 #include <string.h>
 #include <string.h>

-#include <malloc.h>
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <sys/types.h>

 #include "l2tpns.h"
 #include "plugin.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.9 2004-11-17 08:23:34 bodea Exp $";
+
+int plugin_api_version = PLUGIN_API_VERSION;

 struct pluginfuncs *p;
 
 #define THROTTLE_KEY "lcp:interface-config"
 struct pluginfuncs *p;
 
 #define THROTTLE_KEY "lcp:interface-config"


@@ -34,13 +33,13 @@ int plugin_radius_response(struct param_radius_response *data)
                                switch (i)
                                {
                                        case 2: // output
                                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);
                                                return PLUGIN_RET_OK;
 
                                        case 3: //input
                                                free(pt);
                                                p->log(3, 0, 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);
                                                return PLUGIN_RET_OK;
                                                free(pt);
                                                p->log(3, 0, p->get_id_by_session(data->s), data->s->tunnel, "      Set input throttle rate %dkb/s\n", rate);
                                                return PLUGIN_RET_OK;


@@ -65,13 +64,23 @@ int plugin_radius_response(struct param_radius_response *data)
        {
                if (strcmp(data->value, "yes") == 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, 0, p->get_id_by_session(data->s), data->s->tunnel, "         Throttling user to %dkb/s\n", *rate);
+                               else
+                                       p->log(3, 0, 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, 0, 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");
                }
                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;
+                       data->s->throttle_in = data->s->throttle_out = 0;

                }
        }
 
                }
        }
 


@@ -85,8 +94,3 @@ int plugin_init(struct pluginfuncs *funcs)
 {
        return ((p = funcs)) ? 1 : 0;
 }
 {
        return ((p = funcs)) ? 1 : 0;
 }

-
-void plugin_done()
-{
-}
-