X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/cb031e775d57da45299c8dfdfabe7240705338e7..8c4f3bfe794e4ff92662d9be5903e5b203f5d41e:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 0ed0337..39b09b5 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.171 2006/08/02 13:35:39 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011/01/20 12:48:40 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -69,11 +69,14 @@ int rand_fd = -1;		// Random data source
 int cluster_sockfd = -1;	// Intra-cluster communications socket.
 int epollfd = -1;		// event polling
 time_t basetime = 0;		// base clock
-char hostname[1000] = "";	// us.
+char hostname[MAXHOSTNAME] = "";	// us.
 static int tunidx;		// ifr_ifindex of tun device
 static int syslog_log = 0;	// are we logging to syslog
 static FILE *log_stream = 0;	// file handle for direct logging (i.e. direct into file, not via syslog).
 uint32_t last_id = 0;		// Unique ID for radius accounting
+// Guest change
+char guest_users[10][32];       // Array of guest users
+int guest_accounts_num = 0;     // Number of guest users
 
 // calculated from config->l2tp_mtu
 uint16_t MRU = 0;		// PPP MRU
@@ -133,6 +136,7 @@ config_descriptt config_values[] = {
 	CONFIG("radius_bind_min", radius_bind_min, SHORT),
 	CONFIG("radius_bind_max", radius_bind_max, SHORT),
 	CONFIG("allow_duplicate_users", allow_duplicate_users, BOOL),
+	CONFIG("kill_timedout_sessions", kill_timedout_sessions, BOOL),
 	CONFIG("guest_account", guest_user, STRING),
 	CONFIG("bind_address", bind_address, IPv4),
 	CONFIG("peer_address", peer_address, IPv4),
@@ -153,6 +157,9 @@ config_descriptt config_values[] = {
 	CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),
  	CONFIG("cluster_master_min_adv", cluster_master_min_adv, INT),
 	CONFIG("ipv6_prefix", ipv6_prefix, IPv6),
+	CONFIG("cli_bind_address", cli_bind_address, IPv4),
+	CONFIG("hostname", hostname, STRING),
+	CONFIG("nexthop_address", nexthop_address, IPv4),
 	{ NULL, 0, 0, 0 },
 };
 
