use LOG for logging macro
clean up initlcp handling
This commit is contained in:
parent
1a8d1e7b24
commit
4e0597cd50
14 changed files with 509 additions and 511 deletions
10
tbf.c
10
tbf.c
|
|
@ -1,6 +1,6 @@
|
|||
// L2TPNS: token bucket filters
|
||||
|
||||
char const *cvs_id_tbf = "$Id: tbf.c,v 1.8 2004-10-29 04:01:11 bodea Exp $";
|
||||
char const *cvs_id_tbf = "$Id: tbf.c,v 1.9 2004-11-05 04:55:27 bodea Exp $";
|
||||
|
||||
#include <string.h>
|
||||
#include "l2tpns.h"
|
||||
|
|
@ -54,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;
|
||||
|
|
@ -96,7 +96,7 @@ int new_tbf(int sid, int max_credit, int rate, void (*f)(sessionidt, u8 *, int))
|
|||
int i;
|
||||
static int p = 0;
|
||||
|
||||
log(4,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!
|
||||
|
|
@ -116,7 +116,7 @@ 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,0, "Ran out of token bucket filters! Sess %d will be un-throttled\n", sid);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -300,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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue