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

Consolidate stat update code

Browse source 
into
update_session_in_stat
update_session_out_stat
This commit is contained in:
Samuel Thibault 2023-04-23 16:47:26 +02:00
parent 1db43fc51d
commit c7853de428
5 changed files with 41 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

36
pppoe.c
View file

@ -955,21 +955,9 @@ static void pppoe_forwardto_session_rmlns(uint8_t *pack, int size, sessionidt se
if ((proto == PPPIP) || (proto == PPPMP) ||(proto == PPPIPV6 && config->ipv6_prefix.s6_addr[0]))
{
session[sess].last_packet = session[sess].last_data = time_now;
// Update STAT IN
increment_counter(&session[sess].cin, &session[sess].cin_wrap, ll2tp);
session[sess].cin_delta += ll2tp;
session[sess].pin++;
sess_local[sess].cin += ll2tp;
sess_local[sess].pin++;
session[s].last_data = time_now;
// Update STAT OUT
increment_counter(&session[s].cout, &session[s].cout_wrap, ll2tp); // byte count
session[s].cout_delta += ll2tp;
session[s].pout++;
sess_local[s].cout += ll2tp;
sess_local[s].pout++;
session[sess].last_packet = time_now;
update_session_in_stat(s, 1, ll2tp);
update_session_out_stat(s, 1, ll2tp);
}
else
session[sess].last_packet = time_now;
@ -1026,21 +1014,9 @@ void pppoe_forwardto_session_pppoe(uint8_t *pack, int size, sessionidt sess, uin
if ((proto == PPPIP) || (proto == PPPMP) ||(proto == PPPIPV6 && config->ipv6_prefix.s6_addr[0]))
{
session[sess].last_packet = session[sess].last_data = time_now;
// Update STAT IN
increment_counter(&session[sess].cin, &session[sess].cin_wrap, lpppoe);
session[sess].cin_delta += lpppoe;
session[sess].pin++;
sess_local[sess].cin += lpppoe;
sess_local[sess].pin++;
session[s].last_data = time_now;
// Update STAT OUT
increment_counter(&session[s].cout, &session[s].cout_wrap, lpppoe); // byte count
session[s].cout_delta += lpppoe;
session[s].pout++;
sess_local[s].cout += lpppoe;
sess_local[s].pout++;
session[sess].last_packet = time_now;
update_session_in_stat(s, 1, lpppoe);
update_session_out_stat(s, 1, lpppoe);
}
else
session[sess].last_packet = time_now;