@@ -160,8 +167,6 @@ static char *plugin_functions[] = {
 	NULL,
 	"plugin_pre_auth",
 	"plugin_post_auth",
-	"plugin_packet_rx",
-	"plugin_packet_tx",
 	"plugin_timer",
 	"plugin_new_session",
 	"plugin_kill_session",
@@ -1070,45 +1075,63 @@ void processmpframe(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l, uint8_t e
 		l -= 4;
 	}
 
-	// Process this frame
-	if (*p & 1)
-	{
-		proto = *p++;
-		l--;
-	}
-	else
-	{
-		proto = ntohs(*(uint16_t *) p);
-		p += 2;
-		l -= 2;
-	}
-
-	if (proto == PPPIP)
-	{
-		if (session[s].die)
-		{
-			LOG(4, s, t, "MPPP: Session %u is closing.  Don't process PPP packets\n", s);
-			return;              // closing session, PPP not processed
-		}
+        if (*p & 1)
+        {
+                proto = *p++;
+                l--;
+        }
+        else
+        {
+                proto = ntohs(*(uint16_t *) p);
+                p += 2;
+                l -= 2;
+        }
+        if (proto == PPPIP)
+        {
+                if (session[s].die)
+                {
+                        LOG(4, s, t, "MPPP: Session %d is closing.  Don't process PPP packets\n", s);
+                        return;              // closing session, PPP not processed
+                }
+                session[s].last_packet = session[s].last_data = time_now;
+                processipin(s, t, p, l);
+        }
+        else if (proto == PPPIPV6 && config->ipv6_prefix.s6_addr[0])
+        {
+                if (session[s].die)
+                {
+                        LOG(4, s, t, "MPPP: Session %d is closing.  Don't process PPP packets\n", s);
+                        return;              // closing session, PPP not processed
+                }
+
+                session[s].last_packet = session[s].last_data = time_now;
+                processipv6in(s, t, p, l);
+        }
+	else if (proto == PPPIPCP)
+        {
+                session[s].last_packet = session[s].last_data = time_now;
+                processipcp(s, t, p, l);
+        }
+        else if (proto == PPPCCP)
+        {
+                session[s].last_packet = session[s].last_data = time_now;
+                processccp(s, t, p, l);
+        }
+        else
+        {
+                LOG(2, s, t, "MPPP: Unsupported MP protocol 0x%04X received\n",proto);
+        }
+}
 
-		session[s].last_packet = session[s].last_data = time_now;
-		processipin(s, t, p, l);
-	}
-	else if (proto == PPPIPV6 && config->ipv6_prefix.s6_addr[0])
-	{
-		if (session[s].die)
-		{
-			LOG(4, s, t, "MPPP: Session %u is closing.  Don't process PPP packets\n", s);
-			return;              // closing session, PPP not processed
-		}
+static void update_session_out_stat(sessionidt s, sessiont *sp, int len)
+{
+	increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
+	sp->cout_delta += len;
+	sp->pout++;
+	sp->last_data = time_now;
 
-		session[s].last_packet = session[s].last_data = time_now;
-		processipv6in(s, t, p, l);
-	}
-	else
-	{
-		LOG(2, s, t, "MPPP: Unsupported MP protocol 0x%04X received\n",proto);
-	}
+	sess_local[s].cout += len;	// To send to master..
+	sess_local[s].pout++;
 }
 
 // process outgoing (to tunnel) IP
@@ -1123,8 +1146,7 @@ static void processipout(uint8_t *buf, int len)
 	uint8_t *data = buf;	// Keep a copy of the originals.
 	int size = len;
 
-	uint8_t b1[MAXETHER + 20];
-	uint8_t b2[MAXETHER + 20];
+	uint8_t fragbuf[MAXETHER + 20];
 
 	CSTAT(processipout);
 
@@ -1173,9 +1195,15 @@ static void processipout(uint8_t *buf, int len)
 		}
 		return;
 	}
+
 	t = session[s].tunnel;
+	if (len > session[s].mru || (session[s].mrru && len > session[s].mrru))
+	{
+		LOG(3, s, t, "Packet size more than session MRU\n");
+		return;
+	}
+
 	sp = &session[s];
-	sp->last_data = time_now;
 
 	// DoS prevention: enforce a maximum number of packets per 0.1s for a session
 	if (config->max_packets > 0)
@@ -1246,55 +1274,80 @@ static void processipout(uint8_t *buf, int len)
 	}
 
 	// Add on L2TP header
-	{
-		bundleidt bid = 0;
-		if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
-		{
-			bid = session[s].bundle;
-			s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
-			LOG(4, s, t, "MPPP: (1)Session number becomes: %u\n", s);
-			if (len > 256)
-			{
-				// Partition the packet to 2 fragments
-				uint32_t frag1len = len / 2;
-				uint32_t frag2len = len - frag1len;
-				uint8_t *p = makeppp(b1, sizeof(b1), buf, frag1len, s, t, PPPIP, 0, bid, MP_BEGIN);
-				uint8_t *q;
-
-				if (!p) return;
-				tunnelsend(b1, frag1len + (p-b1), t); // send it...
-				s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
-				LOG(4, s, t, "MPPP: (2)Session number becomes: %u\n", s);
-				q = makeppp(b2, sizeof(b2), buf+frag1len, frag2len, s, t, PPPIP, 0, bid, MP_END);
-				if (!q) return;
-				tunnelsend(b2, frag2len + (q-b2), t); // send it...
-			}
-			else {
-				// Send it as one frame
-				uint8_t *p = makeppp(b1, sizeof(b1), buf, len, s, t, PPPIP, 0, bid, MP_BOTH_BITS);
-				if (!p) return;
-				tunnelsend(b1, len + (p-b1), t); // send it...
-			}
-		}
-		else
-		{
-			uint8_t *p = makeppp(b1, sizeof(b1), buf, len, s, t, PPPIP, 0, 0, 0);
-			if (!p) return;
-			tunnelsend(b1, len + (p-b1), t); // send it...
-		}
-	}
+        {
+                bundleidt bid = 0;
+                if(session[s].bundle != 0 && bundle[session[s].bundle].num_of_links > 1)
+                {
+                        bid = session[s].bundle;
+                        s = bundle[bid].members[bundle[bid].current_ses = ++bundle[bid].current_ses % bundle[bid].num_of_links];
+			t = session[s].tunnel;
+			sp = &session[s];
+                        LOG(4, s, t, "MPPP: (1)Session number becomes: %d\n", s);
+                        if(len > MINFRAGLEN)
+                        {
+                                // Partition the packet to "bundle[b].num_of_links" fragments
+				bundlet *b = &bundle[bid];
+				uint32_t num_of_links = b->num_of_links;
+                                uint32_t fraglen = len / num_of_links;
+				fraglen = (fraglen > session[s].mru ? session[s].mru : fraglen);
+				uint32_t last_fraglen = fraglen + len % num_of_links;
+				last_fraglen = (last_fraglen > session[s].mru ? len % num_of_links : last_fraglen);
+				uint32_t remain = len;
+
+				// send the first packet
+                                uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, fraglen, s, t, PPPIP, 0, bid, MP_BEGIN);
+                                if (!p) return;
+                                tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it...
+				// statistics
+				update_session_out_stat(s, sp, fraglen);
+				remain -= fraglen;
+				while (remain > last_fraglen)
+				{ 
+                                	s = b->members[b->current_ses = ++b->current_ses % num_of_links];
+					t = session[s].tunnel;
+					sp = &session[s];
+                                	LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
+                                	p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), fraglen, s, t, PPPIP, 0, bid, 0);
+                                	if (!p) return;
+                                	tunnelsend(fragbuf, fraglen + (p-fragbuf), t); // send it...
+					update_session_out_stat(s, sp, fraglen);
+					remain -= fraglen;
+				}
+				// send the last fragment
+				s = b->members[b->current_ses = ++b->current_ses % num_of_links];
+				t = session[s].tunnel;
+				sp = &session[s];
+                               	LOG(4, s, t, "MPPP: (2)Session number becomes: %d\n", s);
+                               	p = makeppp(fragbuf, sizeof(fragbuf), buf+(len - remain), remain, s, t, PPPIP, 0, bid, MP_END);
+                               	if (!p) return;
+                               	tunnelsend(fragbuf, remain + (p-fragbuf), t); // send it...
+				update_session_out_stat(s, sp, remain);
+				if (remain != last_fraglen)
+					LOG(3, s, t, "PROCESSIPOUT ERROR REMAIN != LAST_FRAGLEN, %d != %d\n", remain, last_fraglen);
+                        }
+                        else {
+                                // Send it as one frame
+                                uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, bid, MP_BOTH_BITS);
+                                if (!p) return;
+                                tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+				LOG(4, s, t, "MPPP: packet sent as one frame\n");
+				update_session_out_stat(s, sp, len);
+                        }
+                }
+                else
+                {
+                        uint8_t *p = makeppp(fragbuf, sizeof(fragbuf), buf, len, s, t, PPPIP, 0, 0, 0);
+                        if (!p) return;
+                        tunnelsend(fragbuf, len + (p-fragbuf), t); // send it...
+			update_session_out_stat(s, sp, len);
+                }
+        }
 
 	// Snooping this session, send it to intercept box
 	if (sp->snoop_ip && sp->snoop_port)
 		snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
 
