X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/d52f68e6d38a06c63344eea5d7132949b0f42777..00ac71ac0835ec1dd2413508d5be8069ac208f7f:/tbf.c?ds=sidebyside

diff --git a/tbf.c b/tbf.c
index 0f6cf5b..4ef7e4e 100644
--- a/tbf.c
+++ b/tbf.c
@@ -1,13 +1,8 @@
 // L2TPNS: token bucket filters
 
-char const *cvs_id_tbf = "$Id: tbf.c,v 1.6 2004-09-02 04:18:07 fred_nerk Exp $";
-
-#define _GNU_SOURCE
+char const *cvs_id_tbf = "$Id: tbf.c,v 1.9 2004-11-05 04:55:27 bodea Exp $";
 
 #include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-
 #include "l2tpns.h"
 #include "util.h"
 #include "tbf.h"
@@ -19,12 +14,12 @@ 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)
 {
-	if ((filter_list = shared_malloc(sizeof(*filter_list) * MAXTBFS)) == MAP_FAILED)
+	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.
 }
 //
@@ -59,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,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;
@@ -101,13 +96,11 @@ int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, u8 *, 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,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;
@@ -123,33 +116,8 @@ int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, u8 *, int))
 		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,0, "Ran out of token bucket filters!  Sess %d will be un-throttled\n", sid);
 	return 0;
-#endif
 }
 
 //
@@ -332,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,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);
 	}