From: fendo <fendo@bi12info.com>
Date: Sun, 14 Sep 2014 17:00:57 +0000 (+0200)
Subject: Merge from Master
X-Git-Tag: 2.2.1-2sames3.14
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/refs/tags/2.2.1-2sames3.14?hp=935445b29ab2952f928f347e0446bc81ab5f6229

Merge from Master
---

diff --git a/Makefile b/Makefile
index 36789e3..abab4e0 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ INSTALL = install -c -D -o root -g root
 l2tpns.LIBS = -lcli -ldl
 
 OBJS = arp.o cli.o cluster.o constants.o control.o icmp.o l2tpns.o \
-    ll.o md5.o ppp.o radius.o tbf.o util.o pppoe.o l2tplac.o dhcp6.o ipv6_u.o
+    ll.o md5.o ppp.o radius.o tbf.o util.o pppoe.o l2tplac.o grpsess.o dhcp6.o ipv6_u.o
 
 PROGRAMS = l2tpns nsctl
 PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \
@@ -129,6 +129,7 @@ util.o: util.c dhcp6.h l2tpns.h bgp.h
 pppoe.o: pppoe.c dhcp6.h l2tpns.h cluster.h constants.h md5.h util.h
 l2tplac.o: l2tplac.c md5.h dhcp6.h l2tpns.h util.h cluster.h l2tplac.h \
  pppoe.h
+grpsess.o: grpsess.c l2tpns.h util.h cluster.h bgp.h
 dhcp6.o: dhcp6.c dhcp6.h l2tpns.h ipv6_u.h
 ipv6_u.o: ipv6_u.c ipv6_u.h
 bgp.o: bgp.c dhcp6.h l2tpns.h bgp.h util.h
diff --git a/arp.c b/arp.c
index 0aae069..111f973 100644
--- a/arp.c
+++ b/arp.c
@@ -5,6 +5,7 @@
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <linux/if_packet.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
 
 #include "dhcp6.h"
diff --git a/autosnoop.c b/autosnoop.c
index c520aaf..ed91a88 100644
--- a/autosnoop.c
+++ b/autosnoop.c
@@ -1,6 +1,8 @@
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
 #include "dhcp6.h"
+
 #include "l2tpns.h"
 #include "plugin.h"
 
diff --git a/autothrottle.c b/autothrottle.c
index 9d55456..25dd647 100644
--- a/autothrottle.c
+++ b/autothrottle.c
@@ -1,6 +1,8 @@
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
 #include "dhcp6.h"
+
 #include "l2tpns.h"
 #include "plugin.h"
 
diff --git a/bgp.c b/bgp.c
index 2791ca3..c44f05d 100644
--- a/bgp.c
+++ b/bgp.c
@@ -20,6 +20,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <linux/rtnetlink.h>
 
 #include "dhcp6.h"
 #include "l2tpns.h"
diff --git a/cli.c b/cli.c
index e63d73e..fee9319 100644
--- a/cli.c
+++ b/cli.c
@@ -21,6 +21,7 @@
 #include <dlfcn.h>
 #include <netdb.h>
 #include <libcli.h>
+#include <linux/rtnetlink.h>
 
 #include "dhcp6.h"
 #include "l2tpns.h"
