X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/81ca38323a409a68ef80c46283c555d20d553e2d..refs/heads/fendo-mods:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index d8bedee..7478560 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -162,6 +162,8 @@ config_descriptt config_values[] = {
 	CONFIG("hostname", hostname, STRING),
 	CONFIG("nexthop_address", nexthop_address, IPv4),
 	CONFIG("nexthop6_address", nexthop6_address, IPv6),
+	CONFIG("echo_timeout", echo_timeout, INT),
+	CONFIG("idle_echo_timeout", idle_echo_timeout, INT),
 	{ NULL, 0, 0, 0 },
 };
 
@@ -244,7 +246,7 @@ static clockt now(double *f)
 
 	// Time in milliseconds
 	time_now_ms = (t.tv_sec * 1000) + (t.tv_usec/1000);
-	
+
 	return (t.tv_sec - basetime) * 10 + t.tv_usec / 100000 + 1;
 }
 
@@ -1328,7 +1330,8 @@ static void update_session_out_stat(sessionidt s, sessiont *sp, int len)
 
 // process outgoing (to tunnel) IP
 //
-static void processipout(uint8_t *buf, int len)
+// (i.e. this routine writes to data[-8]).
+void processipout(uint8_t *buf, int len)
 {
 	sessionidt s;
 	sessiont *sp;
@@ -1467,6 +1470,14 @@ static void processipout(uint8_t *buf, int len)
 
 	if(session[s].bundle != 0 && bundle[session[s].bundle].num_of_links > 1)
 	{
+
+		if (!config->cluster_iam_master)
+		{
+			// The MPPP packets must be managed by the Master.
+			master_forward_mppp_packet(s, data, size);
+			return;
+		}
+
 		// Add on L2TP header
 		sessionidt members[MAXBUNDLESES];
 		bundleidt bid = session[s].bundle;
@@ -1488,7 +1499,7 @@ static void processipout(uint8_t *buf, int len)
 
 		if (nb_opened < 1)
 		{
-			LOG(2, s, t, "MPPP: PROCESSIPOUT ERROR, no session opened in bundle:%d\n", bid);
+			LOG(3, s, t, "MPPP: PROCESSIPOUT ERROR, no session opened in bundle:%d\n", bid);
 			return;
 		}
 
@@ -1498,7 +1509,7 @@ static void processipout(uint8_t *buf, int len)
 		t = session[s].tunnel;
 		sp = &session[s];
 		LOG(4, s, t, "MPPP: (1)Session number becomes: %d\n", s);
-		
+
 		if (num_of_links > 1)
 		{
 			if(len > MINFRAGLEN)
@@ -1523,7 +1534,7 @@ static void processipout(uint8_t *buf, int len)
 
 				remain -= fraglen;
 				while (remain > last_fraglen)
-				{ 
+				{
 					b->current_ses = (b->current_ses + 1) % num_of_links;
 					s = members[b->current_ses];
 					t = session[s].tunnel;
@@ -2033,11 +2044,11 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 				{
 					uint8_t ml;
 					for(ml = 0; ml<bundle[b].num_of_links; ml++)
-							if(bundle[b].members[ml] == s)
-							{
-									mem_num = ml;
-									break;
-							}
+					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, session[s].tunnel, "MPPP: Adjusted member links array\n");
 
@@ -2613,7 +2624,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 				case 0:     // message type
 					message = ntohs(*(uint16_t *) b);
 					mandatory = flags & 0x80;
-					LOG(4, s, t, "   Message type = %u (%s)\n", *b, l2tp_code(message));
+					LOG(4, s, t, "   Message type = %u (%s)\n", message, l2tp_code(message));
 					break;
 				case 1:     // result code
 					{
@@ -3208,6 +3219,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 }
 
 // read and process packet on tun
+// (i.e. this routine writes to buf[-8]).
 static void processtun(uint8_t * buf, int len)
 {
 	LOG_HEX(5, "Receive TUN Data", buf, len);
@@ -3481,8 +3493,8 @@ static void regular_cleanups(double period)
 			}
 		}
 
-		// Drop sessions who have not responded within IDLE_TIMEOUT seconds
-		if (session[s].last_packet && (time_now - session[s].last_packet >= IDLE_TIMEOUT))
+		// Drop sessions who have not responded within IDLE_ECHO_TIMEOUT seconds
+		if (session[s].last_packet && (time_now - session[s].last_packet >= config->idle_echo_timeout))
 		{
 			sessionshutdown(s, "No response to LCP ECHO requests.", CDN_ADMIN_DISC, TERM_LOST_SERVICE);
 			STAT(session_timeout);
@@ -3491,7 +3503,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 >= ECHO_TIMEOUT) &&
+		if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= config->echo_timeout) &&
 			(time_now - sess_local[s].last_echo >= ECHO_TIMEOUT))
 		{
 			uint8_t b[MAXETHER];
@@ -3772,6 +3784,8 @@ static void mainloop(void)
 {
 	int i;
 	uint8_t buf[65536];
+	uint8_t *p = buf + 8; // for the hearder of the forwarded MPPP packet (see C_MPPP_FORWARD)
+	int size_bufp = sizeof(buf) - 8;
 	clockt next_cluster_ping = 0;	// send initial ping immediately
 	struct epoll_event events[BASE_FDS + RADIUS_FDS + EXTRA_FDS];
 	int maxevent = sizeof(events)/sizeof(*events);
@@ -4016,9 +4030,9 @@ static void mainloop(void)
 				// incoming IP
 				if (tun_ready)
 				{
-					if ((s = read(tunfd, buf, sizeof(buf))) > 0)
+					if ((s = read(tunfd, p, size_bufp)) > 0)
 					{
-						processtun(buf, s);
+						processtun(p, s);
 					    	tun_pkts++;
 					}
 					else
@@ -4267,6 +4281,9 @@ static void initdata(int optdebug, char *optconfig)
 	config->ppp_max_failure = 5;
 	config->kill_timedout_sessions = 1;
 	strcpy(config->random_device, RANDOMDEVICE);
+	// Set default value echo_timeout and idle_echo_timeout
+	config->echo_timeout = ECHO_TIMEOUT;
+	config->idle_echo_timeout = IDLE_ECHO_TIMEOUT;
 
 	log_stream = stderr;