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

Fix intercepts: don't double-snoop throttled customers, ensure

Browse source 
byte/packet counts are only updated once
This commit is contained in:
bodea 2004-11-09 05:42:53 +00:00
parent e3afcf30c0
commit 1be4c47f88
3 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

47
ppp.c
View file

@ -1,6 +1,6 @@
// L2TPNS PPP Stuff
char const *cvs_id_ppp = "$Id: ppp.c,v 1.22 2004/11/05 23:18:54 bodea Exp $";
char const *cvs_id_ppp = "$Id: ppp.c,v 1.23 2004/11/09 05:42:53 bodea Exp $";
#include <stdio.h>
#include <string.h>
@ -709,12 +709,6 @@ void processipin(tunnelidt t, sessionidt s, u8 *p, u16 l)
return;
}
if (session[s].snoop_ip && session[s].snoop_port)
{
// Snooping this session
snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
}
// Add on the tun header
p -= 4;
*(u32 *)p = htonl(0x00000800);
@ -725,16 +719,6 @@ void processipin(tunnelidt t, sessionidt s, u8 *p, u16 l)
return;
}
session[s].cin += l - 4;
session[s].total_cin += l - 4;
sess_count[s].cin += l - 4;
session[s].pin++;
eth_tx += l - 4;
STAT(tun_tx_packets);
INC_STAT(tun_tx_bytes, l);
if (session[s].tbf_in && config->cluster_iam_master) { // Are we throttled and a master?? actually handle the throttled packets.
tbf_queue_packet(session[s].tbf_in, p, l);
return;
@ -746,8 +730,25 @@ void processipin(tunnelidt t, sessionidt s, u8 *p, u16 l)
STAT(tun_tx_errors);
LOG(0, 0, s, t, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n",
l, strerror(errno), tunfd, p);
return;
}
if (session[s].snoop_ip && session[s].snoop_port)
{
// Snooping this session
snoop_send_packet(p + 4, l - 4, session[s].snoop_ip, session[s].snoop_port);
}
session[s].cin += l - 4;
session[s].total_cin += l - 4;
sess_count[s].cin += l - 4;
session[s].pin++;
eth_tx += l - 4;
STAT(tun_tx_packets);
INC_STAT(tun_tx_bytes, l - 4);
}
//
@ -757,11 +758,20 @@ void processipin(tunnelidt t, sessionidt s, u8 *p, u16 l)
void send_ipin(sessionidt s, u8 *buf, int len)
{
LOG_HEX(5, "IP in throttled", buf, len);
if (write(tunfd, buf, len) < 0)
{
STAT(tun_tx_errors);
LOG(0, 0, 0, 0, "Error writing %d bytes to TUN device: %s (tunfd=%d, p=%p)\n",
len, strerror(errno), tunfd, buf);
return;
}
if (session[s].snoop_ip && session[s].snoop_port)
{
// Snooping this session
snoop_send_packet(p + 4, l - 4, session[s].snoop_ip, session[s].snoop_port);
}
// Increment packet counters
@ -771,6 +781,9 @@ void send_ipin(sessionidt s, u8 *buf, int len)
session[s].pin++;
eth_tx += len - 4;
STAT(tun_tx_packets);
INC_STAT(tun_tx_bytes, l - 4);
}