From: fendo <fendo@bi12info.com>
Date: Mon, 7 Oct 2013 20:49:53 +0000 (+0200)
Subject: Merge from master
X-Git-Tag: 2.2.1-2sames3.12
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/refs/tags/2.2.1-2sames3.12

Merge from master
---

30b561eb71683b52894abacf0a607d7d6932e4c1
diff --cc Makefile
index b19dfcd,fb12741..7280139
--- a/Makefile
+++ b/Makefile
@@@ -23,10 -23,10 +23,10 @@@ LDFLAGS 
  LDLIBS =
  INSTALL = install -c -D -o root -g root
  
- l2tpns.LIBS = -lm -lcli -ldl
+ 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
 +    ll.o md5.o ppp.o radius.o tbf.o util.o pppoe.o l2tplac.o grpsess.o
  
  PROGRAMS = l2tpns nsctl
  PLUGINS = autosnoop.so autothrottle.so garden.so sessionctl.so \
diff --cc cli.c
index e5ac57c,f280330..876ad06
--- a/cli.c
+++ b/cli.c
@@@ -75,35 -74,34 +75,35 @@@ static char *debug_levels[] = 
  
  #endif
  
- static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_group(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_shutdown(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_reload(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int argc);
- static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv, int argc);
+ 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);
+ static int cmd_show_version(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_show_pool(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_show_run(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_show_banana(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_show_plugins(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_show_throttle(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_write_memory(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_drop_user(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_drop_tunnel(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_drop_session(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_snoop(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_no_snoop(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_throttle(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_no_throttle(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_debug(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_no_debug(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_set(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_load_plugin(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_remove_plugin(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_uptime(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_shutdown(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_reload(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_setforward(struct cli_def *cli, const char *command, char **argv, int argc);
+ static int cmd_show_rmtlnsconf(struct cli_def *cli, const char *command, char **argv, int argc);
  
  static int regular_stuff(struct cli_def *cli);
  
@@@ -3113,78 -3110,7 +3113,78 @@@ static int cmd_reload(struct cli_def *c
  	return CLI_OK;
  }
  
- static int cmd_show_group(struct cli_def *cli, char *command, char **argv, int argc)
++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, char *command, char **argv, int argc)
+ static int cmd_setforward(struct cli_def *cli, const char *command, char **argv, int argc)
  {
  	int ret;
  
diff --cc debian/changelog
index 07531e8,8600178..61a117a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,27 +1,35 @@@
 -l2tpns (2.2.1-2fdn3.11) UNRELEASED; urgency=low
++l2tpns (2.2.1-2sames3.12) UNRELEASED; urgency=low
+ 
+   * Fix: throttle ipv6 out.
+   * Fix: remove old IPV6 routes on slave
+   * Fix: compiling Warning, dpkg-buildflags ...
+   * Enabled hardened build flags, thanks Moritz Muehlenhoff (closes: #657846)
+   * Packaging updates
+   * Move to 3.0 (native) source format
+   * Bump DH compat level to 8
+   * Fix ordering of stdio.h/syslog.h includes (closes: #707385)
+   * Create accounting_dir in init script if necessary (closes: #418156)
+   * 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, 06 Oct 2013 10:38:53 +0200
++ -- Fernando Alves <fernando.alves@sameswireless.fr>  Sun, 07 Oct 2013 22:20:53 +0200
+ 
 -l2tpns (2.2.1-2fdn3.10) unstable; urgency=low
 +l2tpns (2.2.1-2sames3.11) unstable; urgency=low
 +
 +  * improved load balancing algorithm.
 +
 + -- 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.
  
diff --cc grpsess.c
index ccaa27c,0000000..d3fae30
mode 100644,000000..100644
--- a/grpsess.c
+++ b/grpsess.c
@@@ -1,709 -1,0 +1,709 @@@
 +/*
 + * 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 "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;
++	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 --cc l2tpns.h
index 5dd854f,4f2f784..d28f3e7
--- a/l2tpns.h
+++ b/l2tpns.h
@@@ -991,13 -948,9 +991,12 @@@ void processipout(uint8_t *buf, int len
  void snoop_send_packet(uint8_t *packet, uint16_t size, in_addr_t destination, uint16_t port);
  int find_filter(char const *name, size_t len);
  int ip_filter(uint8_t *buf, int len, uint8_t filter);
- int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc);
- int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc);
- int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc);
+ 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);