X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/67af795b70319ac8972c86060ed8346b421fc75b..ba1c3362c6dc0d65eb3d06368c47b75aa135456b:/ppp.c?ds=inline

diff --git a/ppp.c b/ppp.c
index 8c1c9a3..0259ab7 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,12 +1,14 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.101 2006-06-03 08:16:46 bodea Exp $";
-
 #include <stdio.h>
 #include <string.h>
 #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"
 #include "plugin.h"
@@ -14,6 +16,9 @@ char const *cvs_id_ppp = "$Id: ppp.c,v 1.101 2006-06-03 08:16:46 bodea Exp $";
 #include "tbf.h"
 #include "cluster.h"
 
+#include "l2tplac.h"
+#include "pppoe.h"
+
 extern tunnelt *tunnel;
 extern bundlet *bundle;
 extern fragmentationt *frag;
@@ -23,6 +28,7 @@ extern int tunfd;
 extern char hostname[];
 extern uint32_t eth_tx;
 extern time_t time_now;
+extern uint64_t time_now_ms;
 extern configt *config;
 
 static int add_lcp_auth(uint8_t *b, int size, int authtype);
@@ -31,6 +37,16 @@ static int epdiscmp(epdist, epdist);
 static void setepdis(epdist *, epdist);
 static void ipcp_open(sessionidt s, tunnelidt t);
 
+static int first_session_in_bundle(sessionidt s)
+{
+	bundleidt i;
+	for (i = 1; i < MAXBUNDLE; i++)
+		if (bundle[i].state != BUNDLEFREE)
+			if (epdiscmp(session[s].epdis,bundle[i].epdis) && !strcmp(session[s].user, bundle[i].user))
+				return 0;
+	return 1;	
+}
+
 // Process PAP messages
 void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
@@ -91,6 +107,12 @@ void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		LOG(3, s, t, "PAP login %s/%s\n", user, pass);
 	}
 
+	if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, user))
+	{
+		// Creating a tunnel/session has been started
+		return;
+	}
+
 	if (session[s].ip || !(r = radiusnew(s)))
 	{
 		// respond now, either no RADIUS available or already authenticated
@@ -140,7 +162,10 @@ void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
 		radius[r].id = p[1];
 		LOG(3, s, t, "Sending login for %s/%s to RADIUS\n", user, pass);
-		radiussend(r, RADIUSAUTH);
+		if ((session[s].mrru) && (!first_session_in_bundle(s)))
+			radiussend(r, RADIUSJUSTAUTH);
+		else
+			radiussend(r, RADIUSAUTH);
 	}
 }
 
@@ -239,6 +264,14 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		packet.username = calloc(l + 1, 1);
 		memcpy(packet.username, p, l);
 
+		if ((!config->disable_lac_func) && lac_conf_forwardtoremotelns(s, packet.username))
+		{
+			free(packet.username);
+			free(packet.password);
+			// Creating a tunnel/session has been started
+			return;
+		}
+
 		run_plugins(PLUGIN_PRE_AUTH, &packet);
 		if (!packet.continue_auth)
 		{
@@ -257,7 +290,10 @@ void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
 	radius[r].chap = 1;
 	LOG(3, s, t, "CHAP login %s\n", session[s].user);
-	radiussend(r, RADIUSAUTH);
+	if ((session[s].mrru) && (!first_session_in_bundle(s)))
+		radiussend(r, RADIUSJUSTAUTH);
+	else
+		radiussend(r, RADIUSAUTH);
 }
 
 static void dumplcp(uint8_t *p, int l)
@@ -366,17 +402,7 @@ void lcp_open(sessionidt s, tunnelidt t)
 	}
 	else
 	{
-		if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
-		{
-			sessionidt first_ses = bundle[session[s].bundle].members[0];
-			LOG(3, s, t, "MPPP: Skipping IPCP negotiation for session:%d, first session of bundle is:%d\n", s, first_ses);
-			session[s].ip = session[first_ses].ip;
-			session[s].dns1 = session[first_ses].dns1;
-			session[s].dns2 = session[first_ses].dns2;
-			session[s].timeout = session[first_ses].timeout;
-			ipcp_open(s, t);
-		}
-		else
+		if(session[s].bundle == 0 || bundle[session[s].bundle].num_of_links == 1)
 		{
 			// This-Layer-Up
 			sendipcp(s, t);
@@ -389,10 +415,16 @@ void lcp_open(sessionidt s, tunnelidt t)
 
 			change_state(s, ccp, Stopped);
 		}
+		else
+		{
+			sessionidt first_ses = bundle[session[s].bundle].members[0];
+			LOG(3, s, t, "MPPP: Skipping IPCP negotiation for session:%d, first session of bundle is:%d\n",s,first_ses);
+			ipcp_open(s, t);
+                }
 	}
 }
 
