make log a conditional macro for _log

[l2tpns.git] / autothrottle.c

diff --git a/autothrottle.c b/autothrottle.c
index 118c03d..ce47d9d 100644 (file)
--- a/autothrottle.c
+++ b/autothrottle.c
@@ -34,19 +34,19 @@ int plugin_radius_response(struct param_radius_response *data)
                                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, 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);
+                                               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;
 
                                        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, 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);
                                                free(pt);
                                                return PLUGIN_RET_OK;
                                }
@@ -54,7 +54,7 @@ int plugin_radius_response(struct param_radius_response *data)
                        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, 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;
                        }
@@ -65,17 +65,17 @@ int plugin_radius_response(struct param_radius_response *data)
        {
                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;
+                       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;
                }
                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, 0, 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, 0, 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;