upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Simplify calling logic of check_connection_established_dowork

Browse source 
The check event_timeout_defined in check_connection_established is
completely redundant as event_timeout_trigger will do the very same
check as first action. Removing this check makes the function
superfluous. To further improve the code  move the call check if the
time is expired into process_coarse_timers

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20200725234803.22058-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20588.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Arne Schwabe 2020-07-26 01:48:02 +02:00 committed by Gert Doering
parent 1d86fae874
commit 7cadbe24b6
2 changed files with 38 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/openvpn/forward.c
View file

@ -138,21 +138,6 @@ check_incoming_control_channel(struct context *c)
#endif
}
/*
* Options like --up-delay need to be triggered by this function which
* checks for connection establishment.
*/
static inline void
check_connection_established(struct context *c)
{
void check_connection_established_dowork(struct context *c);
if (event_timeout_defined(&c->c2.wait_for_connect))
{
check_connection_established_dowork(c);
}
}
/*
* Should we add routes?
*/
@ -437,43 +422,45 @@ check_push_request_dowork(struct context *c)
/*
* Things that need to happen immediately after connection initiation should go here.
*
* Options like --up-delay need to be triggered by this function which
* checks for connection establishment.
*/
void
check_connection_established_dowork(struct context *c)
check_connection_established(struct context *c)
{
if (event_timeout_trigger(&c->c2.wait_for_connect, &c->c2.timeval, ETT_DEFAULT))
{
if (CONNECTION_ESTABLISHED(c))
{
#if P2MP
/* if --pull was specified, send a push request to server */
if (c->c2.tls_multi && c->options.pull)
{
#ifdef ENABLE_MANAGEMENT
if (management)
{
management_set_state(management,
OPENVPN_STATE_GET_CONFIG,
NULL,
NULL,
NULL,
NULL,
NULL);
}
#endif
/* fire up push request right away (already 1s delayed) */
event_timeout_init(&c->c2.push_request_interval, 0, now);
reset_coarse_timers(c);
}
else
#endif /* if P2MP */
{
do_up(c, false, 0);
}
event_timeout_clear(&c->c2.wait_for_connect);
if (CONNECTION_ESTABLISHED(c))
{
#if P2MP
/* if --pull was specified, send a push request to server */
if (c->c2.tls_multi && c->options.pull)
{
#ifdef ENABLE_MANAGEMENT
if (management)
{
management_set_state(management,
OPENVPN_STATE_GET_CONFIG,
NULL,
NULL,
NULL,
NULL,
NULL);
}
#endif
/* fire up push request right away (already 1s delayed) */
event_timeout_init(&c->c2.push_request_interval, 0, now);
reset_coarse_timers(c);
}
else
#endif /* if P2MP */
{
do_up(c, false, 0);
}
event_timeout_clear(&c->c2.wait_for_connect);
}
}
bool
@ -777,8 +764,10 @@ process_coarse_timers(struct context *c)
check_status_file(c);
/* process connection establishment items */
check_connection_established(c);
if (event_timeout_trigger(&c->c2.wait_for_connect, &c->c2.timeval, ETT_DEFAULT))
{
check_connection_established(c);
}
#if P2MP
/* see if we should send a push_request in response to --pull */
check_push_request(c);

2
src/openvpn/forward.h
View file

@ -88,7 +88,7 @@ void check_fragment_dowork(struct context *c);
#endif /* ENABLE_FRAGMENT */
void check_connection_established_dowork(struct context *c);
void check_connection_established(struct context *c);
void check_add_routes_dowork(struct context *c);