X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/dff555697a1dbdd6fd420683d70a045bc6615f27..cb031e775d57da45299c8dfdfabe7240705338e7:/tbf.c?ds=inline diff --git a/tbf.c b/tbf.c index 3c8a211..223c40d 100644 --- a/tbf.c +++ b/tbf.c @@ -1,63 +1,25 @@ // L2TPNS: token bucket filters -char const *cvs_id_tbf = "$Id: tbf.c,v 1.3 2004/07/02 07:31:23 bodea Exp $"; +char const *cvs_id_tbf = "$Id: tbf.c,v 1.13 2005/07/31 10:04:10 bodea Exp $"; -#include #include -#include -#include - #include "l2tpns.h" #include "util.h" #include "tbf.h" -// Need a time interval. - -#define TBF_MAX_QUEUE 2 // Maximum of 2 queued packet per -#define TBF_MAX_SIZE 3000 // Maxiumum queued packet size is 2048. - -#define TBF_MAX_CREDIT 6000 // Maximum 6000 bytes of credit. -#define TBF_RATE 360 // 360 bytes per 1/10th of a second. - -typedef struct { - int credit; - int lasttime; - int queued; - int oldest; // Position of packet in the ring buffer. - sessionidt sid; // associated session ID. - int max_credit; // Maximum amount of credit available (burst size). - int rate; // How many bytes of credit per second we get? (sustained rate) - void (*send)(sessionidt s, u8 *, int); // Routine to actually send out the data. - int prev; // Timer chain position. - int next; // Timer chain position. - - u32 b_queued; // Total bytes sent through this TBF - u32 b_sent; // Total bytes sucessfully made it to the network. - u32 p_queued; // ditto packets. - u32 p_sent; // ditto packets. - u32 b_dropped; // Total bytes dropped. - u32 p_dropped; // Total packets dropped. - u32 p_delayed; // Total packets not sent immediately. - - int sizes[TBF_MAX_QUEUE]; - char packets[TBF_MAX_QUEUE][TBF_MAX_SIZE]; -} tbft; - - -tbft * filter_list = NULL; -int filter_list_size = 0; +tbft *filter_list = NULL; +static int filter_list_size = 0; static int timer_chain = -1; // Head of timer chain. static void tbf_run_queue(int tbf_id); -void init_tbf(void) +void init_tbf(int num_tbfs) { - filter_list = mmap(NULL, sizeof(*filter_list) * MAXTBFS, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0); - if (!filter_list) + if (!(filter_list = shared_malloc(sizeof(*filter_list) * num_tbfs))) return; - filter_list_size = MAXTBFS; + filter_list_size = num_tbfs; filter_list[0].sid = -1; // Reserved. } // @@ -92,7 +54,7 @@ static void del_from_timer(int id) 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; @@ -129,18 +91,16 @@ int free_tbf(int tid) // // 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; - 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! -// again: - for (i = 0 ; i < filter_list_size ; ++i, p = (p+1)%filter_list_size ) { if (filter_list[p].sid) continue; @@ -156,24 +116,8 @@ 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); + LOG(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. - - i = filter_list_size; - filter_list_size = filter_list_size * 2 + 1; - - filter_list = realloc(filter_list, filter_list_size * sizeof(*filter_list) ); - - for (; i < filter_list_size; ++i) - filter_list[i].sid = 0; - - goto again; -#endif } // @@ -215,10 +159,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. // -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; - tbft * f; + tbft *f; if (!filter_list) return -1; @@ -356,7 +300,7 @@ int tbf_run_timer(void) 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); } @@ -374,7 +318,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) { - 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; }