oops

[l2tpns.git] / autothrottle.c

diff --git a/autothrottle.c b/autothrottle.c
index a9b5732..f631877 100644 (file)
--- a/autothrottle.c
+++ b/autothrottle.c
@@ -4,9 +4,9 @@
 
 /* set up throttling based on RADIUS reply */
 
 
 /* set up throttling based on RADIUS reply */
 

-char const *cvs_id = "$Id: autothrottle.c,v 1.7 2004-11-05 04:55:26 bodea Exp $";
+char const *cvs_id = "$Id: autothrottle.c,v 1.10 2004-11-29 02:17:17 bodea Exp $";

 
 

-int __plugin_api_version = 1;
+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"


@@ -35,17 +35,23 @@ int plugin_radius_response(struct param_radius_response *data)
                                        case 2: // output
                                                data->s->throttle_out = rate;
                                                free(pt);
                                        case 2: // output
                                                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_in = rate;
                                                free(pt);
                                                return PLUGIN_RET_OK;
 
                                        case 3: //input
                                                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:
                                                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;
                                }
                                                free(pt);
                                                return PLUGIN_RET_OK;
                                }


@@ -53,8 +59,10 @@ int plugin_radius_response(struct param_radius_response *data)
                        else
                        {
                                free(pt);
                        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",
+                               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);
                                        data->key, data->value);

+

                                return PLUGIN_RET_OK;
                        }
                }
                                return PLUGIN_RET_OK;
                        }
                }


@@ -64,17 +72,33 @@ 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_in = data->s->throttle_out = config->rl_rate;
+                       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)
                {
                }
                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");
+                       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;
                }
        }
 
                        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;
                data->key, data->value);
 
        return PLUGIN_RET_OK;