X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/2a385573a65683c450a53fa6a558a8132327ccf4..0f20bfda6a2b5c756eeaa235b2eb48d4e4072bd0:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 390f564..152c8ec 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -102,7 +102,7 @@ union iphash {
 struct ipv6radix {
 	sessionidt sess;
 	struct ipv6radix *branch;
-} ipv6_hash[256];		// Mapping from IPv6 address to session structures.
+} ipv6_hash[16];		// Mapping from IPv6 address to session structures.
 
 // Traffic counters.
 static uint32_t udp_rx = 0, udp_rx_pkt = 0, udp_tx = 0;
@@ -132,6 +132,7 @@ config_descriptt config_values[] = {
 	CONFIG("ppp_restart_time", ppp_restart_time, INT),
 	CONFIG("ppp_max_configure", ppp_max_configure, INT),
 	CONFIG("ppp_max_failure", ppp_max_failure, INT),
+	CONFIG("ppp_keepalive", ppp_keepalive, BOOL),
 	CONFIG("primary_dns", default_dns1, IPv4),
 	CONFIG("secondary_dns", default_dns2, IPv4),
 	CONFIG("primary_radius", radiusserver[0], IPv4),
@@ -162,6 +163,7 @@ config_descriptt config_values[] = {
 	CONFIG("icmp_rate", icmp_rate, INT),
 	CONFIG("packet_limit", max_packets, INT),
 	CONFIG("cluster_address", cluster_address, IPv4),
+	CONFIG("cluster_port", cluster_port, INT),
 	CONFIG("cluster_interface", cluster_interface, STRING),
 	CONFIG("cluster_mcast_ttl", cluster_mcast_ttl, INT),
 	CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
@@ -194,6 +196,7 @@ config_descriptt config_values[] = {
 	CONFIG("dhcp6_preferred_lifetime", dhcp6_preferred_lifetime, INT),
 	CONFIG("dhcp6_valid_lifetime", dhcp6_valid_lifetime, INT),
 	CONFIG("dhcp6_server_duid", dhcp6_server_duid, INT),
+	CONFIG("dns6_lifetime", dns6_lifetime, INT),
 	CONFIG("primary_ipv6_dns", default_ipv6_dns1, IPv6),
 	CONFIG("secondary_ipv6_dns", default_ipv6_dns2, IPv6),
 	CONFIG("default_ipv6_domain_list", default_ipv6_domain_list, STRING),
@@ -982,20 +985,24 @@ static sessionidt lookup_ipv6map(struct in6_addr ip)
 	int s;
 	char ipv6addr[INET6_ADDRSTRLEN];
 
-	curnode = &ipv6_hash[ip.s6_addr[0]];
+	curnode = &ipv6_hash[((ip.s6_addr[0]) & 0xF0)>>4];
 	i = 1;
 	s = curnode->sess;
 
-	while (s == 0 && i < 15 && curnode->branch != NULL)
+	while (s == 0 && i < 32 && curnode->branch != NULL)
 	{
-		curnode = &curnode->branch[ip.s6_addr[i]];
+		if (i & 1)
+			curnode = &curnode->branch[ip.s6_addr[i>>1] & 0x0F];
+		else
+			curnode = &curnode->branch[(ip.s6_addr[i>>1] & 0xF0)>>4];
+
 		s = curnode->sess;
 		i++;
 	}
 
 	LOG(4, s, session[s].tunnel, "Looking up address %s and got %d\n",
-    			inet_ntop(AF_INET6, &ip, ipv6addr,
-				INET6_ADDRSTRLEN),
+			inet_ntop(AF_INET6, &ip, ipv6addr,
+			INET6_ADDRSTRLEN),
 			s);
 
 	return s;
@@ -1036,6 +1043,19 @@ sessionidt sessionbyipv6(struct in6_addr ip)
 	return 0;
 }
 
+sessionidt sessionbyipv6new(struct in6_addr ip)
+{
+	sessionidt s;
+	CSTAT(sessionbyipv6new);
+
+	s = lookup_ipv6map(ip);
+
+	if (s > 0 && s < MAXSESSION && session[s].opened)
+		return s;
+
+	return 0;
+}
+
 //
 // Take an IP address in HOST byte order and
 // add it to the sessionid by IP cache.
@@ -1075,22 +1095,28 @@ static void uncache_ipmap(in_addr_t ip)
 static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s)
 {
 	int i;
-	int bytes;
+	int niblles;
 	struct ipv6radix *curnode;
 	char ipv6addr[INET6_ADDRSTRLEN];
 
-	curnode = &ipv6_hash[ip.s6_addr[0]];
+	curnode = &ipv6_hash[((ip.s6_addr[0]) & 0xF0)>>4];
 
-	bytes = prefixlen >> 3;
+	niblles = prefixlen >> 2;
 	i = 1;
-	while (i < bytes) {
+
+	while (i < niblles)
+	{
 		if (curnode->branch == NULL)
 		{
-			if (!(curnode->branch = calloc(256,
-					sizeof (struct ipv6radix))))
+			if (!(curnode->branch = calloc(16, sizeof (struct ipv6radix))))
 				return;
 		}
-		curnode = &curnode->branch[ip.s6_addr[i]];
+
+		if (i & 1)
+			curnode = &curnode->branch[ip.s6_addr[i>>1] & 0x0F];
+		else
+			curnode = &curnode->branch[(ip.s6_addr[i>>1] & 0xF0)>>4];
+
 		i++;
 	}
 
@@ -1098,13 +1124,13 @@ static void cache_ipv6map(struct in6_addr ip, int prefixlen, sessionidt s)
 
 	if (s > 0)
 		LOG(4, s, session[s].tunnel, "Caching ip address %s/%d\n",
-	    			inet_ntop(AF_INET6, &ip, ipv6addr, 
-					INET6_ADDRSTRLEN),
+				inet_ntop(AF_INET6, &ip, ipv6addr,
+				INET6_ADDRSTRLEN),
 				prefixlen);
 	else if (s == 0)
 		LOG(4, 0, 0, "Un-caching ip address %s/%d\n",
-	    			inet_ntop(AF_INET6, &ip, ipv6addr, 
-					INET6_ADDRSTRLEN),
+				inet_ntop(AF_INET6, &ip, ipv6addr,
+				INET6_ADDRSTRLEN),
 				prefixlen);
 }
 
@@ -1155,7 +1181,6 @@ int cmd_show_ipcache(struct cli_def *cli, const char *command, char **argv, int
 	return CLI_OK;
 }
 
-
 // Find session by username, 0 for not found
 // walled garden users aren't authenticated, so the username is
 // reasonably useless. Ignore them to avoid incorrect actions
@@ -1692,7 +1717,6 @@ static void processipv6out(uint8_t * buf, int len)
 	sessionidt s;
 	sessiont *sp;
 	tunnelidt t;
-	in_addr_t ip;
 	struct in6_addr ip6;
 
 	uint8_t *data = buf;	// Keep a copy of the originals.
@@ -1731,10 +1755,9 @@ static void processipv6out(uint8_t * buf, int len)
 
 	if (s == 0)
 	{
-		ip = *(uint32_t *)(buf + 32);
-		s = sessionbyip(ip);
+		s = sessionbyipv6new(ip6);
 	}
-	
+
 	if (s == 0)
 	{
 		// Is this a packet for a session that doesn't exist?
@@ -2128,8 +2151,11 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 			free_ip_address(s);
 
 		// unroute IPv6, if setup
-		if (session[s].ipv6route.s6_addr[0] && session[s].ipv6prefixlen && del_routes)
-			route6set(s, session[s].ipv6route, session[s].ipv6prefixlen, 0);
+		for (r = 0; r < MAXROUTE6 && session[s].route6[r].ipv6route.s6_addr[0] && session[s].route6[r].ipv6prefixlen; r++)
+		{
+			if (del_routes) route6set(s, session[s].route6[r].ipv6route, session[s].route6[r].ipv6prefixlen, 0);
+			memset(&session[s].route6[r], 0, sizeof(session[s].route6[r]));
+		}
 
 		if (session[s].ipv6address.s6_addr[0] && del_routes)
 		{
@@ -2189,8 +2215,10 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 						cache_ipmap(session[new_s].ip, new_s);
 
 						// IPV6 route
-						if (session[new_s].ipv6prefixlen)
-							cache_ipv6map(session[new_s].ipv6route, session[new_s].ipv6prefixlen, new_s);
+						for (r = 0; r < MAXROUTE6 && session[new_s].route6[r].ipv6prefixlen; r++)
+						{
+							cache_ipv6map(session[new_s].route6[r].ipv6route, session[new_s].route6[r].ipv6prefixlen, new_s);
+						}
 
 						if (session[new_s].ipv6address.s6_addr[0])
 						{
@@ -3754,8 +3782,10 @@ static void regular_cleanups(double period)
 		}
 
 		// No data in ECHO_TIMEOUT seconds, send LCP ECHO
-		if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= config->echo_timeout) &&
-			(time_now - sess_local[s].last_echo >= ECHO_TIMEOUT))
+		if (session[s].ppp.phase >= Establish &&
+                    ((!config->ppp_keepalive) ||
+                     (time_now - session[s].last_packet >= config->echo_timeout)) &&
+		    (time_now - sess_local[s].last_echo >= ECHO_TIMEOUT))
 		{
 			uint8_t b[MAXETHER];
 
@@ -4574,6 +4604,9 @@ static void initdata(int optdebug, char *optconfig)
 	// Set default value echo_timeout and idle_echo_timeout
 	config->echo_timeout = ECHO_TIMEOUT;
 	config->idle_echo_timeout = IDLE_ECHO_TIMEOUT;
+	config->ppp_keepalive = 1;
+	// Set default RDNSS lifetime
+	config->dns6_lifetime = 1200;
 
 	log_stream = stderr;
 
@@ -5596,6 +5629,7 @@ static void update_config()
 	memcpy(config->old_plugins, config->plugins, sizeof(config->plugins));
 	if (!config->multi_read_count) config->multi_read_count = 10;
 	if (!config->cluster_address) config->cluster_address = inet_addr(DEFAULT_MCAST_ADDR);
+	if (!config->cluster_port) config->cluster_port = CLUSTERPORT;
 	if (!*config->cluster_interface)
 		strncpy(config->cluster_interface, DEFAULT_MCAST_INTERFACE, sizeof(config->cluster_interface) - 1);
 
@@ -5830,7 +5864,7 @@ int load_session(sessionidt s, sessiont *new)
 	// needs update
 	if (newip)
 	{
-	    	int routed = 0;
+		int routed = 0;
 
 		// remove old routes...
 		for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)
@@ -5854,8 +5888,10 @@ int load_session(sessionidt s, sessiont *new)
 		}
 
 		// remove old IPV6 routes...
-		if (session[s].ipv6route.s6_addr[0] && session[s].ipv6prefixlen)
-			route6set(s, session[s].ipv6route, session[s].ipv6prefixlen, 0);
+		for (i = 0; i < MAXROUTE6 && session[s].route6[i].ipv6route.s6_addr[0] && session[s].route6[i].ipv6prefixlen; i++)
+		{
+			route6set(s, session[s].route6[i].ipv6route, session[s].route6[i].ipv6prefixlen, 0);
+		}
 
 		if (session[s].ipv6address.s6_addr[0])
 		{
@@ -5888,8 +5924,13 @@ int load_session(sessionidt s, sessiont *new)
 	}
 
 	// check v6 routing
-	if (new->ipv6prefixlen && new->ppp.ipv6cp == Opened && session[s].ppp.ipv6cp != Opened)
-		route6set(s, new->ipv6route, new->ipv6prefixlen, 1);
+	if (new->ppp.ipv6cp == Opened && session[s].ppp.ipv6cp != Opened)
+	{
+		for (i = 0; i < MAXROUTE6 && new->route6[i].ipv6prefixlen; i++)
+		{
+			route6set(s, new->route6[i].ipv6route, new->route6[i].ipv6prefixlen, 1);
+		}
+	}
 
 	if (new->ipv6address.s6_addr[0] && new->ppp.ipv6cp == Opened && session[s].ppp.ipv6cp != Opened)
 	{