aboutsummaryrefslogtreecommitdiff
path: root/init.c
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-11-09 08:36:26 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-11-09 08:36:26 +0000
commitb540a9e07571aaaeea5cc2b81e695829d228c2f1 (patch)
treee7e2e86384943f6e5541865970aedf88b7590488 /init.c
parentRemoved annoying 'i' variable from add_option. (diff)
downloadopenvpn-b540a9e07571aaaeea5cc2b81e695829d228c2f1.tar.xz
Merged (with some changes) Alon's
connect-retry-max option from /contrib/alon/BETA21@783. Added uninit_management_callback call to init_instance_handle_signals so that signals thrown during initialization can bring us back to a management hold. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@786 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'init.c')
-rw-r--r--init.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/init.c b/init.c
index 4e3b6e7..bd90b80 100644
--- a/init.c
+++ b/init.c
@@ -1811,6 +1811,7 @@ do_init_socket_1 (struct context *c, int mode)
c->plugins,
c->options.resolve_retry_seconds,
c->options.connect_retry_seconds,
+ c->options.connect_retry_max,
c->options.mtu_discover_type,
c->options.rcvbuf,
c->options.sndbuf,
@@ -2371,6 +2372,14 @@ init_instance_handle_signals (struct context *c, const struct env_set *env, cons
pre_init_signal_catch ();
init_instance (c, env, flags);
post_init_signal_catch ();
+
+ /*
+ * This is done so that signals thrown during
+ * initialization can bring us back to
+ * a management hold.
+ */
+ if (IS_SIG (c))
+ uninit_management_callback ();
}
/*