-static void lcp_restart(sessionidt s)
+void lcp_restart(sessionidt s)
 {
 	session[s].ppp.phase = Establish;
 	// This-Layer-Down
@@ -525,7 +557,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	if (session[s].die) // going down...
 		return;
 
-	LOG((*p == EchoReq || *p == EchoReply) ? 4 : 3, s, t,
+	LOG(((*p == EchoReq || *p == EchoReply) ? 4 : 3), s, t,
 		"LCP: recv %s\n", ppp_code(*p));
 
 	if (config->debug > 3) dumplcp(p, l);
@@ -809,6 +841,10 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
 			break;
 
+		case Closing:
+			sessionshutdown(s, "LCP: ConfigReq in state Closing. This should not happen. Killing session.", CDN_ADMIN_DISC, TERM_LOST_SERVICE);
+			break;
+
 		default:
 		    	LOG(2, s, t, "LCP: ignoring %s in state %s\n", ppp_code(*p), ppp_state(session[s].ppp.lcp));
 			return;
@@ -1091,10 +1127,20 @@ int join_bundle(sessionidt s)
 		{
 			if (epdiscmp(session[s].epdis,bundle[i].epdis) && !strcmp(session[s].user, bundle[i].user))
 			{
+				sessionidt first_ses = bundle[i].members[0];
+				if (bundle[i].mssf != session[s].mssf)
+				{
+					// uniformity of sequence number format must be insured
+					LOG(3, s, session[s].tunnel, "MPPP: unable to bundle session %d in bundle %d cause of different mssf\n", s, i);
+					return -1;
+				}
 				session[s].bundle = i;
-				bundle[i].mrru = session[s].mrru;
-				bundle[i].mssf = session[s].mssf;
-				if (session[s].epdis.length > 0)
+				session[s].ip = session[first_ses].ip;
+				session[s].dns1 = session[first_ses].dns1;
+				session[s].dns2 = session[first_ses].dns2;
+				session[s].timeout = session[first_ses].timeout;
+
+				if(session[s].epdis.length > 0)
 					setepdis(&bundle[i].epdis, session[s].epdis);
 
 				strcpy(bundle[i].user, session[s].user);
@@ -1112,11 +1158,19 @@ int join_bundle(sessionidt s)
 	session[s].bundle = b;
 	bundle[b].mrru = session[s].mrru;
 	bundle[b].mssf = session[s].mssf;
-	if (session[s].epdis.length > 0)
+	// FIXME !!! to enable l2tpns reading mssf frames receiver_max_seq, sender_max_seq must be introduce
+	// now session[s].mssf flag indecates that the receiver wish to receive frames in mssf, so max_seq (i.e. recv_max_seq) = 1<<24
+	/*
+	if (bundle[b].mssf)
+		bundle[b].max_seq = 1 << 12;
+	else */
+		bundle[b].max_seq = 1 << 24;
+	if(session[s].epdis.length > 0)
 		setepdis(&bundle[b].epdis, session[s].epdis);
 
 	strcpy(bundle[b].user, session[s].user);
 	bundle[b].members[0] = s;
+	bundle[b].timeout = session[s].timeout;
 	LOG(3, s, session[s].tunnel, "MPPP: Created a new bundle (%d)\n", b);
 	return b;
 }
@@ -1155,11 +1209,12 @@ static bundleidt new_bundle()
 		{
 			LOG(4, 0, 0, "MPPP: Assigning bundle ID %d\n", i);
 			bundle[i].num_of_links = 1;
-			bundle[i].last_check = time_now;	// Initialize last_check value
+			bundle[i].last_check = time_now;        // Initialize last_check value
 			bundle[i].state = BUNDLEOPEN;
-			bundle[i].current_ses = -1;	// This is to enforce the first session 0 to be used at first
+			bundle[i].current_ses = -1;     // This is to enforce the first session 0 to be used at first
+			memset(&frag[i], 0, sizeof(fragmentationt));
 			if (i > config->cluster_highest_bundleid)
-				config->cluster_highest_bundleid = i;
+					config->cluster_highest_bundleid = i;
 			return i;
 		}
 	}
@@ -1432,6 +1487,13 @@ static void ipv6cp_open(sessionidt s, tunnelidt t)
 	if (session[s].ipv6prefixlen)
 		route6set(s, session[s].ipv6route, session[s].ipv6prefixlen, 1);
 
+	if (session[s].ipv6address.s6_addr[0])
+	{
+		// Check if included in prefix
+		if (sessionbyipv6(session[s].ipv6address) != s)
+			route6set(s, session[s].ipv6address, 128, 1);
+	}
+
 	// Send an initial RA (TODO: Should we send these regularly?)
 	send_ipv6_ra(s, t, NULL);
 }
@@ -1505,7 +1567,7 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		uint8_t *o = p + 4;
 		int length = l - 4;
 		int gotip = 0;
-		uint8_t ident[8];
+		uint32_t ident[2];
 
 		while (length > 2)
 		{
@@ -1517,12 +1579,12 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 				gotip++; // seen address
 				if (o[1] != 10) return;
 
-				*(uint32_t *) ident = htonl(session[s].ip);
-				*(uint32_t *) (ident + 4) = 0;
+				ident[0] = htonl(session[s].ip);
+				ident[1] = 0;
 
 				if (memcmp(o + 2, ident, sizeof(ident)))
 				{
-					q = ppp_conf_nak(s, b, sizeof(b), PPPIPV6CP, &response, q, p, o, ident, sizeof(ident));
+					q = ppp_conf_nak(s, b, sizeof(b), PPPIPV6CP, &response, q, p, o, (uint8_t *)ident, sizeof(ident));
 					if (!q) return;
 				}
 
@@ -1645,13 +1707,46 @@ void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	}
 }
 
