X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/6fb1f18fb03c15e9e907d55c117281dca2b8b72a..810e88371a3a238b859adff9969a1f16454d77ad:/ppp.c

diff --git a/ppp.c b/ppp.c
index 263fb95..6af5066 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.84 2005/09/16 13:20:39 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.91 2005/12/15 14:23:03 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -449,6 +449,7 @@ static void ppp_code_rej(sessionidt s, tunnelidt t, uint16_t proto,
 {
 	uint8_t *q;
 	int mru = session[s].mru;
+	if (mru < MINMTU) mru = MINMTU;
 	if (mru > size) mru = size;
 
 	l += 4;
@@ -498,7 +499,9 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	if (session[s].die) // going down...
 		return;
 
-	LOG(*p == EchoReq ? 4 : 3, s, t, "LCP: recv %s\n", ppp_code(*p));
+	LOG((*p == EchoReq || *p == EchoReply) ? 4 : 3, s, t,
+		"LCP: recv %s\n", ppp_code(*p));
+
 	if (config->debug > 3) dumplcp(p, l);
 
 	if (*p == ConfigAck)
@@ -575,7 +578,18 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 			switch (type)
 			{
 				case 1: // Maximum-Receive-Unit
-					session[s].mru = ntohs(*(uint16_t *)(o + 2));
+					{
+						uint16_t mru = ntohs(*(uint16_t *)(o + 2));
+						if (mru >= MINMTU)
+						{
+							session[s].mru = mru;
+							break;
+						}
+
+						LOG(3, s, t, "    Remote requesting MRU of %u.  Rejecting.\n", mru);
+						mru = htons(MRU);
+						q = ppp_conf_nak(s, b, sizeof(b), PPPLCP, &response, q, p, o, (uint8_t *) &mru, sizeof(mru));
+					}
 					break;
 
 				case 2: // Async-Control-Character-Map
@@ -782,6 +796,7 @@ void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
 				default:
 				    	LOG(2, s, t, "LCP: remote sent %s for type %u?\n", ppp_code(*p), type);
+					sessionshutdown(s, "Unable to negotiate LCP.", 3, 0);
 					break;
 			}
 			x -= length;
@@ -903,11 +918,17 @@ static void ipcp_open(sessionidt s, tunnelidt t)
 
 	change_state(s, ipcp, Opened);
 
-	if (!session[s].walled_garden)
+	if (!(session[s].walled_garden || session[s].flags & SESSION_STARTED))
 	{
 		uint16_t r = radiusnew(s);
 		if (r)
+		{
 			radiussend(r, RADIUSSTART); // send radius start
+
+			// don't send further Start records if IPCP is restarted
+			session[s].flags |= SESSION_STARTED;
+			cluster_send_session(s);
+		}
 	}
 
 	// start IPv6 if configured and still in passive state
@@ -1020,7 +1041,7 @@ void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 			case 131: // secondary DNS
 				if (o[1] != 6 || o[1] > length) return;
 
-				addr = htonl(session[s].dns1);
+				addr = htonl(session[s].dns2);
 				if (memcmp(o + 2, &addr, sizeof(addr)))
 				{
 					q = ppp_conf_nak(s, b, sizeof(b), PPPIPCP, &response, q, p, o, (uint8_t *) &addr, sizeof(addr));
@@ -1737,9 +1758,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 {
 	if (size < 12) // Need more space than this!!
 	{
-		static int backtrace_count = 0;
 		LOG(0, s, t, "makeppp buffer too small for L2TP header (size=%d)\n", size);
-		log_backtrace(backtrace_count, 5)
 		return NULL;
 	}
 
@@ -1747,12 +1766,12 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 	*(uint16_t *) (b + 2) = htons(tunnel[t].far); // tunnel
 	*(uint16_t *) (b + 4) = htons(session[s].far); // session
 	b += 6;
-	if (mtype == PPPLCP || !(session[s].l2tp_flags & SESSIONACFC))
+	if (mtype == PPPLCP || !(session[s].flags & SESSION_ACFC))
 	{
 		*(uint16_t *) b = htons(0xFF03); // HDLC header
 		b += 2;
 	}
-	if (mtype < 0x100 && session[s].l2tp_flags & SESSIONPFC)
+	if (mtype < 0x100 && session[s].flags & SESSION_PFC)
 		*b++ = mtype;
 	else
 	{
@@ -1762,9 +1781,7 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelid
 
 	if (l + 12 > size)
 	{
-		static int backtrace_count = 0;
 		LOG(2, s, t, "makeppp would overflow buffer (size=%d, header+payload=%d)\n", size, l + 12);
-		log_backtrace(backtrace_count, 5)
 		return NULL;
 	}
 
@@ -1839,6 +1856,7 @@ void sendlcp(sessionidt s, tunnelidt t)
 	if (config->debug > 3) dumplcp(q, l - q);
 
 	tunnelsend(b, (l - b), t);
+	restart_timer(s, lcp);
 }
 
 // Send CCP request for no compression
@@ -1857,4 +1875,35 @@ void sendccp(sessionidt s, tunnelidt t)
 
 	LOG_HEX(5, "PPPCCP", q, 4);
 	tunnelsend(b, (q - b) + 4 , t);
+	restart_timer(s, ccp);
+}
+
+// Reject unknown/unconfigured protocols
+void protoreject(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l, uint16_t proto)
+{
+
+	uint8_t buf[MAXETHER];
+	uint8_t *q;
+	int mru = session[s].mru;
+	if (mru < MINMTU) mru = MINMTU;
+	if (mru > sizeof(buf)) mru = sizeof(buf);
+
+	l += 6;
+	if (l > mru) l = mru;
+
+	q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPLCP);
+	if (!q) return;
+
+	*q = ProtocolRej;
+	*(q + 1) = ++sess_local[s].lcp_ident;
+	*(uint16_t *)(q + 2) = htons(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);
 }