mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 12:02:28 +02:00
Code

Move restoring pre pull options to initialising of c2 context

Browse Source 
We currently delay restoring these options until we actually must
restore them. Since there is no reason to do so apart from the very
minor saving to not have to execute that code when a connection fails,
move them it into the general context_2 initialisation.

Patch V2: rebase on master.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Antonio Quartulli <antonio@openvpn.net>
Message-Id: <20210317160038.25828-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21676.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Arne Schwabe 2021-03-17 17:00:36 +01:00 committed by Gert Doering
parent 1e938c5093
commit 528a78fb14
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openvpn/init.c
View File

@ -4167,6 +4167,11 @@ init_instance(struct context *c, const struct env_set *env, const unsigned int f
}
}
if (c->options.pull)
{
pre_pull_restore(&c->options, &c->c2.gc);
}
/* map in current connection entry */
next_connection_entry(c);

1
src/openvpn/openvpn.h
View File

@ -463,7 +463,6 @@ struct context_2
struct event_timeout push_request_interval;
time_t push_request_timeout;
bool did_pre_pull_restore;
/* hash of pulled options, so we can compare when options change */
bool pulled_options_digest_init_done;

5
src/openvpn/push.c
View File

@ -930,11 +930,6 @@ process_incoming_push_reply(struct context *c,
md_ctx_init(c->c2.pulled_options_state, md_kt_get("SHA256"));
c->c2.pulled_options_digest_init_done = true;
}
if (!c->c2.did_pre_pull_restore)
{
pre_pull_restore(&c->options, &c->c2.gc);
c->c2.did_pre_pull_restore = true;
}
if (apply_push_options(&c->options,
buf,
permission_mask,