welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify throttle logic

Browse source
This commit is contained in:
Brendan O'Dea 2007-01-25 12:36:48 +00:00
parent 6f39dc9569
commit 4a10d3188c
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ppp.c
View file

@ -1,6 +1,6 @@
// L2TPNS PPP Stuff // L2TPNS PPP Stuff
char const *cvs_id_ppp = "$Id: ppp.c,v 1.102 2006-08-02 13:35:39 bodea Exp $"; char const *cvs_id_ppp = "$Id: ppp.c,v 1.103 2007-01-25 12:36:48 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -1703,17 +1703,13 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
*(uint32_t *) p = htonl(PKTIP); *(uint32_t *) p = htonl(PKTIP);
l += 4; l += 4;
// Are we throttled and a slave? if (session[s].tbf_in)
if (session[s].tbf_in && !config->cluster_iam_master) { {
// Pass it to the master for handling. // Are we throttling this session?
master_throttle_packet(session[s].tbf_in, p, l); if (config->cluster_iam_master)
return; tbf_queue_packet(session[s].tbf_in, p, l);
} else
master_throttle_packet(session[s].tbf_in, p, l);
// Are we throttled and a master??
if (session[s].tbf_in && config->cluster_iam_master) {
// Actually handle the throttled packets.
tbf_queue_packet(session[s].tbf_in, p, l);
return; return;
} }