This fixes the issue that if a client reconnects the next connection
entries inherits the keepalive settings that were pushed or set by
the previous entry. Since UDP+PULL entries have an implicit 120s
timeout, this timeout also got applied to a TCP session after an
UDP entry.
Patch v2: rebase on master
Reported-By: Jan Just Keijser <janj...@nikhef.nl>
Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
src/openvpn/options.c | 9 +++++++++
src/openvpn/options.h | 4 ++++
2 files changed, 13 insertions(+)
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 645fc38b..42681b71 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3540,6 +3540,11 @@ pre_pull_save(struct options *o)
o->pre_pull->ciphername = o->ciphername;
o->pre_pull->authname = o->authname;
o->pre_pull->keysize = o->keysize;
+
+ /* Ping related options should be reset to the config values on
reconnect */
+ o->pre_pull->ping_rec_timeout = o->ping_rec_timeout;
+ o->pre_pull->ping_rec_timeout_action = o->ping_rec_timeout_action;
+ o->pre_pull->ping_send_timeout = o->ping_send_timeout;
}
}
@@ -3591,6 +3596,10 @@ pre_pull_restore(struct options *o, struct gc_arena *gc)
o->ciphername = pp->ciphername;
o->authname = pp->authname;
o->keysize = pp->keysize;
+
+ o->ping_rec_timeout = pp->ping_rec_timeout;
+ o->ping_rec_timeout_action = pp->ping_rec_timeout_action;
+ o->ping_send_timeout = pp->ping_send_timeout;
}
o->push_continuation = 0;
diff --git a/src/openvpn/options.h b/src/openvpn/options.h
index fe67ec72..5317a60e 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/options.h
@@ -79,6 +79,10 @@ struct options_pre_pull
const char* authname;
int keysize;
+ int ping_send_timeout;
+ int ping_rec_timeout;
+ int ping_rec_timeout_action;
+
int foreign_option_index;
};
--
2.30.1
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
