X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/2b05f31dc724539454f67ea09fb2bd04e5a51e40..90a81d13b57bc08caaeaaccfcc4be75bf7a418a2:/l2tpns.c?ds=sidebyside

diff --git a/l2tpns.c b/l2tpns.c
index 384e7ca..6839c25 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.128 2005-09-02 23:59:56 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.131 2005-09-13 14:27:14 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -1827,6 +1827,11 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 		return;
 	}
 	l -= (p - buf);
+
+	// used to time out old tunnels
+	if (t && tunnel[t].state == TUNNELOPEN)
+		tunnel[t].lastrec = time_now;
+
 	if (*buf & 0x80)
 	{                          // control
 		uint16_t message = 0xFFFF;	// message type
@@ -1914,9 +1919,6 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 			return;
 		}
 
-		// This is used to time out old tunnels
-		tunnel[t].lastrec = time_now;
-
 		// check sequence of this message
 		{
 			int skip = tunnel[t].window; // track how many in-window packets are still in queue
@@ -2416,7 +2418,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 	}
 	else
 	{                          // data
-		uint16_t prot;
+		uint16_t proto;
 
 		LOG_HEX(5, "Receive Tunnel Data", p, l);
 		if (l > 2 && p[0] == 0xFF && p[1] == 0x03)
@@ -2432,12 +2434,12 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 		}
 		if (*p & 1)
 		{
-			prot = *p++;
+			proto = *p++;
 			l--;
 		}
 		else
 		{
-			prot = ntohs(*(uint16_t *) p);
+			proto = ntohs(*(uint16_t *) p);
 			p += 2;
 			l -= 2;
 		}
@@ -2457,43 +2459,43 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 			return;
 		}
 
-		if (prot == PPPPAP)
+		if (proto == PPPPAP)
 		{
 			session[s].last_packet = time_now;
 			if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
 			processpap(s, t, p, l);
 		}
-		else if (prot == PPPCHAP)
+		else if (proto == PPPCHAP)
 		{
 			session[s].last_packet = time_now;
 			if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
 			processchap(s, t, p, l);
 		}
-		else if (prot == PPPLCP)
+		else if (proto == PPPLCP)
 		{
 			session[s].last_packet = time_now;
 			if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
 			processlcp(s, t, p, l);
 		}
-		else if (prot == PPPIPCP)
+		else if (proto == PPPIPCP)
 		{
 			session[s].last_packet = time_now;
 			if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
 			processipcp(s, t, p, l);
 		}
-		else if (prot == PPPIPV6CP)
+		else if (proto == PPPIPV6CP && config->ipv6_prefix.s6_addr[0])
 		{
 			session[s].last_packet = time_now;
 			if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
 			processipv6cp(s, t, p, l);
 		}
-		else if (prot == PPPCCP)
+		else if (proto == PPPCCP)
 		{
 			session[s].last_packet = time_now;
 			if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
 			processccp(s, t, p, l);
 		}
-		else if (prot == PPPIP)
+		else if (proto == PPPIP)
 		{
 			if (session[s].die)
 			{
@@ -2510,13 +2512,8 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 
 			processipin(s, t, p, l);
 		}
-		else if (prot == PPPIPV6)
+		else if (proto == PPPIPV6 && config->ipv6_prefix.s6_addr[0])
 		{
-			if (!config->ipv6_prefix.s6_addr[0])
-			{
-				LOG(1, s, t, "IPv6 not configured; yet received IPv6 packet. Ignoring.\n");
-				return;
-			}
 			if (session[s].die)
 			{
 				LOG(4, s, t, "Session %d is closing.  Don't process PPP packets\n", s);
@@ -2532,10 +2529,38 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 
 			processipv6in(s, t, p, l);
 		}
+		else if (session[s].ppp.lcp == Opened)
+		{
+			uint8_t buf[MAXETHER];
+			uint8_t *q;
+			int mru = session[s].mru;
+
+			if (!mru) mru = MAXMRU;
+			if (mru > sizeof(buf)) mru = sizeof(buf);
+
+			l += 6;
+			if (l > mru) l = mru;
+
+			q = makeppp(buf, sizeof(buf), 0, 0, s, t, proto);
+			if (!q) return;
+
+			*q = CodeRej;
+			*(q + 1) = ++sess_local[s].lcp_ident;
+			*(uint16_t *)(q + 2) = l;
+			*(uint16_t *)(q + 4) = htons(proto);
+			memcpy(q + 6, p, l - 6);
+
+			if (proto == PPPIPV6CP)
+				LOG(3, s, t, "LCP: send ProtocolRej (IPV6CP: not configured)\n");
+			else
+				LOG(2, s, t, "LCP: sent ProtocolRej (0x%04X: unsupported)\n", proto);
+
+			tunnelsend(buf, l + (q - buf), t);
+		}
 		else
 		{
-			STAT(tunnel_rx_errors);
-			LOG(1, s, t, "Unknown PPP protocol %04X\n", prot);
+			LOG(2, s, t, "Unknown PPP protocol 0x%04X received in LCP %s state\n",
+				proto, ppp_state(session[s].ppp.lcp));
 		}
 	}
 }