fix for -v from Juergen Kammer

[l2tpns.git] / tbf.c

diff --git a/tbf.c b/tbf.c
index c024c67..ca3a930 100644 (file)
--- a/tbf.c
+++ b/tbf.c
@@ -1,9 +1,15 @@
-#include <malloc.h>
+// L2TPNS: token bucket filters
+
+char const *cvs_id_tbf = "$Id: tbf.c,v 1.4 2004/07/08 16:54:35 bodea Exp $";
+
+#define _GNU_SOURCE
+
 #include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
 
 #include "l2tpns.h"
+#include "util.h"
 #include "tbf.h"
 
 // Need a time interval.
@@ -39,8 +45,8 @@ typedef struct {
 } tbft;
 
 
-tbft * filter_list = NULL;
-int filter_list_size = 0;
+static tbft *filter_list = NULL;
+static int filter_list_size = 0;
 
 static int timer_chain = -1;   // Head of timer chain.
 
@@ -151,23 +157,32 @@ int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, u8 *, int))
                return p;
        }
 
-       log(0,0,0,0, "Ran out of token bucket filters! Sess %d will be un-throttled\n", sid);
-       return 0;
-
 #if 0
-       // Not using. Disasterous if called via the CLI! :)
-               // All allocated filters are used! Increase the size of the allocated
-               // filters.
+       // All allocated filters are used! Increase the size of the allocated
+       // filters.
+
+       {
+               int new_size = filter_list_size * 2;
+               tbft *new = mremap(filter_list, filter_list_size * sizeof(*new), new_size * sizeof(*new), MREMAP_MAYMOVE);
 
-       i = filter_list_size;
-       filter_list_size = filter_list_size * 2 + 1;
+               if (new == MAP_FAILED)
+               {
+                       log(0,0,0,0, "Ran out of token bucket filters and mremap failed!  Sess %d will be un-throttled\n", sid);
+                       return 0;
+               }
 
-       filter_list = realloc(filter_list, filter_list_size * sizeof(*filter_list) );
+               i = filter_list_size;
+               filter_list_size = new_size;
+               filter_list = new;
+       }
 
        for (; i < filter_list_size; ++i)
                filter_list[i].sid = 0;
 
        goto again;
+#else
+       log(0,0,0,0, "Ran out of token bucket filters!  Sess %d will be un-throttled\n", sid);
+       return 0;
 #endif
 }
 
@@ -289,10 +304,10 @@ static void tbf_run_queue(int tbf_id)
        f = &filter_list[tbf_id];
 
                // Calculate available credit...
-       f->credit += (config->current_time - f->lasttime) * f->rate / 10; // current time is 1/10th of a second.
+       f->credit += (TIME - f->lasttime) * f->rate / 10; // current time is 1/10th of a second.
        if (f->credit > f->max_credit)
                f->credit = f->max_credit;
-       f->lasttime = config->current_time;
+       f->lasttime = TIME;
 
        while (f->queued > 0 && f->credit >= f->sizes[f->oldest]) { // While we have enough credit..
 
@@ -348,7 +363,7 @@ int tbf_run_timer(void)
        for (i = 0; i < filter_list_size; ++i) {
                if (!filter_list[i].next)
                        continue;
-               if (filter_list[i].lasttime == config->current_time)    // Did we just run it?
+               if (filter_list[i].lasttime == TIME)    // Did we just run it?
                        continue;
 
                log(1,0,0,0, "Missed tbf %d! Not on the timer chain?(n %d, p %d, tc %d)\n", i,
@@ -365,10 +380,14 @@ int cmd_show_tbf(struct cli_def *cli, char *command, char **argv, int argc)
        int i;
        int count = 0;
 
+       if (CLI_HELP_REQUESTED)
+               return CLI_HELP_NO_ARGS;
+
        if (!config->cluster_iam_master) {
-               cli_print(cli, "Command can't be run on a slave.");
+               cli_print(cli, "Can't do this on a slave.  Do it on %s", inet_toa(config->cluster_master_address));
                return CLI_OK;
        }
+
        if (!filter_list)
                return CLI_OK;
 
@@ -397,4 +416,3 @@ int cmd_show_tbf(struct cli_def *cli, char *command, char **argv, int argc)
        cli_print(cli, "%d tbf entries used, %d total", count, filter_list_size);
        return CLI_OK;
 }
-