@@ -76,6 +77,7 @@ static char *debug_levels[] = {
 #endif
 
 static int cmd_show_session(struct cli_def *cli, const char *command, char **argv, int argc);
+static int cmd_show_group(struct cli_def *cli, const char *command, char **argv, int argc);
 static int cmd_show_tunnels(struct cli_def *cli, const char *command, char **argv, int argc);
 static int cmd_show_users(struct cli_def *cli, const char *command, char **argv, int argc);
 static int cmd_show_radius(struct cli_def *cli, const char *command, char **argv, int argc);
@@ -155,6 +157,7 @@ void init_cli()
 	cli_register_command(cli, c, "running-config", cmd_show_run, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show the currently running configuration");
 	cli_register_command(cli, c, "remotelns-conf", cmd_show_rmtlnsconf, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show a list of remote LNS configuration");
 	cli_register_command(cli, c, "session", cmd_show_session, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of sessions or details for a single session");
+	cli_register_command(cli, c, "group", cmd_show_group, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of groups or details for a single group");
 	cli_register_command(cli, c, "tbf", cmd_show_tbf, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all token bucket filters in use");
 	cli_register_command(cli, c, "throttle", cmd_show_throttle, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all throttled sessions and associated TBFs");
 	cli_register_command(cli, c, "tunnels", cmd_show_tunnels, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of tunnels or details for a single tunnel");
@@ -3111,6 +3114,77 @@ static int cmd_reload(struct cli_def *cli, const char *command, char **argv, int
 	return CLI_OK;
 }
 
+static int cmd_show_group(struct cli_def *cli, const char *command, char **argv, int argc)
+{
+	int i;
+	groupidt g;
+
+	if (CLI_HELP_REQUESTED)
+		return cli_arg_help(cli, 1,
+			"<1-%d>", MAXGROUPE-1, "Show specific group by id",
+			NULL);
+
+	time(&time_now);
+	if (argc > 0)
+	{
+		// Show individual group
+		for (i = 0; i < argc; i++)
+		{
+			sessionidt s;
+
+			g = atoi(argv[i]);
+			if (g <= 0 || g >= MAXGROUPE)
+			{
+				cli_print(cli, "Invalid group id \"%s\"", argv[i]);
+				continue;
+			}
+
+			cli_print(cli, "\r\nGroup %d:", g);
+			cli_print(cli, "\tNb Session:\t\t%d", grpsession[g].nbsession);
+			cli_print(cli, "\tNb Routes:\t\t%d", grpsession[g].nbroutesgrp);
+			cli_print(cli, "\ttime_changed:\t\t%d\n", grpsession[g].time_changed);
+
+			for (i = 0; i < grpsession[g].nbsession; i++)
+			{
+				if ((s = grpsession[g].sesslist[i].sid))
+				{
+					cli_print(cli, "\tSession:\t%d\tTx Rate:%d Kbps\t\t\tweight:\t%d",
+								s,
+								grpsession[g].sesslist[i].tx_rate/(1024/8),
+								grpsession[g].sesslist[i].weight);
+				}
+			}
+
+			for (i = 0; i < grpsession[g].nbroutesgrp; i++)
+			{
+				if (grpsession[g].route[i].ip != 0)
+				{
+					cli_print(cli, "\tRoute:\t%s/%d", fmtaddr(htonl(grpsession[g].route[i].ip), 0), grpsession[g].route[i].prefixlen);
+				}
+			}
+		}
+		return CLI_OK;
+	}
+
+	// Show Summary
+	cli_print(cli, "%5s %7s %9s %12s",
+			"GID",
+			"Nb Sess",
+			"Nb Routes",
+			"Time changed");
+
+	for (g = gnextgrpid; g != 0; g = grpsession[g].prev)
+	{
+		cli_print(cli, "%5d %7d %9d %12d",
+					g,
+					grpsession[g].nbsession,
+					grpsession[g].nbroutesgrp,
+					grpsession[g].time_changed);
+	}
+
+	return CLI_OK;
+}
+
 static int cmd_setforward(struct cli_def *cli, const char *command, char **argv, int argc)
 {
 	int ret;
diff --git a/cluster.c b/cluster.c
index 5d2b5b8..8e604db 100644
--- a/cluster.c
+++ b/cluster.c
@@ -16,6 +16,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <libcli.h>
+#include <linux/rtnetlink.h>
 
 #include "dhcp6.h"
 #include "l2tpns.h"
@@ -44,6 +45,7 @@ in_addr_t my_address = 0;		// The network address of my ethernet port.
 static int walk_session_number = 0;	// The next session to send when doing the slow table walk.
 static int walk_bundle_number = 0;	// The next bundle to send when doing the slow table walk.
 static int walk_tunnel_number = 0;	// The next tunnel to send when doing the slow table walk.
+static int walk_groupe_number = 0;	// The next groupe to send when doing the slow table walk.
 int forked = 0;				// Sanity check: CLI must not diddle with heartbeat table
 
 #define MAX_HEART_SIZE (8192)	// Maximum size of heartbeat packet. Must be less than max IP packet size :)
@@ -88,6 +90,7 @@ int cluster_init()
 	config->cluster_undefined_sessions = MAXSESSION-1;
 	config->cluster_undefined_bundles = MAXBUNDLE-1;
 	config->cluster_undefined_tunnels = MAXTUNNEL-1;
+	config->cluster_undefined_groupes = MAXGROUPE-1;
 
 	if (!config->cluster_address)
 		return 0;
@@ -229,7 +232,8 @@ static void cluster_uptodate(void)
 	if (config->cluster_iam_uptodate)
 		return;
 
-	if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels || config->cluster_undefined_bundles)
+	if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels ||
+		config->cluster_undefined_bundles || config->cluster_undefined_groupes)
 		return;
 
 	config->cluster_iam_uptodate = 1;
@@ -454,7 +458,8 @@ void cluster_send_ping(time_t basetime)
 
 	x.ver = 1;
 	x.addr = config->bind_address;
-	x.undef = config->cluster_undefined_sessions + config->cluster_undefined_tunnels + config->cluster_undefined_bundles;
+	x.undef = config->cluster_undefined_sessions + config->cluster_undefined_tunnels +
+			config->cluster_undefined_groupes + config->cluster_undefined_bundles;
 	x.basetime = basetime;
 
 	add_type(&p, C_PING, basetime, (uint8_t *) &x, sizeof(x));
@@ -676,6 +681,20 @@ void cluster_check_master(void)
                         config->cluster_highest_bundleid = i;
         }
 
+		//
+		// Go through and mark all the groupes as defined.
+		// Count the highest used groupe number as well.
+		//
+		config->cluster_highest_groupeid = 0;
+		for (i = 0; i < MAXGROUPE; ++i)
+		{
+			if (grpsession[i].state == GROUPEUNDEF)
+				grpsession[i].state = GROUPEFREE;
+
+			if (grpsession[i].state != GROUPEFREE && i > config->cluster_highest_groupeid)
+				config->cluster_highest_groupeid = i;
+		}
+
 		//
 		// Go through and mark all the sessions as being defined.
 		// reset the idle timeouts.
@@ -743,6 +762,7 @@ void cluster_check_master(void)
 	config->cluster_undefined_sessions = 0;
 	config->cluster_undefined_bundles = 0;
 	config->cluster_undefined_tunnels = 0;
+	config->cluster_undefined_groupes = 0;
 	config->cluster_iam_uptodate = 1; // assume all peers are up-to-date
 
 	// FIXME. We need to fix up the tunnel control message
@@ -759,7 +779,7 @@ void cluster_check_master(void)
 // we fix it up here, and we ensure that the 'first free session'
 // pointer is valid.
 //
-static void cluster_check_sessions(int highsession, int freesession_ptr, int highbundle, int hightunnel)
+static void cluster_check_sessions(int highsession, int freesession_ptr, int highbundle, int hightunnel, int highgroupe)
 {
 	int i;
 
@@ -768,7 +788,8 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
 	if (config->cluster_iam_uptodate)
 		return;
 
-	if (highsession > config->cluster_undefined_sessions && highbundle > config->cluster_undefined_bundles && hightunnel > config->cluster_undefined_tunnels)
+	if (highsession > config->cluster_undefined_sessions && highbundle > config->cluster_undefined_bundles &&
+		highgroupe > config->cluster_undefined_groupes && hightunnel > config->cluster_undefined_tunnels)
 		return;
 
 		// Clear out defined sessions, counting the number of
@@ -810,10 +831,23 @@ static void cluster_check_sessions(int highsession, int freesession_ptr, int hig
 			++config->cluster_undefined_tunnels;
 	}
 
+	// Clear out defined groupe, counting the number of
+	// undefs remaining.
+	config->cluster_undefined_groupes = 0;
+	for (i = 1 ; i < MAXGROUPE; ++i) {
+		if (i > highgroupe) {
+			if (grpsession[i].state == GROUPEUNDEF) grpsession[i].state = GROUPEFREE; // Defined.
+			continue;
+		}
+
+		if (grpsession[i].state == GROUPEUNDEF)
+			++config->cluster_undefined_groupes;
+	}
 
-	if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels || config->cluster_undefined_bundles) {
-		LOG(2, 0, 0, "Cleared undefined sessions/bundles/tunnels. %d sess (high %d), %d bund (high %d), %d tunn (high %d)\n",
-			config->cluster_undefined_sessions, highsession, config->cluster_undefined_bundles, highbundle, config->cluster_undefined_tunnels, hightunnel);
+	if (config->cluster_undefined_sessions || config->cluster_undefined_tunnels || config->cluster_undefined_bundles || config->cluster_undefined_groupes) {
+		LOG(2, 0, 0, "Cleared undefined sessions/bundles/tunnels. %d sess (high %d), %d bund (high %d), %d grp (high %d), %d tunn (high %d)\n",
+			config->cluster_undefined_sessions, highsession, config->cluster_undefined_bundles, highbundle,
+			config->cluster_undefined_groupes, highgroupe, config->cluster_undefined_tunnels, hightunnel);
 		return;
 	}
 
@@ -867,6 +901,27 @@ static int hb_add_type(uint8_t **p, int type, int id)
 		    	add_type(p, C_BUNDLE, id, (uint8_t *) &bundle[id], sizeof(bundlet));
 			break;
 
+		case C_CGROUPE: { // Compressed C_GROUPE
+			uint8_t c[sizeof(groupsesst) * 2]; // Bigger than worst case.
+			uint8_t *d = (uint8_t *) &grpsession[id];
+			uint8_t *orig = d;
+			int size;
+
+			size = rle_compress( &d,  sizeof(groupsesst), c, sizeof(c) );
+
+			// Did we compress the full structure, and is the size actually
+			// reduced??
+			if ( (d - orig) == sizeof(groupsesst) && size < sizeof(groupsesst) )
+			{
+				add_type(p, C_CGROUPE, id, c, size);
+				break;
+			}
+			// Failed to compress : Fall through.
+		}
+		case C_GROUPE:
+			add_type(p, C_GROUPE, id, (uint8_t *) &grpsession[id], sizeof(groupsesst));
+			break;
+
 		case C_CTUNNEL: { // Compressed C_TUNNEL
 			uint8_t c[sizeof(tunnelt) * 2]; // Bigger than worst case.
 			uint8_t *d = (uint8_t *) &tunnel[id];
@@ -899,7 +954,7 @@ static int hb_add_type(uint8_t **p, int type, int id)
 //
 void cluster_heartbeat()
 {
-	int i, count = 0, tcount = 0, bcount = 0;
+	int i, count = 0, tcount = 0, bcount = 0, gcount = 0;
 	uint8_t buff[MAX_HEART_SIZE + sizeof(heartt) + sizeof(int) ];
 	heartt h;
 	uint8_t *p = buff;
@@ -921,9 +976,11 @@ void cluster_heartbeat()
 	h.freesession = sessionfree;
 	h.hightunnel = config->cluster_highest_tunnelid;
 	h.highbundle = config->cluster_highest_bundleid;
+	h.highgroupe = config->cluster_highest_groupeid;
 	h.size_sess = sizeof(sessiont);		// Just in case.
 	h.size_bund = sizeof(bundlet);
 	h.size_tunn = sizeof(tunnelt);
+	h.nextgrpid = gnextgrpid;
 	h.interval = config->cluster_hb_interval;
 	h.timeout  = config->cluster_hb_timeout;
 	h.table_version = config->cluster_table_version;
@@ -942,7 +999,7 @@ void cluster_heartbeat()
 
 		//
 		// Fill out the packet with sessions from the session table...
-		// (not forgetting to leave space so we can get some tunnels in too )
+		// (not forgetting to leave space so we can get some tunnels,bundle,groupe in too )
 	while ( (p + sizeof(uint32_t) * 2 + sizeof(sessiont) * 2 ) < (buff + MAX_HEART_SIZE) ) {
 
 		if (!walk_session_number)	// session #0 isn't valid.
@@ -957,40 +1014,59 @@ void cluster_heartbeat()
 		++count;			// Count the number of extra sessions we're sending.
 	}
 
-		//
-		// Fill out the packet with tunnels from the tunnel table...
-		// This effectively means we walk the tunnel table more quickly
-		// than the session table. This is good because stuffing up a 
-		// tunnel is a much bigger deal than stuffing up a session.
-		//
-	while ( (p + sizeof(uint32_t) * 2 + sizeof(tunnelt) ) < (buff + MAX_HEART_SIZE) ) {
+	//
+	// Fill out the packet with tunnels from the tunnel table...
+	// This effectively means we walk the tunnel table more quickly
+	// than the session table. This is good because stuffing up a
+	// tunnel is a much bigger deal than stuffing up a session.
+	//
+	int maxsize = (sizeof(tunnelt) < sizeof(bundlet)) ? sizeof(bundlet):sizeof(tunnelt);
+	maxsize = (sizeof(groupsesst) < maxsize) ? maxsize:sizeof(groupsesst);
+	maxsize += (sizeof(uint32_t) * 2);
+
+	// Fill out the packet with tunnels,bundlets, groupes from the tables...
+	while ( (p + maxsize) < (buff + MAX_HEART_SIZE) )
+	{
+		if ((tcount >= config->cluster_highest_tunnelid) &&
+			(bcount >= config->cluster_highest_bundleid) &&
+			(gcount >= config->cluster_highest_groupeid))
+				break;
 
-		if (!walk_tunnel_number)	// tunnel #0 isn't valid.
-			++walk_tunnel_number;
+		if ( ((p + sizeof(uint32_t) * 2 + sizeof(tunnelt) ) < (buff + MAX_HEART_SIZE)) &&
+			 (tcount < config->cluster_highest_tunnelid))
+		{
+			if (!walk_tunnel_number)	// tunnel #0 isn't valid.
+				++walk_tunnel_number;
 
-		if (tcount >= config->cluster_highest_tunnelid)
-			break;
+			hb_add_type(&p, C_CTUNNEL, walk_tunnel_number);
+			walk_tunnel_number = (1+walk_tunnel_number)%(config->cluster_highest_tunnelid+1);	// +1 avoids divide by zero.
 
-		hb_add_type(&p, C_CTUNNEL, walk_tunnel_number);
-		walk_tunnel_number = (1+walk_tunnel_number)%(config->cluster_highest_tunnelid+1);	// +1 avoids divide by zero.
+			++tcount;
+		}
 
-		++tcount;
-	}
+		if ( ((p + sizeof(uint32_t) * 2 + sizeof(bundlet) ) < (buff + MAX_HEART_SIZE)) &&
+			 (bcount < config->cluster_highest_bundleid))
+		{
+			if (!walk_bundle_number)        // bundle #0 isn't valid.
+				++walk_bundle_number;
 
-		//
-		// Fill out the packet with bundles from the bundle table...
-	while ( (p + sizeof(uint32_t) * 2 + sizeof(bundlet) ) < (buff + MAX_HEART_SIZE) ) {
+			hb_add_type(&p, C_CBUNDLE, walk_bundle_number);
+			walk_bundle_number = (1+walk_bundle_number)%(config->cluster_highest_bundleid+1);	// +1 avoids divide by zero.
 
-		if (!walk_bundle_number)        // bundle #0 isn't valid.
-			++walk_bundle_number;
+			++bcount;
+		}
 
-		if (bcount >= config->cluster_highest_bundleid)
-			break;
+		if ( ((p + sizeof(uint32_t) * 2 + sizeof(groupsesst) ) < (buff + MAX_HEART_SIZE)) &&
+			 (gcount < config->cluster_highest_groupeid))
+		{
+			if (!walk_groupe_number)	// groupe #0 isn't valid.
+				++walk_groupe_number;
 
-		hb_add_type(&p, C_CBUNDLE, walk_bundle_number);
-		walk_bundle_number = (1+walk_bundle_number)%(config->cluster_highest_bundleid+1);	// +1 avoids divide by zero.
-		++bcount;
-        }
+			hb_add_type(&p, C_CGROUPE, walk_groupe_number);
+			walk_groupe_number = (1+walk_groupe_number)%(config->cluster_highest_groupeid+1);	// +1 avoids divide by zero.
+			++gcount;
+		}
+	}
 
 		//
 		// Did we do something wrong?
@@ -1001,10 +1077,10 @@ void cluster_heartbeat()
 	}
 
 	LOG(4, 0, 0, "Sending v%d heartbeat #%d, change #%" PRIu64 " with %d changes "
-		     "(%d x-sess, %d x-bundles, %d x-tunnels, %d highsess, %d highbund, %d hightun, size %d)\n",
+		     "(%d x-sess, %d x-bundles, %d x-tunnels, %d x-groupes, %d highsess, %d highbund, %d hightun, %d highgrp, size %d)\n",
 	    HB_VERSION, h.seq, h.table_version, config->cluster_num_changes,
-	    count, bcount, tcount, config->cluster_highest_sessionid, config->cluster_highest_bundleid,
-	    config->cluster_highest_tunnelid, (int) (p - buff));
+	    count, bcount, tcount, gcount, config->cluster_highest_sessionid, config->cluster_highest_bundleid,
+	    config->cluster_highest_tunnelid, config->cluster_highest_groupeid, (int) (p - buff));
 
 	config->cluster_num_changes = 0;
 
@@ -1070,6 +1146,18 @@ int cluster_send_bundle(int bid)
 	return type_changed(C_CBUNDLE, bid);
 }
 
+// A particular groupe has been changed!
+int cluster_send_groupe(int gid)
+{
+	if (!config->cluster_iam_master)
+	{
+		LOG(0, 0, gid, "I'm not a master, but I just tried to change a groupe!\n");
+		return -1;
+	}
+
+	return type_changed(C_CGROUPE, gid);
+}
+
 // A particular tunnel has been changed!
 int cluster_send_tunnel(int tid)
 {
@@ -1334,6 +1422,31 @@ static int cluster_recv_bundle(int more, uint8_t *p)
         return 0;
 }
 
+static int cluster_recv_groupe(int more, uint8_t *p)
+{
+	if (more >= MAXGROUPE) {
+		LOG(0, 0, 0, "DANGER: Received a group id > MAXGROUPE!\n");
+		return -1;
+	}
+
+	if (grpsession[more].state == GROUPEUNDEF) {
+		if (config->cluster_iam_uptodate) { // Sanity.
+			LOG(0, 0, 0, "I thought I was uptodate but I just found an undefined group!\n");
+		} else {
+			--config->cluster_undefined_groupes;
+		}
+	}
+
+	grp_cluster_load_groupe(more, (groupsesst *) p);	// Copy groupe into groupe table..
+
+	LOG(5, 0, more, "Received group update (%d undef)\n", config->cluster_undefined_groupes);
+
+	if (!config->cluster_iam_uptodate)
+		cluster_uptodate();     // Check to see if we're up to date.
+
+        return 0;
+}
+
 static int cluster_recv_tunnel(int more, uint8_t *p)
 {
 	if (more >= MAXTUNNEL) {
@@ -1630,9 +1743,10 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
 	memcpy(&past_hearts[i].data, data, size);	// Save it.
 
 
-			// Check that we don't have too many undefined sessions, and
-			// that the free session pointer is correct.
-	cluster_check_sessions(h->highsession, h->freesession, h->highbundle, h->hightunnel);
+	// Check that we don't have too many undefined sessions, and
+	// that the free session pointer is correct.
+	gnextgrpid = h->nextgrpid;
+	cluster_check_sessions(h->highsession, h->freesession, h->highbundle, h->hightunnel, h->highgroupe);
 
 	if (h->interval != config->cluster_hb_interval)
 	{
@@ -1780,6 +1894,36 @@ static int cluster_process_heartbeat(uint8_t *data, int size, int more, uint8_t
                                 p += sizeof(bundle[more]);
                                 s -= sizeof(bundle[more]);
                                 break;
+
+			case C_CGROUPE:
+			{ // Compressed Groupe structure.
+				uint8_t c[ sizeof(groupsesst) + 2];
+				int size;
+				uint8_t *orig_p = p;
+
+				size = rle_decompress((uint8_t **) &p, s, c, sizeof(c));
+				s -= (p - orig_p);
+
+				if (size != sizeof(groupsesst) )
+				{ // Ouch! Very very bad!
+					LOG(0, 0, 0, "DANGER: Received a C_CGROUPE that didn't decompress correctly!\n");
+					// Now what? Should exit! No-longer up to date!
+					break;
+				}
+
+				cluster_recv_groupe(more, c);
+				break;
+			}
+			case C_GROUPE:
+				if ( s < sizeof(grpsession[more]))
+					goto shortpacket;
+
+				cluster_recv_groupe(more, p);
+
+				p += sizeof(grpsession[more]);
+				s -= sizeof(grpsession[more]);
+			break;
+
 			default:
 				LOG(0, 0, 0, "DANGER: I received a heartbeat element where I didn't understand the type! (%d)\n", type);
 				return -1; // can't process any more of the packet!!
@@ -1989,12 +2133,14 @@ int cmd_show_cluster(struct cli_def *cli, const char *command, char **argv, int
 		cli_print(cli, "Next sequence number expected: %d", config->cluster_seq_number);
 		cli_print(cli, "%d sessions undefined of %d", config->cluster_undefined_sessions, config->cluster_highest_sessionid);
 		cli_print(cli, "%d bundles undefined of %d", config->cluster_undefined_bundles, config->cluster_highest_bundleid);
+		cli_print(cli, "%d groupes undefined of %d", config->cluster_undefined_groupes, config->cluster_highest_groupeid);
 		cli_print(cli, "%d tunnels undefined of %d", config->cluster_undefined_tunnels, config->cluster_highest_tunnelid);
 	} else {
 		cli_print(cli, "Table version #  : %" PRIu64, config->cluster_table_version);
 		cli_print(cli, "Next heartbeat # : %d", config->cluster_seq_number);
 		cli_print(cli, "Highest session  : %d", config->cluster_highest_sessionid);
 		cli_print(cli, "Highest bundle   : %d", config->cluster_highest_bundleid);
+		cli_print(cli, "Highest groupe   : %d", config->cluster_highest_groupeid);
 		cli_print(cli, "Highest tunnel   : %d", config->cluster_highest_tunnelid);
 		cli_print(cli, "%d changes queued for sending", config->cluster_num_changes);
 	}
diff --git a/cluster.h b/cluster.h
index b7a91f1..290c589 100644
--- a/cluster.h
+++ b/cluster.h
@@ -25,6 +25,9 @@
 #define C_CBUNDLE		18	// Compressed bundle structure.
 #define C_MPPP_FORWARD	19	// MPPP Forwarded packet..
 #define C_PPPOE_FORWARD	20	// PPPOE Forwarded packet..
+#define C_GROUPE		21	// Groupe structure.
+#define C_CGROUPE		22	// Compressed groupe structure.
+
 
 #define HB_VERSION		8	// Protocol version number..
 #define HB_MAX_SEQ		(1<<30)	// Maximum sequence number. (MUST BE A POWER OF 2!)
@@ -58,7 +61,10 @@ typedef struct {
 
 	uint64_t table_version;	// # state changes processed by cluster
 
-	char reserved[128 - 13*sizeof(uint32_t) - sizeof(uint64_t)];	// Pad out to 128 bytes.
+	uint32_t highgroupe;	// Id of the highest used groupe.
+	uint32_t nextgrpid;	// nextgrpid to set gnextgrpid on slave
+
+	char reserved[128 - 15*sizeof(uint32_t) - sizeof(uint64_t)];	// Pad out to 128 bytes.
 } heartt;
 
 typedef struct {		/* Used to update byte counters on the */
@@ -81,6 +87,7 @@ int cluster_init(void);
 int processcluster(uint8_t *buf, int size, in_addr_t addr);
 int cluster_send_session(int sid);
 int cluster_send_bundle(int bid);
+int cluster_send_groupe(int gid);
 int cluster_send_tunnel(int tid);
 int master_forward_packet(uint8_t *data, int size, in_addr_t addr, uint16_t port, uint16_t indexudp);
 int master_forward_dae_packet(uint8_t *data, int size, in_addr_t addr, int port);
diff --git a/control.c b/control.c
index 1ccd07a..8aeb48c 100644
--- a/control.c
+++ b/control.c
@@ -1,8 +1,10 @@
 // L2TPNS: control
 
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
 #include "dhcp6.h"
+
 #include "l2tpns.h"
 #include "control.h"
 
diff --git a/debian/changelog b/debian/changelog
index 6b7ff2e..1c96e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,13 @@
-l2tpns (2.2.1-2fdn3.14) unstable; urgency=low
+l2tpns (2.2.1-2sames3.14) unstable; urgency=low
 
   * Fix cluster slave; reset to 0, the end of the session when the master version < slave version.
   * Fix cluster slave; no add the ipv6 route address (/128) if included in the delegated prefix.
-
- -- Fernando Alves <fendo@sameswifi.fr>  Fri, 12 Sep 2014 18:21:53 +0200
-
-l2tpns (2.2.1-2fdn3.13) unstable; urgency=low
-
   * Add DHCPv6 functionality
-
- -- Fernando Alves <fendo@sameswifi.fr>  Thu, 11 Sep 2014 16:10:38 +0200
-
-l2tpns (2.2.1-2fdn3.12) unstable; urgency=low
-
   * Fix: remove old IPV6 routes on master
 
- -- Fernando Alves <fendo@sameswifi.fr>  Tue, 10 Dec 2013 23:13:20 +0100
+ -- Fernando Alves <fendo@sameswifi.fr>  Sun, 14 Sep 2014 18:27:09 +0200
 
-l2tpns (2.2.1-2fdn3.11) unstable; urgency=low
+l2tpns (2.2.1-2sames3.12) UNRELEASED; urgency=low
 
   * Fix: throttle ipv6 out.
   * Fix: remove old IPV6 routes on slave
@@ -31,43 +21,56 @@ l2tpns (2.2.1-2fdn3.11) unstable; urgency=low
   * Bump Standards-Version to 3.9.4.0
   * Add build-arch/build-indep targets to debian/rules
   * Fix: compiling Warning
+  * improved load balancing algorithm.
+
+ -- Fernando Alves <fernando.alves@sameswireless.fr>  Sun, 07 Oct 2013 22:20:53 +0200
+
+l2tpns (2.2.1-2sames3.11) unstable; urgency=low
 
- -- Fernando Alves <fendo@sameswifi.fr>  Tue, 10 Dec 2013 23:08:45 +0100
+  * improved load balancing algorithm.
 
-l2tpns (2.2.1-2fdn3.10) unstable; urgency=low
+ -- Fernando Alves <fernando.alves@sameswireless.fr>  Fri, 02 Aug 2013 11:32:49 +0200
+
+l2tpns (2.2.1-2sames3.10) unstable; urgency=low
 
   * Fix: authentication success was sent 2 times.
+  * Fix: session mismatch on group.
 
- -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 04 Jun 2013 11:38:04 +0200
+ -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 04 Jun 2013 14:36:37 +0200
 
-l2tpns (2.2.1-2fdn3.9) unstable; urgency=low
+l2tpns (2.2.1-2sames3.9) unstable; urgency=low
 
   * Adding the possibility to set multiple hostname.
 
- -- Fernando Alves <fernando.alves@sameswireless.fr>  Thu, 23 May 2013 23:58:23 +0200
+ -- Fernando Alves <fernando.alves@sameswireless.fr>  Wed, 22 May 2013 22:25:59 +0200
 
-l2tpns (2.2.1-2fdn3.8) unstable; urgency=low
+l2tpns (2.2.1-2sames3.8) unstable; urgency=low
 
-  * Fix: send SCCCN requested challenge response.
+  * Fix send SCCCN requested challenge response.
   * add accounting parameter account_all_origin.
   * Fix service_name management and add pppoe_only_equal_svc_name parameter.
+  * Fix cluster group update.
+  * Fix possible IPv6 spoofing.
+  * manage groupes in cluster mode.
+  * Adding the possibility to listening multiple IP L2TP tunnels.
+  * Add cli show group and update rate calculation.
 
- -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 30 Apr 2013 16:02:33 +0200
-
-l2tpns (2.2.1-2fdn3.7) unstable; urgency=low
-
-  * Adding the possibility to listening multiple IP L2TP Tunnels
-  * Removing LAC flag.
-
- -- Fernando Alves <fernando.alves@sameswireless.fr>  Thu, 28 Mar 2013 10:50:00 +0100
+ -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 30 Apr 2013 19:22:11 +0200
 
-l2tpns (2.2.1-2fdn3.6) unstable; urgency=low
+l2tpns (2.2.1-2sames3.7) unstable; urgency=low
 
+  * Merge from master
   * Fix Warning: dereferencing type-punned pointer will break strict...
   * Fix: Tunnel creation does not work when the length of the hostname is odd. (revert fix: Add a uint16_t control buffer type, as a union)
 
  -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 26 Feb 2013 09:07:16 +0100
 
+l2tpns (2.2.1-2sames3.6) unstable; urgency=low
+
+  * Sames l2tpns version.
+
+ -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 12 Feb 2013 20:20:17 +0100
+
 l2tpns (2.2.1-2fdn3.5) unstable; urgency=low
 
   * Update debian/changelog
diff --git a/dictionary.sames b/dictionary.sames
new file mode 100644
index 0000000..a8a244d
--- /dev/null
+++ b/dictionary.sames
@@ -0,0 +1,18 @@
+# -*- text -*-
+##############################################################################
+#	Vendor specific attributes SamesWireless
+#	http://www.sameswireless.fr
+#
+#	$Id$
+#
+##############################################################################
+
+VENDOR		SAMES				64520
+
+BEGIN-VENDOR	SAMES
+
+ATTRIBUTE	SAMES-Group-Framed-Route		22	string
+ATTRIBUTE	SAMES-Group-Session-Weight		23	string
+
+END-VENDOR SAMES
+
diff --git a/garden.c b/garden.c
index 0e6880c..da4a7d6 100644
--- a/garden.c
+++ b/garden.c
@@ -3,7 +3,9 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <sys/types.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
+
 #include "dhcp6.h"
 #include "l2tpns.h"
 #include "plugin.h"
diff --git a/grpsess.c b/grpsess.c
new file mode 100644
index 0000000..5528453
--- /dev/null
+++ b/grpsess.c
@@ -0,0 +1,711 @@
+/*
+ * Fernando ALVES 2013
+ * Grouped session for load balancing and fail-over
+ * GPL licenced
+ */
+
+#include <errno.h>
+#include <ctype.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <linux/rtnetlink.h>
+#include <netinet/ip6.h>
+
+#include "dhcp6.h"
+#include "l2tpns.h"
+#include "util.h"
+#include "cluster.h"
+
+#ifdef BGP
+#include "bgp.h"
+#endif
+
+union grp_iphash {
+	groupidt grp;
+	union grp_iphash *idx;
+} grp_ip_hash[256];			// Mapping from IP address to group structures.
+
+groupidt gnextgrpid = 0;
+
+typedef struct
+{
+	sessionidt sid_loaddist[0x10000];
+}
+local_group;
+
+local_group *grp_local = NULL;		// Array of local_group structures.
+
+// Find gruop by IP, < 1 for not found
+//
+// Confusingly enough, this 'ip' must be
+// in _network_ order. This being the common
+// case when looking it up from IP packet headers.
+static groupidt grp_lookup_ipmap(in_addr_t ip)
+{
+	uint8_t *a = (uint8_t *) &ip;
+	union grp_iphash *h = grp_ip_hash;
+
+	if (!(h = h[*a++].idx)) return 0;
+	if (!(h = h[*a++].idx)) return 0;
+	if (!(h = h[*a++].idx)) return 0;
+
+	return h[*a].grp;
+}
+
+//
+// Take an IP address in HOST byte order and
+// add it to the grouid by IP cache.
+//
+// (It's actually cached in network order)
+//
+static void grp_cache_ipmap(in_addr_t ip, groupidt g)
+{
+	in_addr_t nip = htonl(ip);	// MUST be in network order. I.e. MSB must in be ((char *) (&ip))[0]
+	uint8_t *a = (uint8_t *) &nip;
+	union grp_iphash *h = grp_ip_hash;
+	int i;
+
+	for (i = 0; i < 3; i++)
+	{
+		if (!(h[a[i]].idx || (h[a[i]].idx = calloc(256, sizeof(union grp_iphash)))))
+			return;
+
+		h = h[a[i]].idx;
+	}
+
+	h[a[3]].grp = g;
+
+	if (g > 0)
+		LOG(4, 0, 0, "Caching Group:%d ip address %s\n", g, fmtaddr(nip, 0));
+	else if (g == 0)
+		LOG(4, 0, 0, "Un-caching Group ip address %s\n", fmtaddr(nip, 0));
+}
+
+groupidt grp_groupbyip(in_addr_t ip)
+{
+	groupidt g = grp_lookup_ipmap(ip);
+
+	if (g > 0 && g < MAXGROUPE)
+		return g;
+
+	return 0;
+}
+
+// Add a route
+//
+// This adds it to the routing table, advertises it
+// via BGP if enabled, and stuffs it into the
+// 'groupbyip' cache.
+//
+// 'ip' must be in _host_ order.
+//
+static void grp_routeset(groupidt g, in_addr_t ip, int prefixlen, int add)
+{
+	struct {
+		struct nlmsghdr nh;
+		struct rtmsg rt;
+		char buf[32];
+	} req;
+	int i;
+	in_addr_t n_ip;
+
+	if (!prefixlen) prefixlen = 32;
+
+	ip &= 0xffffffff << (32 - prefixlen);;	// Force the ip to be the first one in the route.
+
+	memset(&req, 0, sizeof(req));
+
+	if (add)
+	{
+		req.nh.nlmsg_type = RTM_NEWROUTE;
+		req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE;
+	}
+	else
+	{
+		req.nh.nlmsg_type = RTM_DELROUTE;
+		req.nh.nlmsg_flags = NLM_F_REQUEST;
+	}
+
+	req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(req.rt));
+
+	req.rt.rtm_family = AF_INET;
+	req.rt.rtm_dst_len = prefixlen;
+	req.rt.rtm_table = RT_TABLE_MAIN;
+	req.rt.rtm_protocol = 42;
+	req.rt.rtm_scope = RT_SCOPE_LINK;
+	req.rt.rtm_type = RTN_UNICAST;
+
+	netlink_addattr(&req.nh, RTA_OIF, &tunidx, sizeof(int));
+	n_ip = htonl(ip);
+	netlink_addattr(&req.nh, RTA_DST, &n_ip, sizeof(n_ip));
+
+	LOG(3, 0, 0, "Route (Group) %s %s/%d\n", add ? "add" : "del", fmtaddr(htonl(ip), 0), prefixlen);
+
+	if (netlink_send(&req.nh) < 0)
+		LOG(0, 0, 0, "grp_routeset() error in sending netlink message: %s\n", strerror(errno));
+
+#ifdef BGP
+	if (add)
+		bgp_add_route(htonl(ip), prefixlen);
+	else
+		bgp_del_route(htonl(ip), prefixlen);
+#endif /* BGP */
+
+	// Add/Remove the IPs to the 'groupbyip' cache.
+	// Note that we add the zero address in the case of
+	// a network route. Roll on CIDR.
+
+	// Note that 'g == 0' implies this is the address pool.
+	// We still cache it here, because it will pre-fill
+	// the malloc'ed tree.
+	if (g)
+	{
+		if (!add)	// Are we deleting a route?
+			g = 0;	// Caching the session as '0' is the same as uncaching.
+
+		for (i = ip; i < ip+(1<<(32-prefixlen)) ; ++i)
+		{
+			grp_cache_ipmap(i, g);
+			if (!g) cache_ipmap(i, 0);
+		}
+	}
+}
+
+// Set all route of a group
+void grp_setgrouproute(groupidt g, int add)
+{
+	int i;
+	for (i = 0; i < grpsession[g].nbroutesgrp; i++)
+	{
+		if (grpsession[g].route[i].ip != 0)
+		{
+			grp_routeset(g, grpsession[g].route[i].ip, grpsession[g].route[i].prefixlen, add);
+		}
+	}
+}
+
+// return group id by session
+groupidt grp_groupbysession(sessionidt s)
+{
+	groupidt g = 0;
+	int i;
+	for (g = gnextgrpid; g != 0; g = grpsession[g].prev)
+	{
+		for (i = 0; i < grpsession[g].nbsession; i++)
+		{
+			if (grpsession[g].sesslist[i].sid == s)
+			{	// session found in group
+				return g;
+			}
+		}
+	}
+
+	return 0;
+}
+
+// Remove a session to a group
+// return 1 if OK
+void grp_removesession(groupidt g, sessionidt s)
+{
+	int i;
+
+	if (grpsession[g].nbsession <= 0)
+		return;
+
+	for (i = 0; i < grpsession[g].nbsession; i++)
+	{
+		if (grpsession[g].sesslist[i].sid == s)
+		{	// session found on group
+			--grpsession[g].nbsession;
+			if (grpsession[g].nbsession == 0)
+			{
+				// Group is empty, remove it
+
+				// Del all routes
+				grp_setgrouproute(g, 0);
+
+				if (gnextgrpid == g)
+				{
+					gnextgrpid = grpsession[g].prev;
+				}
+				else
+				{
+					groupidt g2;
+					for (g2 = gnextgrpid; g2 != 0; g2 = grpsession[g2].prev)
+					{
+						if (grpsession[g2].prev == g)
+						{
+							grpsession[g2].prev = grpsession[g].prev;
+							break;
+						}
+					}
+				}
+
+				memset(&grpsession[g], 0, sizeof(grpsession[0]));
+				grpsession[g].state = GROUPEFREE;
+			}
+			else
+			{
+				// remove the session
+				memmove(&grpsession[g].sesslist[i],
+						&grpsession[g].sesslist[i+1],
+						(grpsession[g].nbsession - i) * sizeof(grpsession[g].sesslist[i]));
+			}
+
+			cluster_send_groupe(g);
+			return;
+		}
+	}
+}
+
+// Add a session to a group
+// return 1 if OK
+static int grp_addsession(groupidt g, sessionidt s, uint8_t weight)
+{
+	int i;
+
+	for (i = 0; i < grpsession[g].nbsession; i++)
+	{
+		if (grpsession[g].sesslist[i].sid == s)
+		{	// already in group
+			if ((!grpsession[g].sesslist[i].weight) || (weight > 1))
+				grpsession[g].sesslist[i].weight = weight; // update Weight session (for load-balancing)
+
+			return 1;
+		}
+	}
+
+	if (i >= MAXSESSINGRP)
+	{
+		LOG(1, s, session[s].tunnel, "   Too many session for Group %d\n", g);
+		return 0;
+	}
+	else
+	{	// add session id to group
+		if (i == 0)
+		{
+			// it's the first session of the group, set to next group
+			grpsession[g].prev = gnextgrpid;
+			gnextgrpid = g;
+			grpsession[g].state = GROUPEOPEN;
+		}
+		grpsession[g].sesslist[i].sid = s;
+		grpsession[g].sesslist[i].weight = weight;
+		grpsession[g].nbsession++;
+
+		return 1;
+	}
+	return 0;
+}
+
+// Add a route to a group
+// return 1 if OK
+static int grp_addroute(groupidt g, sessionidt s, in_addr_t ip, int prefixlen)
+{
+	int i;
+
+	for (i = 0; i < MAXROUTEINGRP; i++)
+	{
+		if ((i >= grpsession[g].nbroutesgrp))
+		{
+			LOG(3, s, session[s].tunnel, "   Radius reply Group %d contains route for %s/%d\n",
+				g, fmtaddr(htonl(ip), 0), prefixlen);
+
+			grpsession[g].route[i].ip = ip;
+			grpsession[g].route[i].prefixlen = prefixlen;
+			grpsession[g].nbroutesgrp++;
+			return 1;
+		}
+		else if ((grpsession[g].route[i].ip == ip) && (grpsession[g].route[i].prefixlen == prefixlen))
+		{
+			// route already defined in group
+			LOG(3, s, session[s].tunnel,
+				"   Radius reply Group %d contains route for %s/%d (this already defined)\n",
+				g, fmtaddr(htonl(ip), 0), prefixlen);
+
+			return 1;
+		}
+		else if (grpsession[g].route[i].ip == 0)
+		{
+			LOG(3, s, session[s].tunnel, "   Radius reply Group %d contains route for %s/%d (find empty on list!!!)\n",
+				g, fmtaddr(htonl(ip), 0), prefixlen);
+
+			grpsession[g].route[i].ip = ip;
+			grpsession[g].route[i].prefixlen = prefixlen;
+			return 1;
+		}
+	}
+
+	if (i >= MAXROUTEINGRP)
+	{
+		LOG(1, s, session[s].tunnel, "   Too many routes for Group %d\n", g);
+	}
+	return 0;
+}
+
+// Process Sames vendor specific attribut radius
+void grp_processvendorspecific(sessionidt s, uint8_t *pvs)
+{
+	uint8_t attrib = *pvs;
+	groupidt grpid = 0;
+	uint8_t *n = pvs + 2;
+	uint8_t *e = pvs + pvs[1];
+
+	if ((attrib >= 22) && (attrib <= 23))
+	{
+		while (n < e && isdigit(*n))
+		{
+			grpid = grpid * 10 + *n - '0';
+			n++;
+		}
+		if ((grpid == 0) || (grpid >= MAXGROUPE))
+		{
+			LOG(1, s, session[s].tunnel, "   Group Attribute Id %d not allowed\n", grpid);
+			return;
+		}
+		else if (*n != ',')
+		{
+			LOG(1, s, session[s].tunnel, "   Group Attribute Id not defined\n");
+			return;
+		}
+
+		if (!grp_addsession(grpid, s, 1))
+		{
+			return;
+		}
+
+		if (grpid > config->cluster_highest_groupeid)
+			config->cluster_highest_groupeid = grpid;
+
+		n++;
+	}
+
+	//process, Sames vendor-specific 64520
+	if (attrib == 22) //SAMES-Group-Framed-Route
+	{
+		in_addr_t ip = 0;
+		uint8_t u = 0;
+		uint8_t bits = 0;
+
+		while (n < e && (isdigit(*n) || *n == '.'))
+		{
+			if (*n == '.')
+			{
+				ip = (ip << 8) + u;
+				u = 0;
+			}
+			else
+				u = u * 10 + *n - '0';
+			n++;
+		}
+		ip = (ip << 8) + u;
+		if (*n == '/')
+		{
+			n++;
+			while (n < e && isdigit(*n))
+				bits = bits * 10 + *n++ - '0';
+		}
+		else if ((ip >> 24) < 128)
+			bits = 8;
+		else if ((ip >> 24) < 192)
+			bits = 16;
+		else
+			bits = 24;
+
+		if (!grp_addroute(grpid, s, ip, bits))
+			return;
+	}
+	else if (attrib == 23) //SAMES-Group-Session-Weight
+	{
+		uint8_t weight = 0;
+
+		while (n < e && isdigit(*n))
+			weight = weight * 10 + *n++ - '0';
+
+		if (!weight)
+		{
+			LOG(1, s, session[s].tunnel, "   Group-Session-Weight 0 GroupId %d not allowed\n", grpid);
+			return;
+		}
+		if (!grp_addsession(grpid, s, weight))
+		{
+			return;
+		}
+	}
+	else
+	{
+		LOG(3, s, session[s].tunnel, "   Unknown vendor-specific: 64520, Attrib: %d\n", attrib);
+	}
+}
+
+// Init data structures
+void grp_initdata()
+{
+	int i;
+
+	// Set default value (10s)
+	config->grp_txrate_average_time = 10;
+
+	if (!(grpsession = shared_malloc(sizeof(groupsesst) * MAXGROUPE)))
+	{
+		LOG(0, 0, 0, "Error doing malloc for grouped session: %s\n", strerror(errno));
+		exit(1);
+	}
+
+	memset(grpsession, 0, sizeof(grpsession[0]) * MAXGROUPE);
+	for (i = 1; i < MAXGROUPE; i++)
+	{
+		grpsession[i].state = GROUPEUNDEF;
+	}
+
+	if (!(grp_local = shared_malloc(sizeof(local_group) * MAXGROUPE)))
+	{
+		LOG(0, 0, 0, "Error doing malloc for grp_local: %s\n", strerror(errno));
+		exit(1);
+	}
+	memset(grp_local, 0, sizeof(grp_local[0]) * MAXGROUPE);
+
+}
+
+// Update time_changed of the group
+void grp_time_changed()
+{
+	groupidt g;
+
+	for (g = gnextgrpid; g != 0; g = grpsession[g].prev)
+	{
+		grpsession[g].time_changed++;
+	}
+}
+
+// Uncache all IP of a session
+static void grp_uncache_ipsession(groupidt g, sessionidt s)
+{
+	int i;
+	uint8_t *a;
+	in_addr_t ip;
+	in_addr_t n_ip, j;
+	int prefixlen;
+	union iphash *h;
+
+	for (i = 0; i < grpsession[g].nbroutesgrp; i++)
+	{
+		if (grpsession[g].route[i].ip != 0)
+		{
+			prefixlen = grpsession[g].route[i].prefixlen;
+			ip = grpsession[g].route[i].ip & (0xffffffff << (32 - prefixlen));	// Force the ip to be the first one in the route.
+
+			for (j = ip; j < ip+(1<<(32-prefixlen)) ; ++j)
+			{
+				n_ip = htonl(j); // To network order
+				a = (uint8_t *) &n_ip;
+				h = ip_hash;
+
+				if (!(h = h[*a++].idx)) continue;
+				if (!(h = h[*a++].idx)) continue;
+				if (!(h = h[*a++].idx)) continue;
+
+				if (s == h[*a].sess)
+				{
+					h[*a].sess = 0;
+					//LOG(3, s, session[s].tunnel, "UnCaching ip address %s\n", fmtaddr(n_ip, 0));
+				}
+			}
+		}
+	}
+}
+
+uint16_t guint16_index_loadlist;
+// return the next session can be used on the group
+sessionidt grp_getnextsession(groupidt g, in_addr_t ip, in_addr_t ip_src)
+{
+	sessionidt s = 0, s2 = 0, s3 = 0;
+	int i;
+	uint32_t ltime_changed = 0, mintxrate = 0xFFFFFFFF, maxtxrate = 0;
+	uint32_t txrate = 0;
+
+	if (g >= MAXGROUPE)
+		return 0;
+
+	if (grpsession[g].time_changed >= config->grp_txrate_average_time)
+	{
+		// recalculation txrate
+		ltime_changed = grpsession[g].time_changed;
+		grpsession[g].time_changed = 0;
+		for (i = 0; i < grpsession[g].nbsession; i++)
+		{
+			if ((s2 = grpsession[g].sesslist[i].sid))
+			{
+				uint32_t coutgrp_delta = 0;
+
+				if (session[s2].cout >= grpsession[g].sesslist[i].prev_coutgrp)
+					coutgrp_delta = session[s2].cout - grpsession[g].sesslist[i].prev_coutgrp;
+				grpsession[g].sesslist[i].prev_coutgrp = session[s2].cout;
+
+				txrate = (txrate + (coutgrp_delta/ltime_changed)) >> 1;
+				grpsession[g].sesslist[i].tx_rate = txrate;
+
+				txrate = grpsession[g].sesslist[i].tx_rate/grpsession[g].sesslist[i].weight;
+				if (txrate < mintxrate)
+				{
+					if ( session[s2].ppp.phase > Establish &&
+						(time_now - session[s2].last_packet <= (config->echo_timeout + 1)) )
+					{
+						grpsession[g].smin = s2;
+						mintxrate = txrate;
+					}
+				}
+
+				if (txrate > maxtxrate)
+				{
+					if ( session[s2].ppp.phase > Establish &&
+					(time_now - session[s2].last_packet <= (config->echo_timeout + 1)) )
+					{
+						grpsession[g].smax = s2;
+						maxtxrate = txrate;
+					}
+				}
+			}
+		}
+	}
+
+	if ((s = sessionbyip(ip)))
+	{
+		uint8_t *as = (uint8_t *) &ip_src;
+		uint8_t *ad = (uint8_t *) &ip;
+		uint16_t ai = ad[3];
+		ai <<= 8;
+		ai |= as[3];
+
+		s = grp_local[g].sid_loaddist[ai];
+		if (!s)
+		{
+			s = grpsession[g].smin;
+			grp_local[g].sid_loaddist[ai] = s;
+		}
+
+		if (g != grp_groupbysession(s))
+		{
+			// This session does not belong to this group
+			LOG(3, s, session[s].tunnel, "Warning, the session does not belong to group %d\n", g);
+			s = 0;
+			grp_local[g].sid_loaddist[ai] = 0;
+		}
+		else if ( (session[s].ppp.phase > Establish) &&
+			 (time_now - session[s].last_packet <= (config->echo_timeout + 1)) )
+		{
+			grp_local[g].sid_loaddist[guint16_index_loadlist++] = 0;
+			return s;
+		}
+		else
+		{
+			s = 0;
+			grp_local[g].sid_loaddist[ai] = 0;
+		}
+	}
+
+	if (!s)
+	{
+		// random between 0 and nbsession-1
+		uint indexsess = (rand() % grpsession[g].nbsession);
+
+		if (indexsess >= grpsession[g].nbsession)
+			indexsess = 0; //Sanity checks.
+
+		s2 = grpsession[g].sesslist[indexsess].sid;
+		if (s2 &&
+			(session[s2].ppp.phase > Establish) &&
+			(time_now - session[s2].last_packet <= (config->echo_timeout + 1)))
+		{
+			s = s2;
+		}
+		else
+		{
+			for (i = 0; i < grpsession[g].nbsession; i++)
+			{
+				if ((s2 = grpsession[g].sesslist[i].sid))
+				{
+					s3 = s2;
+
+					if ( session[s2].ppp.phase > Establish &&
+						(time_now - session[s2].last_packet <= (config->echo_timeout + 1)) )
+					{
+						s = s2;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	if (!s)
+		s = s3;
+
+	if (s)
+		cache_ipmap(ntohl(ip), s);
+
+	return s;
+}
+
+// load a groupe receive from master
+int grp_cluster_load_groupe(groupidt g, groupsesst *new)
+{
+	int i;
+	int updategroup = 0;
+
+	if (g >= MAXGROUPE)
+	{
+		LOG(0, 0, 0, "ERROR: Received a group id > MAXGROUPE!\n");
+		return 0;
+	}
+
+	if ((grpsession[g].nbroutesgrp != new->nbroutesgrp) ||
+		(grpsession[g].nbsession != new->nbsession))
+	{
+		updategroup = 1;
+	}
+
+	if (!updategroup)
+	{
+		// Check session list
+		for (i = 0; i < grpsession[g].nbsession; i++)
+		{
+			if (grpsession[g].sesslist[i].sid != new->sesslist[i].sid)
+			{
+				updategroup = 1;
+				break;
+			}
+		}
+	}
+
+	if (!updategroup)
+	{
+		// Check routes list
+		for (i = 0; i < grpsession[g].nbroutesgrp; i++)
+		{
+			if (grpsession[g].route[i].ip != new->route[i].ip)
+			{
+				updategroup = 1;
+				break;
+			}
+		}
+	}
+
+	// needs update
+	if (updategroup)
+	{
+		// Del all routes
+		grp_setgrouproute(g, 0);
+	}
+
+	memcpy(&grpsession[g], new, sizeof(grpsession[g]));	// Copy over..
+
+	// needs update
+	if (updategroup)
+	{
+		// Add all routes
+		grp_setgrouproute(g, 1);
+	}
+
+	return 1;
+}
diff --git a/icmp.c b/icmp.c
index 0d6c65e..e458741 100644
--- a/icmp.c
+++ b/icmp.c
@@ -5,6 +5,7 @@
 #include <linux/icmp.h>
 #include <netinet/icmp6.h>
 #include <unistd.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
 
 #include "dhcp6.h"
diff --git a/l2tplac.c b/l2tplac.c
index 4140258..5fb361e 100644
--- a/l2tplac.c
+++ b/l2tplac.c
@@ -7,6 +7,7 @@
 
 #include <errno.h>
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
 
 #include "md5.h"
diff --git a/l2tpns.c b/l2tpns.c
index 390f564..5403364 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -77,7 +77,7 @@ int cluster_sockfd = -1;	// Intra-cluster communications socket.
 int epollfd = -1;		// event polling
 time_t basetime = 0;		// base clock
 char hostname[MAXHOSTNAME] = "";	// us.
-static int tunidx;		// ifr_ifindex of tun device
+int tunidx;				// ifr_ifindex of tun device
 int nlseqnum = 0;		// netlink sequence number
 int min_initok_nlseqnum = 0;	// minimun seq number for messages after init is ok
 static int syslog_log = 0;	// are we logging to syslog
@@ -94,10 +94,7 @@ uint16_t MSS = 0;		// TCP MSS
 struct cli_session_actions *cli_session_actions = NULL;	// Pending session changes requested by CLI
 struct cli_tunnel_actions *cli_tunnel_actions = NULL;	// Pending tunnel changes required by CLI
 
-union iphash {
-	sessionidt sess;
-	union iphash *idx;
-} ip_hash[256];			// Mapping from IP address to session structures.
+union iphash ip_hash[256];	// Mapping from IP address to session structures.
 
 struct ipv6radix {
 	sessionidt sess;
@@ -188,6 +185,7 @@ config_descriptt config_values[] = {
 	CONFIG("disable_sending_hello", disable_sending_hello, BOOL),
 	CONFIG("disable_no_spoof", disable_no_spoof, BOOL),
 	CONFIG("bind_multi_address", bind_multi_address, STRING),
+	CONFIG("grp_txrate_average_time", grp_txrate_average_time, INT),
 	CONFIG("pppoe_only_equal_svc_name", pppoe_only_equal_svc_name, BOOL),
 	CONFIG("multi_hostname", multi_hostname, STRING),
 	CONFIG("no_throttle_local_IP", no_throttle_local_IP, BOOL),
@@ -225,6 +223,7 @@ tunnelt *tunnel = NULL;			// Array of tunnel structures.
 bundlet *bundle = NULL;			// Array of bundle structures.
 fragmentationt *frag = NULL;		// Array of fragmentation structures.
 sessiont *session = NULL;		// Array of session structures.
+groupsesst *grpsession = NULL;		// Array of groupsesst structures.
 sessionlocalt *sess_local = NULL;	// Array of local per-session counters.
 radiust *radius = NULL;			// Array of radius structures.
 ippoolt *ip_address_pool = NULL;	// Array of dynamic IP addresses.
@@ -235,9 +234,6 @@ struct Tstats *_statistics = NULL;
 struct Tringbuffer *ringbuffer = NULL;
 #endif
 
-static ssize_t netlink_send(struct nlmsghdr *nh);
-static void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen);
-static void cache_ipmap(in_addr_t ip, sessionidt s);
 static void uncache_ipmap(in_addr_t ip);
 static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s);
 static void free_ip_address(sessionidt s);
@@ -266,8 +262,9 @@ static clockt now(double *f)
 	if (f) *f = t.tv_sec + t.tv_usec / 1000000.0;
 	if (t.tv_sec != time_now)
 	{
-	    time_now = t.tv_sec;
-	    time_changed++;
+		time_now = t.tv_sec;
+		time_changed++;
+		grp_time_changed();
 	}
 
 	// Time in milliseconds
@@ -626,7 +623,7 @@ static void initnetlink(void)
 	}
 }
 
-static ssize_t netlink_send(struct nlmsghdr *nh)
+ssize_t netlink_send(struct nlmsghdr *nh)
 {
 	struct sockaddr_nl nladdr;
 	struct iovec iov;
@@ -662,7 +659,7 @@ static ssize_t netlink_recv(void *buf, ssize_t len)
 }
 
 /* adapted from iproute2 */
-static void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen)
+void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen)
 {
 	int len = RTA_LENGTH(alen);
 	struct rtattr *rta;
@@ -1042,7 +1039,7 @@ sessionidt sessionbyipv6(struct in6_addr ip)
 //
 // (It's actually cached in network order)
 //
-static void cache_ipmap(in_addr_t ip, sessionidt s)
+void cache_ipmap(in_addr_t ip, sessionidt s)
 {
 	in_addr_t nip = htonl(ip);	// MUST be in network order. I.e. MSB must in be ((char *) (&ip))[0]
 	uint8_t *a = (uint8_t *) &nip;
@@ -1424,6 +1421,7 @@ static void update_session_out_stat(sessionidt s, sessiont *sp, int len)
 void processipout(uint8_t *buf, int len)
 {
 	sessionidt s;
+	groupidt g;
 	sessiont *sp;
 	tunnelidt t;
 	in_addr_t ip, ip_src;
@@ -1461,7 +1459,31 @@ void processipout(uint8_t *buf, int len)
 
 	ip_src = *(uint32_t *)(buf + 12);
 	ip = *(uint32_t *)(buf + 16);
-	if (!(s = sessionbyip(ip)))
+	if ((g = grp_groupbyip(ip)))
+	{
+		s = grp_getnextsession(g, ip, ip_src);
+		if (!s)
+		{
+			// Is this a packet for a session that doesn't exist?
+			static int rate = 0;	// Number of ICMP packets we've sent this second.
+			static int last = 0;	// Last time we reset the ICMP packet counter 'rate'.
+
+			if (last != time_now)
+			{
+				last = time_now;
+				rate = 0;
+			}
+
+			if (rate++ < config->icmp_rate) // Only send a max of icmp_rate per second.
+			{
+				LOG(4, 0, 0, "IP: Sending ICMP host unreachable to %s\n", fmtaddr(*(in_addr_t *)(buf + 12), 0));
+				host_unreachable(*(in_addr_t *)(buf + 12), *(uint16_t *)(buf + 4),
+					config->bind_address ? config->bind_address : my_address, buf, len);
+			}
+			return;
+		}
+	}
+	else if (!(s = sessionbyip(ip)))
 	{
 		// Is this a packet for a session that doesn't exist?
 		static int rate = 0;	// Number of ICMP packets we've sent this second.
@@ -2106,7 +2128,7 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 		session[s].die = TIME + 150; // Clean up in 15 seconds
 
 	if (session[s].ip)
-	{                          // IP allocated, clear and unroute
+	{	// IP allocated, clear and unroute
 		int r;
 		int routed = 0;
 		for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
@@ -2316,6 +2338,8 @@ static void sessionclear(sessionidt s)
 // kill a session now
 void sessionkill(sessionidt s, char *reason)
 {
+	groupidt g;
+
 	CSTAT(sessionkill);
 
 	if (!session[s].opened) // not alive
@@ -2344,6 +2368,12 @@ void sessionkill(sessionidt s, char *reason)
 	}
 
 	LOG(2, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
+
+	if ((g = grp_groupbysession(s)))
+	{
+		grp_removesession(g, s);
+	}
+
 	sessionclear(s);
 	cluster_send_session(s);
 }
@@ -3755,7 +3785,7 @@ static void regular_cleanups(double period)
 
 		// No data in ECHO_TIMEOUT seconds, send LCP ECHO
 		if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= config->echo_timeout) &&
-			(time_now - sess_local[s].last_echo >= ECHO_TIMEOUT))
+			(time_now - sess_local[s].last_echo >= config->echo_timeout))
 		{
 			uint8_t b[MAXETHER];
 
@@ -4692,6 +4722,8 @@ static void initdata(int optdebug, char *optconfig)
 #endif /* BGP */
 
 	lac_initremotelnsdata();
+
+	grp_initdata();
 }
 
 static int assign_ip_address(sessionidt s)
@@ -5234,6 +5266,9 @@ int main(int argc, char *argv[])
 			LOG(0, 0, 0, "Can't lock pages: %s\n", strerror(errno));
 	}
 
+	//LOG(3, 0, 0, "Debug sizeof struct: sessiont %lu, tunnelt %lu, bundlet %lu, groupsesst %lu\n",
+	//	sizeof(sessiont), sizeof(tunnelt), sizeof(bundlet), sizeof(groupsesst));
+
 	mainloop();
 
 	/* remove plugins (so cleanup code gets run) */
@@ -5745,6 +5780,7 @@ int sessionsetup(sessionidt s, tunnelidt t)
 	if (!session[s].bundle || (bundle[session[s].bundle].num_of_links == 1))
 	{
 		int routed = 0;
+		groupidt g;
 
 		// Add the route for this session.
 		for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
@@ -5767,6 +5803,12 @@ int sessionsetup(sessionidt s, tunnelidt t)
 		}
 		else
 			cache_ipmap(session[s].ip, s);
+
+		if ((g = grp_groupbysession(s)))
+		{
+			grp_setgrouproute(g, 1);
+			cluster_send_groupe(g);
+		}
 	}
 
 	sess_local[s].lcp_authtype = 0; // RADIUS authentication complete
diff --git a/l2tpns.h b/l2tpns.h
index d92c274..94784d2 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
-#define VERSION	"2.2.1-2fdn3.13"
+#define VERSION	"2.2.1-2sames3.14"
 
 // Limits
 #define MAXTUNNEL	500		// could be up to 65535
@@ -24,6 +24,9 @@
 #define MAXADDRESS	20		// Maximum length for the Endpoint Discrminiator address
 #define MAXSESSION	60000		// could be up to 65535
 #define MAXTBFS		6000		// Maximum token bucket filters. Might need up to 2 * session.
+#define MAXSESSINGRP	12		// Maximum number of member links in grouped session
+#define MAXGROUPE		300	// could be up to 65535, Maximum number of grouped session
+#define MAXROUTEINGRP	15		// max static routes per group
 
 // Tunnel Id reserved for pppoe
 #define TUNNEL_ID_PPPOE	1
@@ -216,6 +219,7 @@ enum {
 typedef uint16_t sessionidt;
 typedef uint16_t bundleidt;
 typedef uint16_t tunnelidt;
+typedef uint16_t groupidt;
 typedef uint32_t clockt;
 typedef uint8_t hasht[16];
 
@@ -341,6 +345,35 @@ typedef struct
 }
 sessiont;
 
+typedef struct
+{
+	uint32_t tx_rate;
+	uint32_t prev_coutgrp;
+	sessionidt sid;
+	uint8_t weight;
+}
+groupsesslistt;
+
+typedef struct
+{
+	int state;				// current state (groupestate enum)
+	uint32_t time_changed;
+	groupidt prev;
+	sessionidt smax;
+	sessionidt smin;
+	groupsesslistt sesslist[MAXSESSINGRP];
+	routet route[MAXROUTEINGRP];		// static routes
+	uint8_t nbroutesgrp;
+	uint8_t nbsession;
+}
+groupsesst;
+
+union iphash
+{
+	sessionidt sess;
+	union iphash *idx;
+};			// Mapping from IP address to session structures.
+
 typedef struct
 {
         int state;                              // current state (bundlestate enum)
@@ -523,6 +556,13 @@ enum
 	BUNDLEUNDEF,		// Undefined
 };
 
+enum
+{
+	GROUPEFREE,		// Not in use
+	GROUPEOPEN,		// Active bundle
+	GROUPEUNDEF		// Undefined
+};
+
 enum
 {
 	NULLCLASS = 0,		//End Point Discriminator classes
@@ -732,8 +772,10 @@ typedef struct
 	int		cluster_undefined_sessions;	// How many sessions we're yet to receive from the master.
 	int		cluster_undefined_bundles;	// How many bundles we're yet to receive from the master.
 	int		cluster_undefined_tunnels;	// How many tunnels we're yet to receive from the master.
+	int		cluster_undefined_groupes;	// How many groupes we're yet to receive from the master.
 	int		cluster_highest_sessionid;
 	int		cluster_highest_bundleid;
+	int		cluster_highest_groupeid;
 	int		cluster_highest_tunnelid;
 	clockt		cluster_last_hb;		// Last time we saw a heartbeat from the master.
 	int		cluster_last_hb_ver;		// Heartbeat version last seen from master
@@ -788,6 +830,7 @@ typedef struct
 	int nbmultiaddress; // number multi address to bind
 	int indexlacudpfd;	// Index UDP LAC file handle (in udpfd[])
 	int nbmultihostname;	// number hostname, normally the same number as the nbudpfd
+	int grp_txrate_average_time; // caculation txrate average time (default 10s)
 	int no_throttle_local_IP;	// no throttle traffic from session to session
 	in_addr_t bind_n_address[MAX_BINDADDR];
 	in_addr_t iftun_n_address[MAX_BINDADDR];
@@ -963,12 +1006,26 @@ int ip_filter(uint8_t *buf, int len, uint8_t filter);
 int cmd_show_ipcache(struct cli_def *cli, const char *command, char **argv, int argc);
 int cmd_show_hist_idle(struct cli_def *cli, const char *command, char **argv, int argc);
 int cmd_show_hist_open(struct cli_def *cli, const char *command, char **argv, int argc);
+void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen);
+ssize_t netlink_send(struct nlmsghdr *nh);
+void cache_ipmap(in_addr_t ip, sessionidt s);
 tunnelidt lac_new_tunnel();
 void lac_tunnelclear(tunnelidt t);
 void lac_send_SCCRQ(tunnelidt t, uint8_t * auth, unsigned int auth_len);
 void lac_send_ICRQ(tunnelidt t, sessionidt s);
 void lac_tunnelshutdown(tunnelidt t, char *reason, int result, int error, char *msg);
 
+// grpsess.c
+sessionidt grp_getnextsession(groupidt g, in_addr_t ip, in_addr_t ip_src);
+void grp_initdata(void);
+void grp_processvendorspecific(sessionidt s, uint8_t *pvs);
+groupidt grp_groupbysession(sessionidt s);
+groupidt grp_groupbyip(in_addr_t ip);
+void grp_setgrouproute(groupidt g, int add);
+void grp_time_changed(void);
+void grp_removesession(groupidt g, sessionidt s);
+int grp_cluster_load_groupe(groupidt g, groupsesst *new);
+
 #undef LOG
 #undef LOG_HEX
 #define LOG(D, s, t, f, ...)	({ if (D <= config->debug) _log(D, s, t, f, ## __VA_ARGS__); })
@@ -1003,6 +1060,8 @@ extern bundlet *bundle;
 extern sessiont *session;
 extern sessionlocalt *sess_local;
 extern ippoolt *ip_address_pool;
+extern groupsesst *grpsession;
+extern groupidt gnextgrpid;
 #define sessionfree (session[0].next)
 
 
@@ -1015,6 +1074,8 @@ extern struct Tstats *_statistics;
 extern in_addr_t my_address;
 extern int clifd;
 extern int epollfd;
+extern int tunidx;		// ifr_ifindex of tun device
+extern union iphash ip_hash[256];
 
 struct event_data {
 	enum {
diff --git a/nsctl.c b/nsctl.c
index 4e19468..bfe3a69 100644
--- a/nsctl.c
+++ b/nsctl.c
@@ -7,6 +7,8 @@
 #include <string.h>
 #include <netdb.h>
 #include <signal.h>
+#include <sys/socket.h>
+#include <linux/rtnetlink.h>
 
 #include "dhcp6.h"
 #include "l2tpns.h"
diff --git a/ppp.c b/ppp.c
index 3a045ce..0259ab7 100644
--- a/ppp.c
+++ b/ppp.c
@@ -5,7 +5,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
+
 #include "dhcp6.h"
 #include "l2tpns.h"
 #include "constants.h"
diff --git a/pppoe.c b/pppoe.c
index c6bc12d..25ab798 100644
--- a/pppoe.c
+++ b/pppoe.c
@@ -21,6 +21,7 @@
 #include <netpacket/packet.h>
 #include <arpa/inet.h>
 #include <linux/if_pppox.h>
+#include <linux/rtnetlink.h>
 
 #include "dhcp6.h"
 #include "l2tpns.h"
diff --git a/radius.c b/radius.c
index 76ff390..53f28b0 100644
--- a/radius.c
+++ b/radius.c
@@ -11,6 +11,7 @@
 #include <ctype.h>
 #include <netinet/in.h>
 #include <errno.h>
+#include <linux/rtnetlink.h>
 
 #include "md5.h"
 #include "constants.h"
@@ -630,11 +631,19 @@ void processrad(uint8_t *buf, int len, char socket_index)
 						else if (vendor == 529 && attrib >= 135 && attrib <= 136) // Ascend
 						{
 							// handle old-format ascend DNS attributes below
-						    	p += 6;
+							p += 6;
+						}
+						else if (vendor == 64520) // Sames
+						{
+							//Sames vendor-specific 64520
+							uint8_t *pvs = p + 6; // pvs set to begin to attribute
+							LOG(3, s, session[s].tunnel, "   Sames vendor-specific: %d, Attrib: %d, lenght: %d\n", vendor, attrib, attrib_length);
+							grp_processvendorspecific(s, pvs);
+							continue;
 						}
 						else
 						{
-							LOG(3, s, session[s].tunnel, "      Unknown vendor-specific\n");
+							LOG(3, s, session[s].tunnel, "   Unknown vendor-specific: %d, Attrib: %d\n", vendor, attrib);
 							continue;
 						}
 					}
diff --git a/sessionctl.c b/sessionctl.c
index 97e6111..9bf385d 100644
--- a/sessionctl.c
+++ b/sessionctl.c
@@ -1,5 +1,7 @@
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
+
 #include "dhcp6.h"
 #include "l2tpns.h"
 #include "plugin.h"
diff --git a/setrxspeed.c b/setrxspeed.c
index a808c85..aef4a57 100644
--- a/setrxspeed.c
+++ b/setrxspeed.c
@@ -1,5 +1,7 @@
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
+
 #include "dhcp6.h"
 #include "l2tpns.h"
 #include "plugin.h"
diff --git a/snoopctl.c b/snoopctl.c
index ab850f0..4ec9b52 100644
--- a/snoopctl.c
+++ b/snoopctl.c
@@ -1,5 +1,7 @@
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
+
 #include "dhcp6.h"
 #include "l2tpns.h"
 #include "plugin.h"
diff --git a/stripdomain.c b/stripdomain.c
index d14e5d3..b536339 100644
--- a/stripdomain.c
+++ b/stripdomain.c
@@ -1,5 +1,7 @@
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
+
 #include "dhcp6.h"
 #include "l2tpns.h"
 #include "plugin.h"
diff --git a/tbf.c b/tbf.c
index 4835ecc..9dba63e 100644
--- a/tbf.c
+++ b/tbf.c
@@ -1,7 +1,9 @@
 // L2TPNS: token bucket filters
 
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
+
 #include "dhcp6.h"
 #include "l2tpns.h"
 #include "util.h"
diff --git a/throttlectl.c b/throttlectl.c
index ef194f4..5d73a01 100644
--- a/throttlectl.c
+++ b/throttlectl.c
@@ -1,5 +1,7 @@
 #include <string.h>
+#include <linux/rtnetlink.h>
 #include <netinet/ip6.h>
+
 #include "dhcp6.h"
 #include "l2tpns.h"
 #include "plugin.h"
diff --git a/util.c b/util.c
index ff6bf1e..2cd9a9e 100644
--- a/util.c
+++ b/util.c
@@ -8,6 +8,7 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <sys/mman.h>
+#include <linux/rtnetlink.h>
 
 #include "dhcp6.h"
 #include "l2tpns.h"