diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvpn/forward.c | 1 | ||||
| -rw-r--r-- | src/openvpn/options.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index a3323e9..6d459d2 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -328,6 +328,7 @@ void check_server_poll_timeout_dowork (struct context *c) { event_timeout_reset (&c->c2.server_poll_interval); + ASSERT(c->c2.tls_multi); if (!tls_initial_packet_received (c->c2.tls_multi)) { msg (M_INFO, "Server poll timeout, restarting"); diff --git a/src/openvpn/options.c b/src/openvpn/options.c index bc7f3c6..8487ce1 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2310,6 +2310,9 @@ options_postprocess_verify_ce (const struct options *options, const struct conne MUST_BE_UNDEF (pkcs11_id); MUST_BE_UNDEF (pkcs11_id_management); #endif +#if P2MP + MUST_BE_UNDEF (server_poll_timeout); +#endif if (pull) msg (M_USAGE, err, "--pull"); |