Do not allow DPD to be disabled.

Doing so would prevent the server from dropping inactive
connections. If the dpd values are not configured, set some
reasonable defaults.
This commit is contained in:
Nikos Mavrogiannopoulos
2014-02-17 22:40:32 +01:00
parent faf0a7133b
commit c5c38e92bd
3 changed files with 12 additions and 5 deletions
+6
View File
@@ -323,7 +323,13 @@ unsigned force_cert_auth;
READ_NUMERIC("udp-port", config->udp_port); READ_NUMERIC("udp-port", config->udp_port);
READ_NUMERIC("keepalive", config->keepalive); READ_NUMERIC("keepalive", config->keepalive);
READ_NUMERIC("dpd", config->dpd); READ_NUMERIC("dpd", config->dpd);
if (config->dpd == 0)
config->dpd = DEFAULT_DPD_TIME;
READ_NUMERIC("mobile-dpd", config->mobile_dpd); READ_NUMERIC("mobile-dpd", config->mobile_dpd);
if (config->mobile_dpd == 0)
config->mobile_dpd = DEFAULT_MOBILE_DPD_TIME;
READ_NUMERIC("rate-limit-ms", config->rate_limit_ms); READ_NUMERIC("rate-limit-ms", config->rate_limit_ms);
READ_STRING("ocsp-response", config->ocsp_response); READ_STRING("ocsp-response", config->ocsp_response);
+3 -5
View File
@@ -110,14 +110,12 @@ udp-port = 3333
# Keepalive in seconds # Keepalive in seconds
keepalive = 32400 keepalive = 32400
# Dead peer detection in seconds. Set to zero # Dead peer detection in seconds.
# to disable.
dpd = 240 dpd = 240
# Dead peer detection for mobile clients. The needs to # Dead peer detection for mobile clients. The needs to
# be much higher (or even disabled by setting to zero), # be much higher to prevent such clients being awaken too
# to prevent such clients being awaken too often by the DPD # often by the DPD messages, and save battery.
# messages, and save battery.
# (clients that send the X-AnyConnect-Identifier-DeviceType) # (clients that send the X-AnyConnect-Identifier-DeviceType)
mobile-dpd = 1800 mobile-dpd = 1800
+3
View File
@@ -49,6 +49,9 @@
#define DEBUG_TRANSFERRED 3 #define DEBUG_TRANSFERRED 3
#define DEBUG_TLS 4 #define DEBUG_TLS 4
#define DEFAULT_DPD_TIME 600
#define DEFAULT_MOBILE_DPD_TIME 1800
#define AC_PKT_DATA 0 /* Uncompressed data */ #define AC_PKT_DATA 0 /* Uncompressed data */
#define AC_PKT_DPD_OUT 3 /* Dead Peer Detection */ #define AC_PKT_DPD_OUT 3 /* Dead Peer Detection */
#define AC_PKT_DPD_RESP 4 /* DPD response */ #define AC_PKT_DPD_RESP 4 /* DPD response */