+static void update_sessions_in_stat(sessionidt s, uint16_t l)
+{
+	bundleidt b = session[s].bundle;
+	if (!b)
+	{
+		increment_counter(&session[s].cin, &session[s].cin_wrap, l);
+        	session[s].cin_delta += l;
+       		session[s].pin++;
+
+        	sess_local[s].cin += l;
+        	sess_local[s].pin++;
+	}
+	else
+	{
+		int i = frag[b].re_frame_begin_index;
+		int end = frag[b].re_frame_end_index;
+		for (;;)
+		{
+			l = frag[b].fragment[i].length;
+			s = frag[b].fragment[i].sid;
+			increment_counter(&session[s].cin, &session[s].cin_wrap, l);
+	                session[s].cin_delta += l;
+       		        session[s].pin++;
+
+                	sess_local[s].cin += l;
+                	sess_local[s].pin++;
+			if (i == end)
+				return;
+			i = (i + 1) & MAXFRAGNUM_MASK;
+		}
+	}
+}
+
 // process IP packet received
 //
 // This MUST be called with at least 4 byte behind 'p'.
 // (i.e. this routine writes to p[-4]).
 void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
-	in_addr_t ip;
+	in_addr_t ip, ip_dst;
 
 	CSTAT(processipin);
 
@@ -1665,6 +1760,7 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	}
 
 	ip = ntohl(*(uint32_t *)(p + 12));
