X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/ecdddd60656db2fa84e0e84a7e82378a7202da6c..20ca0ebdd35c564524faabf0bfea67d662ac5289:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 63d110d..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)
@@ -5050,9 +5055,9 @@ int main(int argc, char *argv[])
 		case 'd':
 			if (fork()) exit(0);
 			setsid();
-			FILE *in = freopen("/dev/null", "r", stdin);
-			FILE *out = freopen("/dev/null", "w", stdout);
-			FILE *err = freopen("/dev/null", "w", stderr);
+			if(!freopen("/dev/null", "r", stdin)) LOG(0, 0, 0, "Error freopen stdin: %s\n", strerror(errno));
+			if(!freopen("/dev/null", "w", stdout)) LOG(0, 0, 0, "Error freopen stdout: %s\n", strerror(errno));
+			if(!freopen("/dev/null", "w", stderr)) LOG(0, 0, 0, "Error freopen stderr: %s\n", strerror(errno));
 			break;
 		case 'v':
 			optdebug++;
@@ -5103,7 +5108,7 @@ int main(int argc, char *argv[])
 			LOG(0, 0, 0, "Can't set ulimit: %s\n", strerror(errno));
 
 		// Make core dumps go to /tmp
-		int ret = chdir("/tmp");
+		if(chdir("/tmp")) LOG(0, 0, 0, "Error chdir /tmp: %s\n", strerror(errno));
 	}
 
 	if (config->scheduler_fifo)
@@ -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...