-	increment_counter(&sp->cout, &sp->cout_wrap, len); // byte count
-	sp->cout_delta += len;
-	sp->pout++;
 	udp_tx += len;
-
-	sess_local[s].cout += len;	// To send to master..
-	sess_local[s].pout++;
 }
 
 // process outgoing (to tunnel) IPv6
@@ -1661,7 +1714,9 @@ void filter_session(sessionidt s, int filter_in, int filter_out)
 void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_error, int term_cause)
 {
 	int walled_garden = session[s].walled_garden;
-
+	bundleidt b = session[s].bundle;
+	//delete routes only for last session in bundle (in case of MPPP)
+	int del_routes = !b || (bundle[b].num_of_links == 1);
 
 	CSTAT(sessionshutdown);
 
@@ -1676,6 +1731,7 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 		struct param_kill_session data = { &tunnel[session[s].tunnel], &session[s] };
 		LOG(2, s, session[s].tunnel, "Shutting down session %u: %s\n", s, reason);
 		run_plugins(PLUGIN_KILL_SESSION, &data);
+		session[s].die = TIME + 150; // Clean up in 15 seconds
 	}
 
 	if (session[s].ip && !walled_garden && !session[s].die)
@@ -1710,21 +1766,52 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 			    (session[s].route[r].ip & session[s].route[r].mask))
 				routed++;
 
-			routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 0);
+			if (del_routes) routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 0);
 			session[s].route[r].ip = 0;
 		}
 
 		if (session[s].ip_pool_index == -1) // static ip
 		{
-			if (!routed) routeset(s, session[s].ip, 0, 0, 0);
+			if (!routed && del_routes) routeset(s, session[s].ip, 0, 0, 0);
 			session[s].ip = 0;
 		}
 		else
 			free_ip_address(s);
 
 		// unroute IPv6, if setup
-		if (session[s].ppp.ipv6cp == Opened && session[s].ipv6prefixlen)
+		if (session[s].ppp.ipv6cp == Opened && session[s].ipv6prefixlen && del_routes)
 			route6set(s, session[s].ipv6route, session[s].ipv6prefixlen, 0);
+		
+		if (b) 
+		{
+	                // This session was part of a bundle
+	                bundle[b].num_of_links--;
+	                LOG(3, s, 0, "MPPP: Dropping member link: %d from bundle %d\n",s,b);
+	                if(bundle[b].num_of_links == 0) 
+			{
+	                        bundleclear(b);
+	                        LOG(3, s, 0, "MPPP: Kill bundle: %d (No remaing member links)\n",b);
+                	}
+                	else 
+			{
+	                        // Adjust the members array to accomodate the new change
+	                        uint8_t mem_num = 0;
+	                        // It should be here num_of_links instead of num_of_links-1 (previous instruction "num_of_links--")
+	                        if(bundle[b].members[bundle[b].num_of_links] != s) 
+				{
+	                                uint8_t ml;
+	                                for(ml = 0; ml<bundle[b].num_of_links; ml++)
+	                                        if(bundle[b].members[ml] == s)
+	                                        {
+	                                                mem_num = ml;
+	                                                break;
+	                                        }
+	                                bundle[b].members[mem_num] = bundle[b].members[bundle[b].num_of_links];
+	                                LOG(3, s, 0, "MPPP: Adjusted member links array\n");
+                        	}
+                	}
+                	cluster_send_bundle(b);
+        	}
 	}
 
 	if (session[s].throttle_in || session[s].throttle_out) // Unthrottle if throttled.
@@ -1747,9 +1834,6 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 		controladd(c, session[s].far, session[s].tunnel); // send the message
 	}
 
-	if (!session[s].die)
-		session[s].die = TIME + 150; // Clean up in 15 seconds
-
 	// update filter refcounts
 	if (session[s].filter_in) ip_filters[session[s].filter_in - 1].used--;
 	if (session[s].filter_out) ip_filters[session[s].filter_out - 1].used--;