+	ip_dst = *(uint32_t *)(p + 16);
 
 	if (l > MAXETHER)
 	{
@@ -1679,7 +1775,7 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	if (!session[s].bundle || bundle[session[s].bundle].num_of_links < 2) // FIXME: 
 	{
 		// no spoof (do sessionbyip to handled statically routed subnets)
-		if (ip != session[s].ip && sessionbyip(htonl(ip)) != s)
+		if (!config->disable_no_spoof && ip != session[s].ip && sessionbyip(htonl(ip)) != s)
 		{
 			LOG(4, s, t, "Dropping packet with spoofed IP %s\n", fmtaddr(htonl(ip), 0));
 			return;
@@ -1703,18 +1799,17 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	*(uint32_t *) p = htonl(PKTIP);
 	l += 4;
 
-	// Are we throttled and a slave?
-	if (session[s].tbf_in && !config->cluster_iam_master) {
-		// Pass it to the master for handling.
-		master_throttle_packet(session[s].tbf_in, p, l);
-		return;
-	}
-
-	// Are we throttled and a master??
-	if (session[s].tbf_in && config->cluster_iam_master) {
-		// Actually handle the throttled packets.
-		tbf_queue_packet(session[s].tbf_in, p, l);
-		return;
+	if (session[s].tbf_in)
+	{
+		if (!config->no_throttle_local_IP || !sessionbyip(ip_dst))
+		{
+			// Are we throttling this session?
+			if (config->cluster_iam_master)
+				tbf_queue_packet(session[s].tbf_in, p, l);
+			else
+				master_throttle_packet(session[s].tbf_in, p, l);
+			return;
+		}
 	}
 
 	// send to ethernet
@@ -1736,12 +1831,7 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
 	}
 
-	increment_counter(&session[s].cin, &session[s].cin_wrap, l);
-	session[s].cin_delta += l;
-	session[s].pin++;
-
-	sess_local[s].cin += l;
-	sess_local[s].pin++;
+	update_sessions_in_stat(s, l);
 
 	eth_tx += l;
 
@@ -1753,161 +1843,387 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 void processmpin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
 	bundleidt b = session[s].bundle;
-	uint8_t begin_frame;
-	uint8_t end_frame;
-	uint32_t seq_num;
-	uint32_t offset;
+	bundlet * this_bundle = &bundle[b];
+	uint32_t maskSeq, max_seq;
+	int frag_offset;
+	uint16_t frag_index, frag_index_next, frag_index_prev;
+	fragmentationt *this_fragmentation = &frag[b];
+	uint8_t begin_frame = (*p & MP_BEGIN);
+	uint8_t end_frame = (*p & MP_END);
+	uint32_t seq_num, seq_num_next, seq_num_prev;
+	uint32_t i;
+	uint8_t flags = *p;
+	uint16_t begin_index, end_index;
+
+	// Perform length checking
+	if(l > MAXFRAGLEN)
+	{
+		LOG(2, s, t, "MPPP: discarding fragment larger than MAXFRAGLEN\n");
+		return;
+	}
 
-	if (!b)
+	if(!b)
 	{
-		LOG(3, s, t, "MPPP: Invalid bundle id: 0\n");
+		LOG(2, s, t, "MPPP: Invalid bundle id: 0\n");
 		return;
 	}
-
-	begin_frame = (*p & 0x80);
-	end_frame = (*p & 0x40);
-	if (session[s].mssf)
+	// FIXME !! session[s].mssf means that the receiver wants to receive frames in mssf not means the receiver will send frames in mssf
+	/* if(session[s].mssf)
 	{
 		// Get 12 bit for seq number
-		uint16_t short_seq_num = ntohs((*(uint16_t *) p) & 0xFF0F);
-		uint16_t short_seq_num2 = short_seq_num >> 4;
+		seq_num = ntohs((*(uint16_t *) p) & 0xFF0F);
 		p += 2;
 		l -= 2;
-		seq_num = short_seq_num2;
 		// After this point the pointer should be advanced 2 bytes
-		LOG(3, s, t, "MPPP: 12 bits, sequence number: %d, short1: %d, short2: %d\n",seq_num, short_seq_num, short_seq_num2);
+		LOG(3, s, t, "MPPP: 12 bits, sequence number: %d\n",seq_num);
 	}
-	else
+	else */
 	{
 		// Get 24 bit for seq number
-		p++;
 		seq_num = ntohl((*(uint32_t *) p) & 0xFFFFFF00);
-		seq_num = seq_num >> 8;
-		p += 3;
+		p += 4;
 		l -= 4;
 		// After this point the pointer should be advanced 4 bytes
 		LOG(4, s, t, "MPPP: 24 bits sequence number:%d\n",seq_num);
 	}
 
-	if (seq_num - bundle[b].offset < 0)
+	max_seq = this_bundle->max_seq;
+	maskSeq = max_seq - 1;
+
+	/*
+	 * Expand sequence number to 32 bits, making it as close
+	 * as possible to this_fragmentation->M.
+	 */
+	seq_num |= this_fragmentation->M & ~maskSeq;
+	if ((int)(this_fragmentation->M - seq_num) > (int)(maskSeq >> 1))
+	{
+		seq_num += maskSeq + 1;
+	}
+	else if ((int)(seq_num - this_fragmentation->M) > (int)(maskSeq >> 1))
 	{
-		bundle[b].offset = 0;
-		bundle[b].pending_frag = 0;
+		seq_num -= maskSeq + 1;	/* should never happen */
 	}
 
-	offset = bundle[b].offset;
-	if (begin_frame)
+	// calculate this fragment's offset from the begin seq in the bundle
+	frag_offset = (int) (seq_num - this_fragmentation->start_seq);
+	
+	sess_local[s].last_seq = seq_num;
+
+	// calculate the jitter average
+	uint32_t ljitter = time_now_ms - sess_local[s].prev_time;
+	if (ljitter > 0)
 	{
-		// Check for previous non-assembled frames
-		int error = 0;
-		if (bundle[b].pending_frag)
+		sess_local[s].jitteravg = (sess_local[s].jitteravg + ljitter)>>1;
+		sess_local[s].prev_time = time_now_ms;
+	}
+
+	uint32_t Mmin;
+
+	if (seq_num < this_fragmentation->M)
+	{
+		Mmin = seq_num;
+		this_fragmentation->M = seq_num;
+	}
+	else
+	{
+		Mmin = sess_local[(this_bundle->members[0])].last_seq;
+		for (i = 1; i < this_bundle->num_of_links; i++)
 		{
-			uint32_t fn = bundle[b].seq_num_m - offset;
-			uint16_t cur_len;
-			bundle[b].pending_frag = 0;
-			// Check for array indexes
-			if (fn < 0 || fn > MAXFRAGNUM)
-			{
-				LOG(2, s, t, "ERROR: Index out of range fn:%d, bundle:%d\n",fn,b);
-				return;
-			}
+			uint32_t s_seq = sess_local[(this_bundle->members[i])].last_seq;
+			if (s_seq < Mmin)
+				Mmin = s_seq;
+		}
+		this_fragmentation->M = Mmin;
+	}
 
-			if (seq_num-offset < 0 || seq_num-offset > MAXFRAGNUM)
-			{
-				LOG(2, s, t, "ERROR: Index out of range fn(last):%d, bundle:%d\n",fn,b);
-				return;
-			}
-			/////////////////////////////////////////////////////
-			cur_len = 4;   // This is set to 4 to leave 4 bytes for function processipin
-			for (fn = bundle[b].seq_num_m - offset; fn < seq_num - offset; fn++)
-			{
-				if (!frag[b].fragment[fn].length)
-				{
-					LOG(4, s, t, "MPPP: Found lost fragment while reassembling frame %d in (%d,%d)\n",fn, bundle[b].seq_num_m-offset, seq_num-offset);
-					error = 1;
-					break;
-				}
+	// calculate M offset of the M seq in the bundle
+	int M_offset = (int) (Mmin - this_fragmentation->start_seq);
 
-				if (cur_len + frag[b].fragment[fn].length > MAXETHER)
-				{
-					LOG(2, s, t, "MPPP: ERROR: very long frame after assembling %d\n", frag[b].fragment[fn].length+cur_len);
-					error = 1;
-					break;
-				}
+	if (M_offset >= MAXFRAGNUM)
+	{
+		// There have a long break of the link !!!!!!!!
+		// M_offset is bigger that the fragmentation buffer size
+		LOG(3, s, t, "MPPP: M_offset out of range, min:%d, begin_seq:%d\n", Mmin, this_fragmentation->start_seq);
 
-				memcpy(frag[b].reassembled_frame+cur_len, frag[b].fragment[fn].data, frag[b].fragment[fn].length);
-				cur_len += frag[b].fragment[fn].length; 
-				frag[b].fragment[fn].length = 0;      // Indicates that this fragment has been consumed
-				// This is usefull for compression
-				memset(frag[b].fragment[fn].data, 0, sizeof(frag[b].fragment[fn].data));
-			}
+		// Calculate the new start index, the previous frag are lost
+		begin_index = (M_offset + this_fragmentation->start_index) & MAXFRAGNUM_MASK;
 
-			if (!error)
-			{
-				frag[b].re_frame_len = cur_len;
-				// Process the resassembled frame
-				LOG(4, s, t, "MPPP: Process the reassembled frame, len=%d\n",cur_len);
-				processmpframe(s, t, frag[b].reassembled_frame, frag[b].re_frame_len, 1);
-				// Set reassembled frame length to zero after processing it
-				frag[b].re_frame_len = 0;
-				memset(frag[b].reassembled_frame, 0, sizeof(frag[b].reassembled_frame));
-			}
+		// Set new Start sequence
+		this_fragmentation->start_index = begin_index;
+		this_fragmentation->start_seq = Mmin;
+		M_offset = 0;
+		// recalculate the fragment offset from the new begin seq in the bundle
+		frag_offset = (int) (seq_num - Mmin);
+	}
+
+	// discard this fragment if the packet comes before the start sequence
+	if (frag_offset < 0)
+	{
+		// this packet comes before the next
+		LOG(3, s, t, "MPPP: (COMES BEFORE) the next, seq:%d, begin_seq:%d, size_frag:%d, flags:%02X is LOST\n", seq_num, this_fragmentation->start_seq, l, flags);
+		return;
+	}
+
+	// discard if frag_offset is bigger that the fragmentation buffer size
+	if (frag_offset >= MAXFRAGNUM)
+	{
+		// frag_offset is bigger that the fragmentation buffer size
+		LOG(3, s, t, "MPPP: Index out of range, seq:%d, begin_seq:%d\n", seq_num, this_fragmentation->start_seq);
+		return;
+	}
+
+	//caculate received fragment's index in the fragment array
+	frag_index = (frag_offset + this_fragmentation->start_index) & MAXFRAGNUM_MASK;
+
+	// insert the frame in it's place
+	fragmentt *this_frag = &this_fragmentation->fragment[frag_index];
+
+	if (this_frag->length > 0)
+		// This fragment is lost, It was around the buffer and it was never completed the packet.
+		LOG(3, this_frag->sid, this_frag->tid, "MPPP: (INSERT) seq_num:%d frag_index:%d flags:%02X is LOST\n",
+			this_frag->seq, frag_index, this_frag->flags);
+
+	this_frag->length = l;
+	this_frag->sid = s;
+	this_frag->tid = t;
+	this_frag->flags = flags;
+	this_frag->seq = seq_num;
+	this_frag->jitteravg = sess_local[s].jitteravg;
+	memcpy(this_frag->data, p, l);
+
+	LOG(4, s, t, "MPPP: seq_num:%d frag_index:%d INSERTED flags: %02X\n",  seq_num, frag_index, flags);
+
+	//next frag index
+	frag_index_next = (frag_index + 1) & MAXFRAGNUM_MASK;
+	//previous frag index
+	frag_index_prev = (frag_index - 1) & MAXFRAGNUM_MASK;
+	// next seq
+	seq_num_next = seq_num + 1;
+	// previous seq
+	seq_num_prev = seq_num - 1;
+
+	// Clean the buffer and log the lost fragments
+	if ((frag_index_next != this_fragmentation->start_index) && this_fragmentation->fragment[frag_index_next].length)
+	{
+		// check if the next frag is a lost fragment
+		if (this_fragmentation->fragment[frag_index_next].seq != seq_num_next)
+		{
+			// This fragment is lost, It was around the buffer and it was never completed the packet.
+			LOG(3, this_fragmentation->fragment[frag_index_next].sid, this_fragmentation->fragment[frag_index_next].tid,
+				"MPPP: (NEXT) seq_num:%d frag_index:%d flags:%02X is LOST\n",
+				this_fragmentation->fragment[frag_index_next].seq, frag_index_next,
+				this_fragmentation->fragment[frag_index_next].flags);
+			// this frag is lost
+			this_fragmentation->fragment[frag_index_next].length = 0;
+			this_fragmentation->fragment[frag_index_next].flags = 0;
+
+			if (begin_frame && (!end_frame)) return; // assembling frame failed
 		}
-		//////////////////////////////////////////
-		bundle[b].seq_num_m = seq_num;
-		if (end_frame)
+	}
+
+	// Clean the buffer and log the lost fragments
+	if ((frag_index != this_fragmentation->start_index) && this_fragmentation->fragment[frag_index_prev].length)
+	{
+		// check if the next frag is a lost fragment
+		if (this_fragmentation->fragment[frag_index_prev].seq != seq_num_prev)
 		{
-			// Both bits are set
-			LOG(4, s, t, "MPPP: Both bits are set (Begin and End).\n");
-			processmpframe(s, t, p, l, 0);
-			// The maximum number of fragments is 1500
-			if (seq_num - bundle[b].offset >= 1400)
-			{
-				bundle[b].offset = seq_num;
-				LOG(4, s, t, "MPPP: Setting offset to: %d\n",bundle[b].offset);
-			}
+			// This fragment is lost, It was around the buffer and it was never completed the packet.
+			LOG(3, this_fragmentation->fragment[frag_index_prev].sid, this_fragmentation->fragment[frag_index_prev].tid,
+				"MPPP: (PREV) seq_num:%d frag_index:%d flags:%02X is LOST\n",
+				this_fragmentation->fragment[frag_index_prev].seq, frag_index_prev,
+				this_fragmentation->fragment[frag_index_prev].flags);
+
+			this_fragmentation->fragment[frag_index_prev].length = 0;
+			this_fragmentation->fragment[frag_index_prev].flags = 0;
+
+			if (end_frame && (!begin_frame)) return; // assembling frame failed
 		}
-		else
+	}
+
+find_frame:
+	begin_index = this_fragmentation->start_index;
+	uint32_t b_seq = this_fragmentation->start_seq;
+	// Try to find a Begin sequence from the start_seq sequence to M sequence
+	while (b_seq < Mmin)
+	{
+		if (this_fragmentation->fragment[begin_index].length)
 		{
-			bundle[b].pending_frag = 1;
-			// End bit is clear
-                	LOG(4, s, t, "MPPP: Push to receive buffer\n");
-                	// Push to the receive buffer
-			// Array indexes checking
-			if (seq_num-offset < 0 || seq_num-offset >= MAXFRAGNUM)
+			if (b_seq == this_fragmentation->fragment[begin_index].seq)
 			{
-				LOG(2, s, t, "ERROR: Index out of range, push to receive buffer(1) seq:%d, offset:%d, bundle:%d\n",seq_num,offset,b);
-				return;
+				if (this_fragmentation->fragment[begin_index].flags & MP_BEGIN)
+				{
+					int isfoundE = 0;
+					// Adjust the new start sequence and start index
+					this_fragmentation->start_index = begin_index;
+					this_fragmentation->start_seq = b_seq;
+					// Begin Sequence found, now try to found the End Sequence to complete the frame
+					end_index = begin_index;
+					while (b_seq < Mmin)
+					{
+						if (this_fragmentation->fragment[end_index].length)
+						{
+							if (b_seq == this_fragmentation->fragment[end_index].seq)
+							{
+								if (this_fragmentation->fragment[end_index].flags & MP_END)
+								{
+									// The End sequence was found and the frame is complete
+									isfoundE = 1;
+									break;
+								}
+							}
+							else
+							{
+								// This fragment is lost, it was never completed the packet.
+								LOG(3, this_fragmentation->fragment[end_index].sid, this_fragmentation->fragment[end_index].tid,
+									"MPPP: (FIND END) seq_num:%d frag_index:%d flags:%02X is LOST\n",
+									this_fragmentation->fragment[end_index].seq, begin_index,
+									this_fragmentation->fragment[end_index].flags);
+								// this frag is lost
+								this_fragmentation->fragment[end_index].length = 0;
+								this_fragmentation->fragment[end_index].flags = 0;
+								// This frame is not complete find the next Begin
+								break;
+							}
+						}
+						else
+						{
+							// This frame is not complete find the next Begin if exist
+							break;
+						}
+						end_index = (end_index +1) & MAXFRAGNUM_MASK;
+						b_seq++;
+					}
+
+					if (isfoundE)
+						// The End sequence was found and the frame is complete
+						break;
+					else
+						// find the next Begin
+						begin_index = end_index;
+				}
 			}
-			// Perform length checking
-			if (l > MAXFRAGLEN)
+			else
 			{
-				LOG(2, s, t, "MPPP: ERROR: very long fragment length (1)\n");
-				return;
+				// This fragment is lost, it was never completed the packet.
+				LOG(3, this_fragmentation->fragment[begin_index].sid, this_fragmentation->fragment[begin_index].tid,
+					"MPPP: (FIND BEGIN) seq_num:%d frag_index:%d flags:%02X is LOST\n",
+					this_fragmentation->fragment[begin_index].seq, begin_index,
+					this_fragmentation->fragment[begin_index].flags);
+				// this frag is lost
+				this_fragmentation->fragment[begin_index].length = 0;
+				this_fragmentation->fragment[begin_index].flags = 0;
 			}
-                	frag[b].fragment[seq_num - offset].length = l;
-                	memcpy(frag[b].fragment[seq_num - offset].data, p, l);
+		}
+		begin_index = (begin_index +1) & MAXFRAGNUM_MASK;
+		b_seq++;
+	}
+
+assembling_frame:
+	// try to assemble the frame that has the received fragment as a member
+	// get the beginning of this frame
+	begin_index = end_index = this_fragmentation->start_index;
+	if (this_fragmentation->fragment[begin_index].length)
+	{
+		if (!(this_fragmentation->fragment[begin_index].flags & MP_BEGIN))
+		{
+			LOG(3, this_fragmentation->fragment[begin_index].sid, this_fragmentation->fragment[begin_index].tid,
+				"MPPP: (NOT BEGIN) seq_num:%d frag_index:%d flags:%02X\n",
+				this_fragmentation->fragment[begin_index].seq, begin_index,
+				this_fragmentation->fragment[begin_index].flags);
+			// should occur only after an "M_Offset out of range"
+			// The start sequence must be a begin sequence
+			this_fragmentation->start_index = (begin_index +1) & MAXFRAGNUM_MASK;
+			this_fragmentation->start_seq++;
+			return; // assembling frame failed
 		}
 	}
 	else
+		return; // assembling frame failed
+
+	// get the end of his frame
+	while (this_fragmentation->fragment[end_index].length)
+	{
+		if (this_fragmentation->fragment[end_index].flags & MP_END)
+			break;
+
+		end_index = (end_index +1) & MAXFRAGNUM_MASK;
+
+		if (end_index == this_fragmentation->start_index)
+			return; // assembling frame failed
+	}
+
+	// return if a lost fragment is found
+	if (!(this_fragmentation->fragment[end_index].length))
+		return; // assembling frame failed
+
+	// assemble the packet
+	//assemble frame, process it, reset fragmentation
+	uint16_t cur_len = 4;   // This is set to 4 to leave 4 bytes for function processipin
+
+	LOG(4, s, t, "MPPP: processing fragments from %d to %d\n", begin_index, end_index);
+	// Push to the receive buffer
+
+	for (i = begin_index;; i = (i + 1) & MAXFRAGNUM_MASK)
 	{
-		LOG(4, s, t, "MPPP: Push to receive buffer\n");
-		// Push to the receive buffer
-		// Array indexes checking
-		if (seq_num-offset < 0 || seq_num-offset >= MAXFRAGNUM)
+		this_frag = &this_fragmentation->fragment[i];
+		if(cur_len + this_frag->length > MAXETHER)
 		{
-			LOG(2, s, t, "ERROR: Index out of range, push to receive buffer(2) seq:%d, offset:%d, bundle:%d\n",seq_num,offset,b);
-			return;
+			LOG(2, s, t, "MPPP: discarding reassembled frames larger than MAXETHER\n");
+			break;
 		}
-		// Perform length checking
-		if (l > MAXFRAGLEN)
+
+		memcpy(this_fragmentation->reassembled_frame+cur_len, this_frag->data, this_frag->length);
+		LOG(5, s, t, "MPPP: processing frame at %d, with len %d\n", i, this_frag->length);
+
+		cur_len += this_frag->length;
+		if (i == end_index)
 		{
-			LOG(2, s, t, "MPPP: ERROR: very long fragment length (2).\n");
-			return;
+			this_fragmentation->re_frame_len = cur_len;
+			this_fragmentation->re_frame_begin_index = begin_index;
+			this_fragmentation->re_frame_end_index = end_index;
+			// Process the resassembled frame
+			LOG(5, s, t, "MPPP: Process the reassembled frame, len=%d\n",cur_len);
+			processmpframe(s, t, this_fragmentation->reassembled_frame, this_fragmentation->re_frame_len, 1);
+			break;
 		}
-		frag[b].fragment[seq_num - offset].length = l;
-		memcpy(frag[b].fragment[seq_num - offset].data, p, l);
 	}
+
+	// Set reassembled frame length to zero after processing it
+	this_fragmentation->re_frame_len = 0;
+	for (i = begin_index;; i = (i + 1) & MAXFRAGNUM_MASK)
+	{
+		this_fragmentation->fragment[i].length = 0;      // Indicates that this fragment has been consumed
+		this_fragmentation->fragment[i].flags = 0;
+		if (i == end_index)
+			break;
+	}
+
+	// Set the new start_index and start_seq
+	this_fragmentation->start_index = (end_index + 1) & MAXFRAGNUM_MASK;
+	this_fragmentation->start_seq = this_fragmentation->fragment[end_index].seq + 1;
+	LOG(4, s, t, "MPPP after assembling: start index is = %d, start seq=%d\n", this_fragmentation->start_index, this_fragmentation->start_seq);
+
+	begin_index = this_fragmentation->start_index;
+	if ((this_fragmentation->fragment[begin_index].length) &&
+		(this_fragmentation->fragment[begin_index].seq != this_fragmentation->start_seq))
+	{
+		LOG(3, this_fragmentation->fragment[begin_index].sid, this_fragmentation->fragment[begin_index].tid,
+				"MPPP: (START) seq_num:%d frag_index:%d flags:%02X is LOST\n",
+				this_fragmentation->fragment[begin_index].seq, begin_index,
+				this_fragmentation->fragment[begin_index].flags);
+			this_fragmentation->fragment[begin_index].length = 0;
+			this_fragmentation->fragment[begin_index].flags = 0;
+	}
+
+	if (this_fragmentation->start_seq <= Mmin)
+		// It's possible to find other complete frame or lost frame.
+		goto find_frame;
+	else if ((this_fragmentation->fragment[begin_index].length) &&
+			  (this_fragmentation->fragment[begin_index].flags & MP_BEGIN))
+		// may be that the next frame is completed
+		goto assembling_frame;
+
+	return;
 }
 
 // process IPv6 packet received
@@ -1937,7 +2253,7 @@ void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		return;
 
 	// no spoof
-	if (ipv4 != session[s].ip && memcmp(&config->ipv6_prefix, &ip, 8) && sessionbyipv6(ip) != s)
+	if ((ipv4 != session[s].ip || memcmp(&config->ipv6_prefix, &ip, 8)) && sessionbyipv6(ip) != s)
 	{
 		char str[INET6_ADDRSTRLEN];
 		LOG(5, s, t, "Dropping packet with spoofed IP %s\n",
@@ -1955,6 +2271,16 @@ void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		return;
 	}
 
+	// Check if DhcpV6, IP dst: FF02::1:2, Src Port 0x0222 (546), Dst Port 0x0223 (547)
+	if (*(p + 6) == 17 && *(p + 24) == 0xFF && *(p + 25) == 2 &&
+			*(uint32_t *)(p + 26) == 0 && *(uint32_t *)(p + 30) == 0 &&
+			*(uint16_t *)(p + 34) == 0 && *(p + 36) == 0 && *(p + 37) == 1 && *(p + 38) == 0 && *(p + 39) == 2 &&
+			*(p + 40) == 2 && *(p + 41) == 0x22 && *(p + 42) == 2 && *(p + 43) == 0x23)
+	{
+		dhcpv6_process(s, t, p, l);
+		return;
+	}
+
 	// Add on the tun header
 	p -= 4;
 	*(uint32_t *) p = htonl(PKTIPV6);
@@ -1993,12 +2319,7 @@ void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 		snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
 	}
 
-	increment_counter(&session[s].cin, &session[s].cin_wrap, l);
-	session[s].cin_delta += l;
-	session[s].pin++;
-
-	sess_local[s].cin += l;
-	sess_local[s].pin++;
+	update_sessions_in_stat(s, l);
 
 	eth_tx += l;
 
@@ -2211,9 +2532,9 @@ void sendchap(sessionidt s, tunnelidt t)
 	q[1] = radius[r].id;			// ID
 	q[4] = 16;				// value size (size of challenge)
 	memcpy(q + 5, radius[r].auth, 16);	// challenge
-	strcpy((char *) q + 21, hostname);	// our name
-	*(uint16_t *) (q + 2) = htons(strlen(hostname) + 21); // length
-	tunnelsend(b, strlen(hostname) + 21 + (q - b), t); // send it
+	strcpy((char *) q + 21, config->multi_n_hostname[tunnel[t].indexudp][0]?config->multi_n_hostname[tunnel[t].indexudp]:hostname);	// our name
+	*(uint16_t *) (q + 2) = htons(strlen(config->multi_n_hostname[tunnel[t].indexudp][0]?config->multi_n_hostname[tunnel[t].indexudp]:hostname) + 21); // length
+	tunnelsend(b, strlen(config->multi_n_hostname[tunnel[t].indexudp][0]?config->multi_n_hostname[tunnel[t].indexudp]:hostname) + 21 + (q - b), t); // send it
 }
 
 // fill in a L2TP message with a PPP frame,
@@ -2224,6 +2545,11 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 	uint16_t type = mtype;
 	uint8_t *start = b;
 
+	if (t == TUNNEL_ID_PPPOE)
+	{
+		return pppoe_makeppp(b, size, p, l, s, t, mtype, prio, bid, mp_bits);
+	}
+
 	if (size < 16) // Need more space than this!!
 	{
 		LOG(0, s, t, "makeppp buffer too small for L2TP header (size=%d)\n", size);
@@ -2269,7 +2595,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 		{
 			// Set the multilink bits
 			uint16_t bits_send = mp_bits;
-			*(uint16_t *) b = htons((bundle[bid].seq_num_t & 0xFF0F)|bits_send);
+			*(uint16_t *) b = htons((bundle[bid].seq_num_t & 0x0FFF)|bits_send);
 			b += 2;
 		}
 		else
@@ -2293,7 +2619,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 
 	if ((b - start) + l > size)
 	{
-		LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, (b - start) + l);
+		LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%td)\n", size, (b - start) + l);
 		return NULL;
 	}
 
