From 664389ebc4e3c6b7f324245fcf7ee908cc7efd6d Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 19 Mar 2020 13:48:31 +0100 Subject: [PATCH] android: Enable switch from NAT interval to DPDs after 20 seconds --- .../app/src/main/jni/libandroidbridge/charonservice.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c b/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c index 78abede585..e766b34ea9 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2019 Tobias Brunner + * Copyright (C) 2012-2020 Tobias Brunner * Copyright (C) 2012 Giuliano Grassi * Copyright (C) 2012 Ralf Sager * HSR Hochschule fuer Technik Rapperswil @@ -45,6 +45,7 @@ #define ANDROID_RETRANSMIT_TIMEOUT 2.0 #define ANDROID_RETRANSMIT_BASE 1.4 #define ANDROID_KEEPALIVE_INTERVAL 45 +#define ANDROID_KEEPALIVE_DPD_MARGIN 20 typedef struct private_charonservice_t private_charonservice_t; @@ -434,6 +435,10 @@ static void initiate(settings_t *settings) "charon.keep_alive", settings->get_int(settings, "global.nat_keepalive", ANDROID_KEEPALIVE_INTERVAL)); + /* send DPDs if above interval is exceeded, use a static value for now */ + lib->settings->set_int(lib->settings, + "charon.keep_alive_dpd_margin", + ANDROID_KEEPALIVE_DPD_MARGIN); /* reload plugins after changing settings */ lib->plugins->reload(lib->plugins, NULL); -- 2.47.2