X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/f4e05b93e06de6392be0d5d394914cd7e37207fc..6760f8ad5e4dbde1606ffe831257f407b99c0c3b:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 57ede3d..4028379 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -1801,6 +1801,8 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
 {
 	sessiont *sp;
 	tunnelidt t;
+	uint8_t *p;
+	uint8_t *data = buf;	// Keep a copy of the originals.
 
 	uint8_t b[MAXETHER + 20];
 
@@ -1823,11 +1825,14 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
 	LOG(5, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
 
 	// Add on L2TP header
-	{
-		uint8_t *p = makeppp(b, sizeof(b), buf, len, s, t, PPPIP, 0, 0, 0);
-		if (!p) return;
-		tunnelsend(b, len + (p-b), t); // send it...
-	}
+	if (*(uint16_t *) (data + 2) == htons(PKTIPV6))
+		p = makeppp(b, sizeof(b), buf, len, s, t, PPPIPV6, 0, 0, 0); // IPV6
+	else
+		p = makeppp(b, sizeof(b), buf, len, s, t, PPPIP, 0, 0, 0); // IPV4
+
+	if (!p) return;
+
+	tunnelsend(b, len + (p-b), t); // send it...
 
 	// Snooping this session.
 	if (sp->snoop_ip && sp->snoop_port)
@@ -5809,6 +5814,10 @@ int load_session(sessionidt s, sessiont *new)
 				uncache_ipmap(session[s].ip);
 		}
 
+		// remove old IPV6 routes...
+		if (session[s].ipv6route.s6_addr[0] && session[s].ipv6prefixlen)
+			route6set(s, session[s].ipv6route, session[s].ipv6prefixlen, 0);
+
 		routed = 0;
 
 		// add new routes...