Merge from Master

[l2tpns.git] / l2tplac.c

diff --git a/l2tplac.c b/l2tplac.c
index d41a26d..5fb361e 100644 (file)
--- a/l2tplac.c
+++ b/l2tplac.c
@@ -7,10 +7,11 @@
 
 #include <errno.h>
 #include <string.h>
 
 #include <errno.h>
 #include <string.h>

-#include <sys/socket.h>

 #include <linux/rtnetlink.h>
 #include <linux/rtnetlink.h>

+#include <netinet/ip6.h>

 
 #include "md5.h"
 
 #include "md5.h"

+#include "dhcp6.h"

 #include "l2tpns.h"
 #include "util.h"
 #include "cluster.h"
 #include "l2tpns.h"
 #include "util.h"
 #include "cluster.h"


@@ -528,7 +529,6 @@ int lac_session_forward(uint8_t *buf, int len, sessionidt sess, uint16_t proto,
                // Update STAT OUT
                increment_counter(&session[s].cout, &session[s].cout_wrap, len); // byte count
                session[s].cout_delta += len;
                // Update STAT OUT
                increment_counter(&session[s].cout, &session[s].cout_wrap, len); // byte count
                session[s].cout_delta += len;

-               session[s].coutgrp_delta += len;

                session[s].pout++;
                sess_local[s].cout += len;
                sess_local[s].pout++;
                session[s].pout++;
                sess_local[s].cout += len;
                sess_local[s].pout++;