@@ -1834,8 +1918,6 @@ static void sessionclear(sessionidt s)
 // kill a session now
 void sessionkill(sessionidt s, char *reason)
 {
-	bundleidt b;
-
 	CSTAT(sessionkill);
 
 	if (!session[s].opened) // not alive
@@ -1847,44 +1929,13 @@ void sessionkill(sessionidt s, char *reason)
 		return;
 	}
 
-	session[s].die = TIME;
-	sessionshutdown(s, reason, CDN_ADMIN_DISC, TERM_ADMIN_RESET);  // close radius/routes, etc.
+	if (!session[s].die)
+		sessionshutdown(s, reason, CDN_ADMIN_DISC, TERM_ADMIN_RESET);  // close radius/routes, etc.
+
 	if (sess_local[s].radius)
 		radiusclear(sess_local[s].radius, s); // cant send clean accounting data, session is killed
 
-	LOG(2, s, session[s].tunnel, "Kill session %u (%s): %s\n", s, session[s].user, reason);
-	if ((b = session[s].bundle))
-	{
-		// This session was part of a bundle
-		bundle[b].num_of_links--;
-		LOG(3, s, 0, "MPPP: Dropping member link: %u from bundle %u\n", s, b);
-		if (bundle[b].num_of_links == 0)
-		{
-			bundleclear(b);
-			LOG(3, s, 0, "MPPP: Kill bundle: %u (No remaing member links)\n", b);
-		}
-		else
-		{
-			// Adjust the members array to accomodate the new change
-			uint8_t mem_num = 0;
-			// It should be here num_of_links instead of num_of_links-1 (previous instruction "num_of_links--")
-			if (bundle[b].members[bundle[b].num_of_links] != s)
-			{
-				uint8_t ml;
-				for (ml = 0; ml<bundle[b].num_of_links; ml++)
-				{
-					if (bundle[b].members[ml] == s)
-					{
-						mem_num = ml;
-						break;
-					}
-				}
-				bundle[b].members[mem_num] = bundle[b].members[bundle[b].num_of_links];
-				LOG(3, s, 0, "MPPP: Adjusted member links array\n");
-			}
-		}
-		cluster_send_bundle(b);
-	}
+	LOG(2, s, session[s].tunnel, "Kill session %d (%s): %s\n", s, session[s].user, reason);
 	sessionclear(s);
 	cluster_send_session(s);
 }
@@ -2636,9 +2687,11 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 					break;
 				case 2:       // SCCRP
 					tunnel[t].state = TUNNELOPEN;
+					tunnel[t].lastrec = time_now;
 					break;
 				case 3:       // SCCN
 					tunnel[t].state = TUNNELOPEN;
+					tunnel[t].lastrec = time_now;
 					controlnull(t); // ack
 					break;
 				case 4:       // StopCCN
