Update debian/changelog

[l2tpns.git] / tbf.c

diff --git a/tbf.c b/tbf.c
index 459c049..8b488d6 100644 (file)
--- a/tbf.c
+++ b/tbf.c
@@ -1,12 +1,8 @@
 // L2TPNS: token bucket filters
 
 // L2TPNS: token bucket filters
 

-char const *cvs_id_tbf = "$Id: tbf.c,v 1.7 2004-10-28 03:26:41 bodea Exp $";
-
-#define _GNU_SOURCE
-

 #include <string.h>
 #include <string.h>

-#include <unistd.h>
-#include <sys/mman.h>
+#include <sys/socket.h>
+#include <linux/rtnetlink.h>

 
 #include "l2tpns.h"
 #include "util.h"
 
 #include "l2tpns.h"
 #include "util.h"


@@ -19,12 +15,12 @@ static int timer_chain = -1;        // Head of timer chain.
 
 static void tbf_run_queue(int tbf_id);
 
 
 static void tbf_run_queue(int tbf_id);
 

-void init_tbf(void)
+void init_tbf(int num_tbfs)

 {
 {

-       if (!(filter_list = shared_malloc(sizeof(*filter_list) * MAXTBFS)))
+       if (!(filter_list = shared_malloc(sizeof(*filter_list) * num_tbfs)))

                return;
 
                return;
 

-       filter_list_size = MAXTBFS;
+       filter_list_size = num_tbfs;

        filter_list[0].sid = -1;        // Reserved.
 }
 //
        filter_list[0].sid = -1;        // Reserved.
 }
 //


@@ -59,7 +55,7 @@ static void del_from_timer(int id)
 
        if (filter_list[id].next == id) {       // Last element in chain?
                if (timer_chain != id) { // WTF?
 
        if (filter_list[id].next == id) {       // Last element in chain?
                if (timer_chain != id) { // WTF?

-                       log(0,0,0,0, "Removed a singleton element from TBF, but tc didn't point to it!\n");
+                       LOG(0, 0, 0, "Removed a singleton element from TBF, but tc didn't point to it!\n");

                } else
                        timer_chain = -1;
                filter_list[id].next = filter_list[id].prev = 0;
                } else
                        timer_chain = -1;
                filter_list[id].next = filter_list[id].prev = 0;


@@ -96,18 +92,16 @@ int free_tbf(int tid)
 //
 // Allocate a new token bucket filter.
 //
 //
 // Allocate a new token bucket filter.
 //

-int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, u8 *, int))
+int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, uint8_t *, int))

 {
        int i;
        static int p = 0;
 
 {
        int i;
        static int p = 0;
 

-       log(3,0,0,0, "Allocating new TBF (sess %d, rate %d, helper %p)\n", sid, rate, f);
+       LOG(4, 0, 0, "Allocating new TBF (sess %d, rate %d, helper %p)\n", sid, rate, f);

 
        if (!filter_list)
                return 0;       // Couldn't alloc memory!
 
 
        if (!filter_list)
                return 0;       // Couldn't alloc memory!
 

-//    again:
-

        for (i = 0 ; i < filter_list_size ; ++i, p = (p+1)%filter_list_size ) {
                if (filter_list[p].sid)
                        continue;
        for (i = 0 ; i < filter_list_size ; ++i, p = (p+1)%filter_list_size ) {
                if (filter_list[p].sid)
                        continue;


@@ -123,33 +117,8 @@ int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, u8 *, int))
                return p;
        }
 
                return p;
        }
 

-#if 0
-       // 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);
-
-               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;
-               }
-
-               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);
+       LOG(0, 0, 0, "Ran out of token bucket filters!  Sess %d will be un-throttled\n", sid);

        return 0;
        return 0;

-#endif

 }
 
 //
 }
 
 //


@@ -191,10 +160,10 @@ void fsck_tbfs(void)
 // If we can send it right away, we do. Else we
 // try and queue it to send later. Else we drop it.
 //
 // If we can send it right away, we do. Else we
 // try and queue it to send later. Else we drop it.
 //

-int tbf_queue_packet(int tbf_id, char * data, int size)
+int tbf_queue_packet(int tbf_id, uint8_t *data, int size)

 {
        int i;
 {
        int i;

-       tbft * f;
+       tbft *f;

 
        if (!filter_list)
                return -1;
 
        if (!filter_list)
                return -1;


@@ -332,7 +301,7 @@ int tbf_run_timer(void)
                if (filter_list[i].lasttime == TIME)    // Did we just run it?
                        continue;
 
                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,
+               LOG(1, 0, 0, "Missed tbf %d! Not on the timer chain?(n %d, p %d, tc %d)\n", i,

                        filter_list[i].next, filter_list[i].prev, timer_chain);
                tbf_run_queue(i);
        }
                        filter_list[i].next, filter_list[i].prev, timer_chain);
                tbf_run_queue(i);
        }


@@ -350,7 +319,9 @@ int cmd_show_tbf(struct cli_def *cli, char *command, char **argv, int argc)
                return CLI_HELP_NO_ARGS;
 
        if (!config->cluster_iam_master) {
                return CLI_HELP_NO_ARGS;
 
        if (!config->cluster_iam_master) {

-               cli_print(cli, "Can't do this on a slave.  Do it on %s", inet_toa(config->cluster_master_address));
+               cli_error(cli, "Can't do this on a slave.  Do it on %s",
+                       fmtaddr(config->cluster_master_address, 0));
+

                return CLI_OK;
        }
 
                return CLI_OK;
        }