X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/dff555697a1dbdd6fd420683d70a045bc6615f27..2cce196e64eec4f5d3bc79f2f14109557c85cabb:/tbf.c?ds=inline

diff --git a/tbf.c b/tbf.c
index 3c8a211..117ebd8 100644
--- a/tbf.c
+++ b/tbf.c
@@ -1,8 +1,9 @@
 // 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.6 2004/09/02 04:18:07 fred_nerk Exp $";
+
+#define _GNU_SOURCE
 
-#include <malloc.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
@@ -11,41 +12,8 @@ char const *cvs_id_tbf = "$Id: tbf.c,v 1.3 2004/07/02 07:31:23 bodea Exp $";
 #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.
 
@@ -53,8 +21,7 @@ static void tbf_run_queue(int tbf_id);
 
 void init_tbf(void)
 {
-	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) * MAXTBFS)) == MAP_FAILED)
 		return;
 
 	filter_list_size = MAXTBFS;
@@ -156,23 +123,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.
 
-	i = filter_list_size;
-	filter_list_size = filter_list_size * 2 + 1;
+	{
+		int new_size = filter_list_size * 2;
+		tbft *new = mremap(filter_list, filter_list_size * sizeof(*new), new_size * sizeof(*new), MREMAP_MAYMOVE);
 
-	filter_list = realloc(filter_list, filter_list_size * sizeof(*filter_list) );
+		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);
+	return 0;
 #endif
 }