summaryrefslogtreecommitdiffstats
path: root/sig.c
diff options
context:
space:
mode:
authorJan Just Keijser <janjust@nikhef.nl>2012-02-07 16:29:47 +0100
committerDavid Sommerseth <davids@redhat.com>2012-02-13 20:43:37 +0100
commit76809cae0eae07817160b423d3f9551df1a1d68e (patch)
tree7fc6813c4648040b3966a10ad2c5d441df649dbb /sig.c
parentbdf9ab751644ed22499e80ed69a37d14461a81ff (diff)
downloadopenvpn-76809cae0eae07817160b423d3f9551df1a1d68e.tar.gz
openvpn-76809cae0eae07817160b423d3f9551df1a1d68e.tar.xz
openvpn-76809cae0eae07817160b423d3f9551df1a1d68e.zip
Made some options connection-entry specific
The following options may now be used in a connection block: fragment mssfix tun-mtu tun-mtu-extra link-mtu mtu_discover_type explicit-exit-notification In order to support stuff like <connection> remote host proto udp fragment explicit-exit-notification 3 </connection> <connection> remote host proto tcp </connection> Signed-off-by: Jan Just Keijser <janjust@nikhef.nl> Acked-by: David Sommerseth <davids@redhat.com> Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'sig.c')
-rw-r--r--sig.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sig.c b/sig.c
index d73525f..a5703f0 100644
--- a/sig.c
+++ b/sig.c
@@ -300,8 +300,8 @@ process_explicit_exit_notification_timer_wakeup (struct context *c)
&c->c2.timeval,
ETT_DEFAULT))
{
- ASSERT (c->c2.explicit_exit_notification_time_wait && c->options.explicit_exit_notification);
- if (now >= c->c2.explicit_exit_notification_time_wait + c->options.explicit_exit_notification)
+ ASSERT (c->c2.explicit_exit_notification_time_wait && c->options.ce.explicit_exit_notification);
+ if (now >= c->c2.explicit_exit_notification_time_wait + c->options.ce.explicit_exit_notification)
{
event_timeout_clear (&c->c2.explicit_exit_notification_interval);
c->sig->signal_received = SIGTERM;
@@ -340,7 +340,7 @@ process_sigterm (struct context *c)
{
bool ret = true;
#ifdef ENABLE_OCC
- if (c->options.explicit_exit_notification
+ if (c->options.ce.explicit_exit_notification
&& !c->c2.explicit_exit_notification_time_wait)
{
process_explicit_exit_notification_init (c);