X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/97bada26aa745e67f3fa0bc85bdd1890323c0bc0..7034e6a018bd34f047db4f1fb7c60f076bd40471:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 14892f7..1c50a3e 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -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),
@@ -194,6 +195,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),
@@ -3779,8 +3781,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];
 
@@ -4599,6 +4603,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;