@@ -2981,7 +3034,7 @@ static void regular_cleanups(double period)
 			if (tunnel[t].retry <= TIME)
 			{
 				controlt *c = tunnel[t].controls;
-				uint8_t w = tunnel[t].window;
+				uint16_t w = tunnel[t].window;
 				tunnel[t].try++; // another try
 				if (tunnel[t].try > 5)
 					tunnelkill(t, "Timeout on control message"); // game over
@@ -3311,7 +3364,8 @@ static void regular_cleanups(double period)
 		if (config->radius_accounting && config->radius_interim > 0
 		    && session[s].ip && !session[s].walled_garden
 		    && !sess_local[s].radius // RADIUS already in progress
-		    && time_now - sess_local[s].last_interim >= config->radius_interim)
+		    && time_now - sess_local[s].last_interim >= config->radius_interim
+		    && session[s].flags & SESSION_STARTED)
 		{
 		    	int rad = radiusnew(s);
 			if (!rad)
@@ -3344,35 +3398,36 @@ static int still_busy(void)
 	static clockt last_talked = 0;
 	static clockt start_busy_wait = 0;
 
-	if (!config->cluster_iam_master)
-	{
 #ifdef BGP
-		static time_t stopped_bgp = 0;
-	    	if (bgp_configured)
+	static time_t stopped_bgp = 0;
+	if (bgp_configured)
+	{
+		if (!stopped_bgp)
 		{
-			if (!stopped_bgp)
-			{
-			    	LOG(1, 0, 0, "Shutting down in %d seconds, stopping BGP...\n", QUIT_DELAY);
+			LOG(1, 0, 0, "Shutting down in %d seconds, stopping BGP...\n", QUIT_DELAY);
 
-				for (i = 0; i < BGP_NUM_PEERS; i++)
-					if (bgp_peers[i].state == Established)
-						bgp_stop(&bgp_peers[i]);
+			for (i = 0; i < BGP_NUM_PEERS; i++)
+				if (bgp_peers[i].state == Established)
+					bgp_stop(&bgp_peers[i]);
 
-				stopped_bgp = time_now;
+			stopped_bgp = time_now;
 
+			if (!config->cluster_iam_master)
+			{
 				// we don't want to become master
 				cluster_send_ping(0);
 
 				return 1;
 			}
-
-			if (time_now < (stopped_bgp + QUIT_DELAY))
-				return 1;
 		}
+
+		if (!config->cluster_iam_master && time_now < (stopped_bgp + QUIT_DELAY))
+			return 1;
+	}
 #endif /* BGP */
 
+	if (!config->cluster_iam_master)
 		return 0;
-	}
 
 	if (main_quit == QUIT_SHUTDOWN)
 	{
@@ -3513,7 +3568,8 @@ static void mainloop(void)
 		if (config->neighbour[i].name[0])
 			bgp_start(&bgp_peers[i], config->neighbour[i].name,
 				config->neighbour[i].as, config->neighbour[i].keepalive,
-				config->neighbour[i].hold, 0); /* 0 = routing disabled */
+				config->neighbour[i].hold, config->neighbour[i].update_source,
+				0); /* 0 = routing disabled */
 	}
 #endif /* BGP */
 
@@ -3910,6 +3966,7 @@ static void initdata(int optdebug, char *optconfig)
 	config->ppp_restart_time = 3;
 	config->ppp_max_configure = 10;
 	config->ppp_max_failure = 5;
+	config->kill_timedout_sessions = 1;
 	strcpy(config->random_device, RANDOMDEVICE);
 
 	log_stream = stderr;
@@ -4013,9 +4070,14 @@ static void initdata(int optdebug, char *optconfig)
 
 	if (!*hostname)
 	{
-		// Grab my hostname unless it's been specified
-		gethostname(hostname, sizeof(hostname));
-		stripdomain(hostname);
+		if (!*config->hostname)
+		{
+			// Grab my hostname unless it's been specified
+			gethostname(hostname, sizeof(hostname));
+			stripdomain(hostname);
+		}
+		else
+			strcpy(hostname, config->hostname);
 	}
 
 	_statistics->start_time = _statistics->last_reset = time(NULL);
@@ -4736,6 +4798,40 @@ static void update_config()
 		}
 	}
 
+	// Guest change
+        guest_accounts_num = 0;
+        char *p2 = config->guest_user;
+        while (p2 && *p2)
+        {
+                char *s = strpbrk(p2, " \t,");
+                if (s)
+                {
+                        *s++ = 0;
+                        while (*s == ' ' || *s == '\t')
+                                s++;
+
+                        if (!*s)
+                                s = 0;
+                }
+
+                strcpy(guest_users[guest_accounts_num], p2);
+                LOG(1, 0, 0, "Guest account[%d]: %s\n", guest_accounts_num, guest_users[guest_accounts_num]);
+                guest_accounts_num++;
+                p2 = s;
+        }
+        // Rebuild the guest_user array
+        strcpy(config->guest_user, "");
+        int ui = 0;
+        for (ui=0; ui<guest_accounts_num; ui++)
+        {
+                strcat(config->guest_user, guest_users[ui]);
+                if (ui<guest_accounts_num-1)
+                {
+                        strcat(config->guest_user, ",");
+                }
+        }
+
+
 	memcpy(config->old_plugins, config->plugins, sizeof(config->plugins));
 	if (!config->multi_read_count) config->multi_read_count = 10;
 	if (!config->cluster_address) config->cluster_address = inet_addr(DEFAULT_MCAST_ADDR);