@@ -2304,6 +2630,85 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 	return b;
 }
 
+// fill in a L2TP message with a PPP frame,
+// returns start of PPP frame
+//(note: THIS ROUTINE CAN WRITES TO p[-28]).
+uint8_t *opt_makeppp(uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype, uint8_t prio, bundleidt bid, uint8_t mp_bits)
+{
+	uint16_t hdr = 0x0002; // L2TP with no options
+	uint16_t type = mtype;
+	uint8_t *b = p;
+
+	if (t == TUNNEL_ID_PPPOE)
+	{
+		return opt_pppoe_makeppp(p, l, s, t, mtype, prio, bid, mp_bits);
+	}
+
+	// Check whether this session is part of multilink
+	if (bid)
+	{
+		if (bundle[bid].num_of_links > 1)
+			type = PPPMP; // Change PPP message type to the PPPMP
+		else
+			bid = 0;
+	}
+
+	if (bid)
+	{
+		// Add the message type if this fragment has the begin bit set
+		if (mp_bits & MP_BEGIN)
+		{
+			b -= 2;
+			*(uint16_t *) b = htons(mtype); // Message type
+		}
+
+		// Set the sequence number and (B)egin (E)nd flags
+		if (session[s].mssf)
+		{
+			// Set the multilink bits
+			uint16_t bits_send = mp_bits;
+			b -= 2;
+			*(uint16_t *) b = htons((bundle[bid].seq_num_t & 0x0FFF)|bits_send);
+		}
+		else
+		{
+			b -= 4;
+			*(uint32_t *) b = htonl(bundle[bid].seq_num_t);
+			// Set the multilink bits
+			*b = mp_bits;
+		}
+
+		bundle[bid].seq_num_t++;
+	}
+
+	if (type < 0x100 && session[s].flags & SESSION_PFC)
+	{
+		b--;
+		*b = type;
+	}
+	else
+	{
+		b -= 2;
+		*(uint16_t *) b = htons(type);
+	}
+
+	if (type == PPPLCP || !(session[s].flags & SESSION_ACFC))
+	{
+		b -= 2;
+		*(uint16_t *) b = htons(0xFF03); // HDLC header
+	}
+
+	if (prio) hdr |= 0x0100; // set priority bit
+	b -= 2;
+	*(uint16_t *) b = htons(session[s].far); // session
+	b -= 2;
+	*(uint16_t *) b = htons(tunnel[t].far); // tunnel
+	b -= 2;
+	*(uint16_t *) b = htons(hdr);
+
+	return b;
+}
+
 static int add_lcp_auth(uint8_t *b, int size, int authtype)
 {
 	int len = 0;