Merge branch 'master' into samesversion

[l2tpns.git] / pppoe.c

diff --git a/pppoe.c b/pppoe.c
index ca1c5e4..61b881b 100644 (file)
--- a/pppoe.c
+++ b/pppoe.c
@@ -903,7 +903,6 @@ void process_pppoe_disc(uint8_t *pack, int size)
        }
 }
 
-#ifdef LAC
 // Forward from pppoe to l2tp remote LNS
 static void pppoe_forwardto_session_rmlns(uint8_t *pack, int size, sessionidt sess, uint16_t proto)
 {
@@ -957,7 +956,6 @@ static void pppoe_forwardto_session_rmlns(uint8_t *pack, int size, sessionidt se
                // Update STAT OUT
                increment_counter(&session[s].cout, &session[s].cout_wrap, ll2tp); // byte count
                session[s].cout_delta += ll2tp;
-               session[s].coutgrp_delta += ll2tp;
                session[s].pout++;
                sess_local[s].cout += ll2tp;
                sess_local[s].pout++;
@@ -1029,7 +1027,6 @@ void pppoe_forwardto_session_pppoe(uint8_t *pack, int size, sessionidt sess, uin
                // Update STAT OUT
                increment_counter(&session[s].cout, &session[s].cout_wrap, lpppoe); // byte count
                session[s].cout_delta += lpppoe;
-               session[s].coutgrp_delta += lpppoe;
                session[s].pout++;
                sess_local[s].cout += lpppoe;
                sess_local[s].pout++;
@@ -1039,7 +1036,6 @@ void pppoe_forwardto_session_pppoe(uint8_t *pack, int size, sessionidt sess, uin
 
        tunnelsend(p, lpppoe, t); // send it....
 }
-#endif
 
 void process_pppoe_sess(uint8_t *pack, int size)
 {
@@ -1104,13 +1100,11 @@ void process_pppoe_sess(uint8_t *pack, int size)
                lppp -= 2;
        }
 
-#ifdef LAC
        if (session[sid].forwardtosession)
        {       // Must be forwaded to a remote lns tunnel l2tp
                pppoe_forwardto_session_rmlns(pack, size, sid, proto);
                return;
        }
-#endif
 
        if (proto == PPPPAP)
        {