@@ -4814,6 +4910,20 @@ int sessionsetup(sessionidt s, tunnelidt t)
 
 	LOG(3, s, t, "Doing session setup for session\n");
 
+	// Join a bundle if the MRRU option is accepted
+        if(session[s].mrru > 0 && session[s].bundle == 0)
+        {
+                LOG(3, s, t, "This session can be part of multilink bundle\n");
+                if (join_bundle(s) > 0)
+                	cluster_send_bundle(session[s].bundle);
+		else
+		{
+			LOG(0, s, t, "MPPP: Mismaching mssf option with other sessions in bundle\n");
+			sessionshutdown(s, "Mismaching mssf option.", CDN_NONE, TERM_SERVICE_UNAVAILABLE);
+			return 0;
+		}
+        }
+
 	if (!session[s].ip)
 	{
 		assign_ip_address(s);
@@ -4831,14 +4941,6 @@ int sessionsetup(sessionidt s, tunnelidt t)
 	// Make sure this is right
 	session[s].tunnel = t;
 
-	// Join a bundle if the MRRU option is accepted
-	if (session[s].mrru > 0 && !session[s].bundle)
-	{
-		LOG(3, s, t, "This session can be part of multilink bundle\n");
-		if (join_bundle(s))
-			cluster_send_bundle(session[s].bundle);
-	}
-
 	// zap old sessions with same IP and/or username
 	// Don't kill gardened sessions - doing so leads to a DoS
 	// from someone who doesn't need to know the password
@@ -4849,25 +4951,29 @@ int sessionsetup(sessionidt s, tunnelidt t)
 		{
 			if (i == s) continue;
 			if (!session[s].opened) continue;
+			// Allow duplicate sessions for multilink ones of the same bundle.
+                        if (session[s].bundle && session[i].bundle && session[s].bundle == session[i].bundle)
+                                continue;
 			if (ip == session[i].ip)
 			{
 				sessionkill(i, "Duplicate IP address");
 				continue;
 			}
 
-			if (config->allow_duplicate_users)
-				continue;
-
-			if (session[s].walled_garden || session[i].walled_garden)
-				continue;
-
-			// Allow duplicate sessions for guest account.
-			if (*config->guest_user && !strcasecmp(user, config->guest_user))
-				continue;
-
-			// Allow duplicate sessions for multilink ones of the same bundle.
-			if (session[s].bundle && session[i].bundle && session[s].bundle == session[i].bundle)
-				continue;
+			if (config->allow_duplicate_users) continue;
+			if (session[s].walled_garden || session[i].walled_garden) continue;
+			// Guest change
+			int found = 0;
+                        int gu;
+                        for (gu = 0; gu < guest_accounts_num; gu++)
+                        {
+                                if (!strcasecmp(user, guest_users[gu]))
+                                {
+                                        found = 1;
+                                        break;
+                                }
+                        }
+                        if (found) continue;
 
 			// Drop the new session in case of duplicate sessionss, not the old one.
 			if (!strcasecmp(user, session[i].user))
@@ -4875,6 +4981,8 @@ int sessionsetup(sessionidt s, tunnelidt t)
 		}
 	}
 
+	// no need to set a route for the same IP address of the bundle
+	if (!session[s].bundle || (bundle[session[s].bundle].num_of_links == 1))
 	{
 	    	int routed = 0;