X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/f4e05b93e06de6392be0d5d394914cd7e37207fc..6b70732490a095f1937c7ad8882d5dd164de4e7e:/l2tpns.c?ds=sidebyside

diff --git a/l2tpns.c b/l2tpns.c
index 57ede3d..6c1e620 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -188,6 +188,7 @@ config_descriptt config_values[] = {
 	CONFIG("bind_multi_address", bind_multi_address, STRING),
 	CONFIG("pppoe_only_equal_svc_name", pppoe_only_equal_svc_name, BOOL),
 	CONFIG("multi_hostname", multi_hostname, STRING),
+	CONFIG("no_throttle_local_IP", no_throttle_local_IP, BOOL),
 	{ NULL, 0, 0, 0 }
 };
 
@@ -1417,7 +1418,7 @@ void processipout(uint8_t *buf, int len)
 	sessionidt s;
 	sessiont *sp;
 	tunnelidt t;
-	in_addr_t ip;
+	in_addr_t ip, ip_src;
 
 	uint8_t *data = buf;	// Keep a copy of the originals.
 	int size = len;
@@ -1450,6 +1451,7 @@ void processipout(uint8_t *buf, int len)
 		return;
 	}
 
+	ip_src = *(uint32_t *)(buf + 12);
 	ip = *(uint32_t *)(buf + 16);
 	if (!(s = sessionbyip(ip)))
 	{
@@ -1534,12 +1536,15 @@ void processipout(uint8_t *buf, int len)
 
 	if (sp->tbf_out)
 	{
-		// Are we throttling this session?
-		if (config->cluster_iam_master)
-			tbf_queue_packet(sp->tbf_out, data, size);
-		else
-			master_throttle_packet(sp->tbf_out, data, size);
-		return;
+		if (!config->no_throttle_local_IP || !sessionbyip(ip_src))
+		{
+			// Are we throttling this session?
+			if (config->cluster_iam_master)
+				tbf_queue_packet(sp->tbf_out, data, size);
+			else
+				master_throttle_packet(sp->tbf_out, data, size);
+			return;
+		}
 	}
 
 	if (sp->walled_garden && !config->cluster_iam_master)
@@ -1801,6 +1806,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 +1830,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 +5819,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...