From: "mrbff (Code Review)" Date: Wed, 8 Jan 2025 11:51:08 +0000 In-Reply-To: References: Reply-To: marco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277... Message-ID: <678425ded4b15b00a667768007c67348c2fd89b5-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="y+3dA8u4ETw="; charset=UTF-8 Subject: [Openvpn-devel] [L] Change in openvpn[master]: PUSH_UPDATE: Added remove_option() and do_update(). List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld , stipa Cc: openvpn-devel --y+3dA8u4ETw= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, mrbff, plaisthos. Hello flichtenheld, plaisthos, stipa, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=3Demail to look at the new patch set (#10). Change subject: PUSH_UPDATE: Added remove_option() and do_update(). ...................................................................... PUSH_UPDATE: Added remove_option() and do_update(). * Added remove_option() function and some utility functions to remove optio= ns at runtime following the push-update logic. * Added do_update() function to close and reopen the tun and apply option u= pdates. Change-Id: I507180d7397b6959844a30908010132bc3411067 Signed-off-by: Marco Baffo --- M src/openvpn/init.c M src/openvpn/init.h M src/openvpn/multi.c M src/openvpn/options.c M src/openvpn/push.c M src/openvpn/route.c M src/openvpn/route.h 7 files changed, 400 insertions(+), 40 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/09/809/10 diff --git a/src/openvpn/init.c b/src/openvpn/init.c index f8d9d06..9738d3b 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2445,7 +2445,7 @@ if (pulled_options) { - if (!do_deferred_options(c, option_types_found)) + if (!do_deferred_options(c, option_types_found, false)) { msg(D_PUSH_ERRORS, "ERROR: Failed to apply push options"); return false; @@ -2567,6 +2567,55 @@ return true; } +bool +do_update(struct context *c, unsigned int option_types_found) +{ + /* Not necessary since to receive the update the openvpn + * instance must be up and running but just in case + */ + if (!c->c2.do_up_ran) + { + return false; + } + + bool tt_dco_win =3D tuntap_is_dco_win(c->c1.tuntap); + if (tt_dco_win) + { + msg(M_NONFATAL, "dco-win doesn't yet support reopening TUN device"= ); + return false; + } + + if (!do_deferred_options(c, option_types_found, true)) + { + msg(D_PUSH_ERRORS, "ERROR: Failed to apply push options"); + return false; + } + + do_close_tun(c, true); + + management_sleep(1); + int error_flags =3D 0; + c->c2.did_open_tun =3D do_open_tun(c, &error_flags); + update_time(); + + if (c->c2.did_open_tun) + { + /* if --route-delay was specified, start timer */ + if ((route_order(c->c1.tuntap) =3D=3D ROUTE_AFTER_TUN) && c->optio= ns.route_delay_defined) + { + event_timeout_init(&c->c2.route_wakeup, c->options.route_delay= , now); + event_timeout_init(&c->c2.route_wakeup_expire, c->options.rout= e_delay + c->options.route_delay_window, now); + tun_standby_init(c->c1.tuntap); + } + + initialization_sequence_completed(c, error_flags); + } + + CLEAR(c->c1.pulled_options_digest_save); + + return true; +} + /* * These are the option categories which will be accepted by pull. */ @@ -2645,11 +2694,8 @@ return true; } -/* - * Handle non-tun-related pulled options. - */ bool -do_deferred_options(struct context *c, const unsigned int found) +do_deferred_options(struct context *c, const unsigned int found, const boo= l is_update) { if (found & OPT_P_MESSAGES) { @@ -2745,7 +2791,7 @@ /* process (potentially) pushed options */ if (c->options.pull) { - if (!check_pull_client_ncp(c, found)) + if (!is_update && !check_pull_client_ncp(c, found)) { return false; } diff --git a/src/openvpn/init.h b/src/openvpn/init.h index ea7eb30..100f112 100644 --- a/src/openvpn/init.h +++ b/src/openvpn/init.h @@ -86,13 +86,29 @@ bool pulled_options, unsigned int option_types_found); +/** + * @brief A simplified version of the do_up() function. This function is c= alled + * after receiving a successful PUSH_UPDATE message. It closes and = reopens + * the TUN device to apply the updated options. + * + * @param c The context structure. + * @param option_types_found The options found in the PUSH_UPDATE message. + * @return true on success. + * @return false on error. + */ +bool do_update(struct context *c, unsigned int option_types_found); + unsigned int pull_permission_mask(const struct context *c); const char *format_common_name(struct context *c, struct gc_arena *gc); void reset_coarse_timers(struct context *c); -bool do_deferred_options(struct context *c, const unsigned int found); +/* + * Handle non-tun-related pulled options. + * Set `is_update` param to true to skip NCP check. + */ +bool do_deferred_options(struct context *c, const unsigned int found, cons= t bool is_update); void inherit_context_child(struct context *dest, const struct context *src); diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 45b3cfa..a9040a6 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -2409,7 +2409,7 @@ /* * Process sourced options. */ - do_deferred_options(&mi->context, option_types_found); + do_deferred_options(&mi->context, option_types_found, false); /* * make sure we got ifconfig settings from somewhere diff --git a/src/openvpn/options.c b/src/openvpn/options.c index e417a99..bd00f65 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -1055,6 +1055,40 @@ gc_free(&gc); } } + +static void +delete_all_dhcp_fo(struct options *o, struct env_item **list) +{ + struct env_item *current, *prev; + + ASSERT(list); + + for (current =3D *list, prev =3D NULL; current !=3D NULL; current =3D = current->next) + { + char *tmp_value =3D NULL; + if (!strncmp(current->string, "foreign_option_", sizeof("foreign_o= ption_")-1)) + { + tmp_value =3D strchr(current->string, '=3D'); + if (tmp_value && ++tmp_value) + { + if (!strncmp(tmp_value, "dhcp-option ", sizeof("dhcp-optio= n ")-1)) + { + if (prev) + { + prev->next =3D current->next; + } + else + { + *list =3D current->next; + } + o->foreign_option_index--; + } + } + } + prev =3D current; + } +} + #endif /* ifndef _WIN32 */ =20 static in_addr_t @@ -3260,8 +3294,16 @@ msg(M_INFO, "Flag 'def1' added to --redirect-gateway (iservice is = in use)"); opt->routes->flags |=3D RG_DEF1; } + else if (opt->routes + && ((opt->route_method !=3D ROUTE_METHOD_SERVICE) + || !(opt->routes->flags & RG_REROUTE_GW)) + && (opt->routes->flags & RG_DEF1)) + { + msg(M_INFO, "Flag 'def1' removed from --redirect-gateway"); + opt->routes->flags &=3D ~RG_DEF1; + } } -#endif +#endif /* ifdef _WIN32 */ /* * Save/Restore certain option defaults before --pull is applied. @@ -5452,37 +5494,6 @@ } } -void -options_server_import(struct options *o, - const char *filename, - int msglevel, - unsigned int permission_mask, - unsigned int *option_types_found, - struct env_set *es) -{ - msg(D_PUSH, "OPTIONS IMPORT: reading client specific options from: %s"= , filename); - read_config_file(o, - filename, - 0, - filename, - 0, - msglevel, - permission_mask, - option_types_found, - es); -} - -void -options_string_import(struct options *options, - const char *config, - const int msglevel, - const unsigned int permission_mask, - unsigned int *option_types_found, - struct env_set *es) -{ - read_config_string("[CONFIG-STRING]", options, config, msglevel, permi= ssion_mask, option_types_found, es); -} - #define VERIFY_PERMISSION(mask) { = \ if (!verify_permission(p[0], file, line, (mask), permission_mask, = \ option_types_found, msglevel, options, is_i= nline)) \ @@ -5585,6 +5596,188 @@ return options->forward_compatible ? M_WARN : msglevel; } +/** + * @brief Resets options found in the PUSH_UPDATE message that are precede= d by the `-` flag. + * This function is used in push-updates to reset specified options. + * The number of parameters `p` must always be 1. If the permission= is verified, + * all related options are erased or reset to their default values. + * Upon successful permission verification (by VERIFY_PERMISSION()), + * `option_types_found` is filled with the flag corresponding to th= e option. + * + * @param c The context structure. + * @param options A pointer to the options structure. + * @param p An array of strings containing the options and their parameter= s. + * @param is_inline A boolean indicating if the option is inline. + * @param file The file where the function is called. + * @param line The line number where the function is called. + * @param msglevel The message level. + * @param permission_mask The permission mask used by VERIFY_PERMISSION(). + * @param option_types_found A pointer to the variable where the flags cor= responding to the options found are stored. + * @param es The environment set structure. + */ +static void +remove_option(struct context *c, + struct options *options, + char *p[], + bool is_inline, + const char *file, + int line, + const int msglevel, + const unsigned int permission_mask, + unsigned int *option_types_found, + struct env_set *es) +{ + int msglevel_fc =3D msglevel_forward_compatible(options, msglevel); + + if (streq(p[0], "ifconfig") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_UP); + options->ifconfig_local =3D NULL; + options->ifconfig_remote_netmask =3D NULL; + } + else if (streq(p[0], "ifconfig-ipv6") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_UP); + options->ifconfig_ipv6_local =3D NULL; + options->ifconfig_ipv6_netbits =3D 0; + options->ifconfig_ipv6_remote =3D NULL; + } + else if (streq(p[0], "route") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_ROUTE); + if (c->c1.route_list) + { + destroy_routes_v4(c->c1.route_list, c->c1.tuntap, + ROUTE_OPTION_FLAGS(&c->options), + es, &c->net_ctx, options); + } + } + else if (streq(p[0], "route-ipv6") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_ROUTE); + if (c->c1.route_ipv6_list) + { + destroy_routes_v6(c->c1.route_ipv6_list, c->c1.tuntap, + ROUTE_OPTION_FLAGS(&c->options), + es, &c->net_ctx, options); + } + } + else if (streq(p[0], "route-gateway") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_ROUTE_EXTRAS); + options->route_gateway_via_dhcp =3D false; + options->route_default_gateway =3D NULL; + } + else if (streq(p[0], "route-metric") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_ROUTE); + options->route_default_metric =3D 0; + } + else if (streq(p[0], "push-continuation") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_PULL_MODE); + options->push_continuation =3D 0; + } + else if ((streq(p[0], "redirect-gateway") || streq(p[0], "redirect-pri= vate")) && !p[1]) + { + VERIFY_PERMISSION(OPT_P_ROUTE); + if (options->routes) + { + options->routes->flags =3D 0; + } + if (options->routes_ipv6) + { + options->routes_ipv6->flags =3D 0; + } + } + else if (streq(p[0], "dns") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_DHCPDNS); + gc_free(&options->dns_options.gc); + CLEAR(options->dns_options); + } + else if (streq(p[0], "topology") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_UP); + options->topology =3D TOP_UNDEF; + helper_setdefault_topology(options); + } + else if (streq(p[0], "tun-mtu") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_PUSH_MTU|OPT_P_CONNECTION); + options->ce.tun_mtu =3D TUN_MTU_DEFAULT; + options->ce.tun_mtu_defined =3D false; + options->ce.occ_mtu =3D 0; + } + else if (streq(p[0], "block-ipv6") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_ROUTE); + options->block_ipv6 =3D false; + } +#if defined(_WIN32) || defined(TARGET_ANDROID) + else if (streq(p[0], "dhcp-option") && !p[1]) + { + struct tuntap_options *o =3D &options->tuntap_options; + VERIFY_PERMISSION(OPT_P_DHCPDNS); + + o->domain =3D NULL; + o->netbios_scope =3D NULL; + o->netbios_node_type =3D 0; + o->dns6_len =3D 0; + memset(o->dns6, 0, sizeof(o->dns6)); + o->dns_len =3D 0; + memset(o->dns, 0, sizeof(o->dns)); + o->wins_len =3D 0; + memset(o->wins, 0, sizeof(o->wins)); + o->ntp_len =3D 0; + memset(o->ntp, 0, sizeof(o->ntp)); + o->nbdd_len =3D 0; + memset(o->nbdd, 0, sizeof(o->nbdd)); + while (o->domain_search_list_len-- > 0) + { + o->domain_search_list[o->domain_search_list_len] =3D NULL; + } + o->disable_nbt =3D 0; + o->dhcp_options =3D 0; +#if defined(TARGET_ANDROID) + o->http_proxy_port =3D 0; + o->http_proxy =3D NULL; +#endif + } +#endif /* if defined(_WIN32) || defined(TARGET_ANDROID) */ +#ifdef _WIN32 + else if (streq(p[0], "block-outside-dns") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_DHCPDNS); + options->block_outside_dns =3D false; + } +#else /* ifdef _WIN32 */ + else if (streq(p[0], "dhcp-option") && !p[1]) + { + VERIFY_PERMISSION(OPT_P_DHCPDNS); + delete_all_dhcp_fo(options, &es->list); + } +#endif + else + { + int i; + int msglevel_unknown =3D msglevel_fc; + /* Check if an option is in --ignore-unknown-option and + * set warning level to non fatal */ + for (i =3D 0; options->ignore_unknown_option && options->ignore_un= known_option[i]; i++) + { + if (streq(p[0], options->ignore_unknown_option[i])) + { + msglevel_unknown =3D M_WARN; + break; + } + } + msg(msglevel_unknown, "Unrecognized option or missing or extra par= ameter(s) in %s:%d: -%s (%s)", file, line, p[0], PACKAGE_VERSION); + } + return; +err: + msg(msglevel, "Error occurred trying to remove %s option", p[0]); +} bool apply_push_options(struct context *c, struct options *options, @@ -5618,11 +5811,47 @@ add_option(options, p, false, file, line_num, 0, msglevel, permission_mask, option_types_found, es); } + else if (push_update_option_flags & PUSH_OPT_TO_REMOVE) + { + remove_option(c, options, p, false, file, line_num, msglev= el, + permission_mask, option_types_found, es); + } } } return true; } +void +options_server_import(struct options *o, + const char *filename, + int msglevel, + unsigned int permission_mask, + unsigned int *option_types_found, + struct env_set *es) +{ + msg(D_PUSH, "OPTIONS IMPORT: reading client specific options from: %s"= , filename); + read_config_file(o, + filename, + 0, + filename, + 0, + msglevel, + permission_mask, + option_types_found, + es); +} + +void +options_string_import(struct options *options, + const char *config, + const int msglevel, + const unsigned int permission_mask, + unsigned int *option_types_found, + struct env_set *es) +{ + read_config_string("[CONFIG-STRING]", options, config, msglevel, permi= ssion_mask, option_types_found, es); +} + static void set_user_script(struct options *options, const char **script, diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 2afd539..9d9f055 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -542,6 +542,11 @@ { msg(M_WARN, "No updatable options found in incoming PU= SH_UPDATE message"); } + else if (!do_update(c, option_types_found)) + { + msg(D_PUSH_ERRORS, "Failed to update options"); + goto error; + } } } event_timeout_clear(&c->c2.push_request_interval); diff --git a/src/openvpn/route.c b/src/openvpn/route.c index d17b285..5358e3a 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1291,6 +1291,60 @@ } } +void +destroy_routes_v4(struct route_list *rl, const struct tuntap *tt, + unsigned int flags, const struct env_set *es, + openvpn_net_ctx_t *ctx, struct options *options) +{ + if (rl && (rl->iflags & RL_ROUTES_ADDED)) + { + struct route_ipv4 *r; + for (r =3D rl->routes; r; r =3D r->next) + { + delete_route(r, tt, flags, &rl->rgi, es, ctx); + } + rl->iflags &=3D ~RL_ROUTES_ADDED; + } + + undo_redirect_default_route_to_vpn(rl, tt, flags, es, ctx); + + if (rl) + { + clear_route_list(rl); + } + if (options->routes) + { + options->routes->routes =3D NULL; + options->routes->flags =3D 0; + } +} + +void +destroy_routes_v6(struct route_ipv6_list *rl6, const struct tuntap *tt, + unsigned int flags, const struct env_set *es, + openvpn_net_ctx_t *ctx, struct options *options) +{ + if (rl6 && (rl6->iflags & RL_ROUTES_ADDED)) + { + struct route_ipv6 *r6; + for (r6 =3D rl6->routes_ipv6; r6; r6 =3D r6->next) + { + delete_route_ipv6(r6, tt, flags, es, ctx); + } + rl6->iflags &=3D ~RL_ROUTES_ADDED; + } + + if (rl6) + { + clear_route_ipv6_list(rl6); + } + if (options->routes_ipv6) + { + options->routes_ipv6->routes_ipv6 =3D NULL; + options->routes_ipv6->flags =3D 0; + } +} + #ifndef ENABLE_SMALL static const char * diff --git a/src/openvpn/route.h b/src/openvpn/route.h index 421e7d2..b798c9d 100644 --- a/src/openvpn/route.h +++ b/src/openvpn/route.h @@ -321,6 +321,16 @@ const struct env_set *es, openvpn_net_ctx_t *ctx); +void +destroy_routes_v4(struct route_list *rl, const struct tuntap *tt, + unsigned int flags, const struct env_set *es, + openvpn_net_ctx_t *ctx, struct options *options); + +void +destroy_routes_v6(struct route_ipv6_list *rl6, const struct tuntap *tt, + unsigned int flags, const struct env_set *es, + openvpn_net_ctx_t *ctx, struct options *options); + void setenv_routes(struct env_set *es, const struct route_list *rl); void setenv_routes_ipv6(struct env_set *es, const struct route_ipv6_list *= rl6); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/809?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I507180d7397b6959844a30908010132bc3411067 Gerrit-Change-Number: 809 Gerrit-PatchSet: 10 Gerrit-Owner: mrbff Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: stipa Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-Attention: mrbff Gerrit-MessageType: newpatchset --y+3dA8u4ETw= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, mrbff, plaisthos. <= /p>

mrbff uploaded patch set #10 to this change.

View Change

PUSH_UPDATE: Added remove_option() and do_update().

* Added remov= e_option() function and some utility functions to remove options at
ru= ntime following the push-update logic.
* Added do_update() function to c= lose and reopen the tun and apply option updates.

Change-Id: I507180= d7397b6959844a30908010132bc3411067
Signed-off-by: Marco Baffo <marco@= ...2726...>
---
M src/openvpn/init.c
M src/openvpn/init.h
M = src/openvpn/multi.c
M src/openvpn/options.c
M src/openvpn/push.c
M= src/openvpn/route.c
M src/openvpn/route.h
7 files changed, 400 inser= tions(+), 40 deletions(-)

git pull ssh://gerrit.openvpn.net:29418=
/openvpn refs/changes/09/809/10
diff --git a/src/openvpn/init.c b/s=
rc/openvpn/init.c
index f8d9d06..9738d3b 100644
<= span>--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -2445,7 +2445,7 @@

= if (pulled_options)
{
- if (!do_deferred_options(c, option_t= ypes_found))
+ = if (!do_deferred_options(c, option_types_found, false))
{

msg(D_PUSH_ERRORS, "= ERROR: Failed to apply push options");
= return false;
@@ -2567,6 +2567,55 @@
= return true;
}

+bool
+do_update(struct context *c, unsigned int option_types_foun= d)
+{
+ /* Not necessary since to recei= ve the update the openvpn
+ * instance must be up and running but just in case
+ */
+ if (!c->c2.do_up_ran)
+ {
+ return false;
+ }
+
+ bo= ol tt_dco_win =3D tuntap_is_dco_win(c->c1.tuntap);
+ if (tt_dco_win)
+ {
+ msg(M_NONFATAL, "dco-win doesn't yet s= upport reopening TUN device");
+ return false;
+ }
+
+ if (!do_def= erred_options(c, option_types_found, true))
+ {
+ msg(D_PUSH_ERRORS, "ERROR: Failed to apply push opti= ons");
+ = return false;
+ }<= /span>
+
+ do_close_tun(c, true);
+

+ management_sleep(1);
+ int error_flags =3D 0;
+ c->c2.did_open_tun =3D do_open_t= un(c, &error_flags);
+ update_time();
+
+ if (c->c= 2.did_open_tun)
+ = {
+ /* if --ro= ute-delay was specified, start timer */
+ if ((route_order(c->c1.tuntap) =3D=3D ROUTE_= AFTER_TUN) && c->options.route_delay_defined)
+ {
+ event_timeout_init(&c->c2.rou= te_wakeup, c->options.route_delay, now);
+ event_timeout_init(&c->c2.route_= wakeup_expire, c->options.route_delay + c->options.route_delay_window= , now);
+ = tun_standby_init(c->c1.tuntap);
+ }
+
+ initia= lization_sequence_completed(c, error_flags);
+ }
+
+ CLEA= R(c->c1.pulled_options_digest_save);
+
= + return true;
+}<= /span>
+
/*=
* These are the option categories which will be accepted= by pull.
*/
@@ -2645,11 +2694,8 @@

return true;
}
-/*
- * Handle non-tun-related pulled options.- */
bool
-do_deferred_options(struct= context *c, const unsigned int found)
+do_deferred_options(struct context *c, const unsigned in= t found, const bool is_update)
{
if (= found & OPT_P_MESSAGES)
{
@@ -2745= ,7 +2791,7 @@
/* process (potentially) pushed options = */
if (c->options.pull)
{
- if (!check_pull_cl= ient_ncp(c, found))
+= if (!is_update && !check_pull_client_ncp(c, found))<= br> {
return false;
}

diff --git a/src/openvpn/init.h b/src/openvp= n/init.h
index ea7eb30..100f112 100644
--- = a/src/openvpn/init.h
+++ b/src/openvpn/init.h
@@ -86,13 +86,29 @@

bool pulled_options,
unsigned int option_types_found);
=
+/**
+ * @brief A simplified version of = the do_up() function. This function is called

+ * after receiving a successful PUSH_UPDAT= E message. It closes and reopens
+ * the TUN device to apply the updated options.<= br>+ *
+ * @param c The context structure.+ * @param option_types_found = The options found in the PUSH_UPDATE message.
+ * @return true on success.
+ * @return false on error.
+ */
+bool do_update(struct context *c, unsigned int opt= ion_types_found);
+
unsigned int pull_permission_mask(const struct context *c);=

const char *format_common_name(struct c= ontext *c, struct gc_arena *gc);

void re= set_coarse_timers(struct context *c);

-bool do_deferred_options(struct context *= c, const unsigned int found);
+/*
+ * Hand= le non-tun-related pulled options.
+ * Set `is_update` param to true to skip NCP check.+ */
+bool do_deferred_options(struct context *c, = const unsigned int found, const bool is_update);
void inherit_context_child(struct context *dest,
= const struct context *src);
diff= --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 45= b3cfa..a9040a6 100644
--- a/src/openvpn/multi.c
<= span>+++ b/src/openvpn/multi.c

@@ -2409,7 +2409,7 @@=
/*
* Process sourced options. */
- d= o_deferred_options(&mi->context, option_types_found);
+ do_deferred_options(&mi-&g= t;context, option_types_found, false);

= /*
* make sure we got ifconfig settings from somew= here
diff --git a/src/openvpn/options.c b/src/openvpn/optio= ns.c
index e417a99..bd00f65 100644
--- a/sr= c/openvpn/options.c
+++ b/src/openvpn/options.c
<= span>@@ -1055,6 +1055,40 @@
gc_free(&gc);

}
}
+
+s= tatic void
+delete_al= l_dhcp_fo(struct options *o, struct env_item **list)
+{
+ struct env_item *current, *prev;
+
+ ASSERT(list);
+
+ fo= r (current =3D *list, prev =3D NULL; current !=3D NULL; current =3D current= ->next)
+ {
+ char *tmp_value= =3D NULL;
+ i= f (!strncmp(current->string, "foreign_option_", sizeof("f= oreign_option_")-1))
+ {
+ = tmp_value =3D strchr(current->string, '=3D');
= + if (tmp_value &= ;& ++tmp_value)
+= {
+ = if (!strncmp(tmp_value, "dhcp-option ", sizeof("dh= cp-option ")-1))
+ {
+= if (prev)
+ {
+ prev->next =3D current->next;
+ }
+ e= lse
+ = {
+ = *list =3D current->next;
+ }
+ o->foreign_option_index--;
+ }<= br>+ }
+ }

+ prev =3D current;
+ }

+}
+
#endif /* ifndef _WIN32 */

static in_addr_t
@@ -3260,8 +3294,16 @@=
msg(M_INFO, "Flag 'def1' added to --redirec= t-gateway (iservice is in use)");
opt->rou= tes->flags |=3D RG_DEF1;
}
+ else if (opt->routes
+ && ((opt->ro= ute_method !=3D ROUTE_METHOD_SERVICE)
+ || !(opt->routes->flags & RG_R= EROUTE_GW))
+ = && (opt->routes->flags & RG_DEF1))
+ {
+ msg(M_INFO, "Flag 'def1' remov= ed from --redirect-gateway");
+ opt->routes->flags &=3D ~RG_DEF1;+ }
}
-#endif
+#endif /* ifdef _WIN32 */

/*
* Save/Restore certain option d= efaults before --pull is applied.
@@ -5452,37 +5494,6 @@
}
}

-void
-options_server_import(struct options *o,
- const char *fil= ename,

- = int msglevel,
- = unsigned int permission_mask,
- unsigned int *option_typ= es_found,
- = struct env_set *es)
-{
- msg(D_PU= SH, "OPTIONS IMPORT: reading client specific options from: %s", f= ilename);
- read_con= fig_file(o,
- = filename,
- = 0,
= - filename,
- 0,
- msglevel,
- permission_mask,
- option_types_foun= d,
- = es);
-}
-
-void
-options_string_import(struct options *options,
- const char *config,=
- const = int msglevel,
- = const unsigned int permission_mask,
- unsigned int *option_type= s_found,
- = struct env_set *es)
-{
- read_conf= ig_string("[CONFIG-STRING]", options, config, msglevel, permissio= n_mask, option_types_found, es);
-}
- #define VERIFY_PERMISSION(mask) { = \
if (!verify_permission(p[0], file, li= ne, (mask), permission_mask, \
= option_types_found, msglevel, options, is_inline)) \
<= span>@@ -5585,6 +5596,188 @@
return options->forwar= d_compatible ? M_WARN : msglevel;
}

+/**
+ * @brief Resets options found in the PU= SH_UPDATE message that are preceded by the `-` flag.
+ * This function is used in push-u= pdates to reset specified options.
+ * The number of parameters `p` must always be 1. If = the permission is verified,
+ * all related options are erased or reset to their default = values.
+ * Up= on successful permission verification (by VERIFY_PERMISSION()),
<= span style=3D"color: hsl(120, 100%, 40%);">+ * `option_types_found` = is filled with the flag corresponding to the option.

+ *
+ * @param c The context structure.
+ * @param options A pointer to the option= s structure.
+ * @par= am p An array of strings containing the options and their parameters.
+ * @param is_inline A boo= lean indicating if the option is inline.
+ * @param file The file where the function is called.<= /span>
+ * @param line The l= ine number where the function is called.
+ * @param msglevel The message level.
+ * @param permission_mask The permis= sion mask used by VERIFY_PERMISSION().
+ * @param option_types_found A pointer to the variable w= here the flags corresponding to the options found are stored.
+ * @param es The environment set = structure.

+ */
+static void
+remove_option(struct context *c,<= /span>
+ struct= options *options,
+ = char *p[],
+ bool is_inline,
+ const char *file,
+ int line,
+ const int msglevel,
<= span style=3D"color: hsl(120, 100%, 40%);">+ const unsigned in= t permission_mask,

+ = unsigned int *option_types_found,
+ struct env_set *es)
+{

+ int msglevel_fc =3D msglevel_forward_compatible(= options, msglevel);
+=
+ if (streq(p[0],= "ifconfig") && !p[1])
+ {
+ VERIFY_PERMISSION(OPT_P_UP);
+ options->ifconfig_local =3D NULL;=
+ options->ifconf= ig_remote_netmask =3D NULL;
+ }
+ el= se if (streq(p[0], "ifconfig-ipv6") && !p[1])
<= span style=3D"color: hsl(120, 100%, 40%);">+ {
+ VERIFY_PERMISSION(OPT_P_UP);+ options->ifconfig= _ipv6_local =3D NULL;
+ options->ifconfig_ipv6_netbits =3D 0;
+ options->ifconfig_ipv6_remote =3D= NULL;
+ }<= br>+ else if (streq(p[0], &q= uot;route") && !p[1])
+ {
= + VERIFY_PERMISSION(OPT_P_ROUTE);
+ if (c->c1.route_list)
+ {
+ destroy_routes_v4(c->c1.route_list, = c->c1.tuntap,
+ = ROUTE_OPTION_FLAGS(&c->options),+ = es, &c->net_ctx, options);
+ }
+ }
+ else= if (streq(p[0], "route-ipv6") && !p[1])
+ {
+ VERIFY_PERMISSION(OPT_P_ROUTE);
= + if (c->c1.route_ipv= 6_list)
+ {
+ destroy_ro= utes_v6(c->c1.route_ipv6_list, c->c1.tuntap,
+ ROUTE_OPTION_F= LAGS(&c->options),
+ es, &c->net_ctx, options);
+ }
+ }

+ else if (streq(p[0], "route-gateway"= ;) && !p[1])
= + {
+ VERIF= Y_PERMISSION(OPT_P_ROUTE_EXTRAS);
+ options->route_gateway_via_dhcp =3D false;<= br>+ options->route_d= efault_gateway =3D NULL;
+ }
+ else = if (streq(p[0], "route-metric") && !p[1])
+ {

+ VERIFY_PERMISSION(OPT_P_ROUTE);+ options->route_def= ault_metric =3D 0;
+ = }
+ else if (st= req(p[0], "push-continuation") && !p[1])
+ {
+ VERIFY_PERMISSION(OPT_P_PULL_MODE);=
+ options->push_c= ontinuation =3D 0;
+ = }
+ else if ((s= treq(p[0], "redirect-gateway") || streq(p[0], "redirect-priv= ate")) && !p[1])
+ {
+ = VERIFY_PERMISSION(OPT_P_ROUTE);
+ if (options->routes)
+ {
+ options->routes->flags =3D 0;+ }
+ if (options->routes_ipv6)
+ {
+ options->routes_i= pv6->flags =3D 0;

= + }
+ }

+ else if (streq(p[0]= , "dns") && !p[1])
+ {
+ gc_free(&options->dns_options.gc);<= /span>
+ CLEAR(option= s->dns_options);
+= }
+ else if (s= treq(p[0], "topology") && !p[1])
+ {
+ VERIFY_PERMISSION(OPT_P_UP);
+ options->topology =3D TOP_UNDE= F;
+ helper_se= tdefault_topology(options);
+ }
+ el= se if (streq(p[0], "tun-mtu") && !p[1])
+ {
+ VERIFY_PERMISSION(OPT_P_PUSH_MTU|OPT_P_CONN= ECTION);
+ opt= ions->ce.tun_mtu =3D TUN_MTU_DEFAULT;
+ options->ce.tun_mtu_defined =3D false;
+ options->ce.o= cc_mtu =3D 0;
+ }<= /span>
+ else if (streq(p= [0], "block-ipv6") && !p[1])
+ {
+ VERIFY_PERMISSION(OPT_P_ROUTE);
+ options->block_ipv6 =3D false;=
+ }
+#if defined(_WIN32) || defined(TA= RGET_ANDROID)

+ el= se if (streq(p[0], "dhcp-option") && !p[1])
+ {

+ struct tuntap_options *o =3D &optio= ns->tuntap_options;
+
+ o->domain =3D NULL;
+ o->netbios_scope =3D NULL;
+ o->netbios_node_type =3D 0;
+ o->dns6_le= n =3D 0;
+ mem= set(o->dns6, 0, sizeof(o->dns6));
+ o->dns_len =3D 0;
+ memset(o->dns, 0, sizeof(o->dns)= );
+ o->win= s_len =3D 0;
+ = memset(o->wins, 0, sizeof(o->wins));
+ o->ntp_len =3D 0;
+ memset(o->ntp, 0, sizeof(o->= ;ntp));
+ o-&g= t;nbdd_len =3D 0;
+ = memset(o->nbdd, 0, sizeof(o->nbdd));
+ while (o->domain_search_list_len-- = > 0)
+ {
+ o->doma= in_search_list[o->domain_search_list_len] =3D NULL;
+ }
+ o->disable_nbt =3D 0;
+ o->dhcp_options =3D 0;
+#if defined(TARGET_ANDR= OID)
+ o->h= ttp_proxy_port =3D 0;
+ o->http_proxy =3D NULL;
+#endif
+ }
+#endif /* = if defined(_WIN32) || defined(TARGET_ANDROID) */
+#ifdef _WIN32
+ else if (streq(p[0], "block-outside-dns&quo= t;) && !p[1])
+ {
+ VERI= FY_PERMISSION(OPT_P_DHCPDNS);
+ options->block_outside_dns =3D false;
+ }
+#else /* ifdef _WIN32 */
+ else if (streq(p[0], "dhcp-option&qu= ot;) && !p[1])
+ VER= IFY_PERMISSION(OPT_P_DHCPDNS);
+ delete_all_dhcp_fo(options, &es->list);+ }
+#endif
+ else
+ {
+ = int i;
+ i= nt msglevel_unknown =3D msglevel_fc;
+ /* Check if an option is in --ignore-unknown-optio= n and
+ * set= warning level to non fatal */
+ for (i =3D 0; options->ignore_unknown_option &&am= p; options->ignore_unknown_option[i]; i++)
+ {
+ if (streq(p[0], options->ignore_unknown_opti= on[i]))
+ = {
+ ms= glevel_unknown =3D M_WARN;
+ break;
+ }
+ }
+ = msg(msglevel_unknown, "Unrecognized option or missing or extra param= eter(s) in %s:%d: -%s (%s)", file, line, p[0], PACKAGE_VERSION);
+ }
+ return;
+err:
+ msg(msglevel, "Error occurred trying to remove %s opt= ion", p[0]);
+}<= /span>
bool
apply_push_options(struct context *c= ,
struct options *options,
@@ -5618,11 +5811,47 @@

add_option(opt= ions, p, false, file, line_num, 0, msglevel,
= permission_mask, option_types_found, es);
= }
+ = else if (push_update_option_flags & PUSH_OPT_TO_REMOVE)
<= span style=3D"color: hsl(120, 100%, 40%);">+ {

+ remove_option(c, opti= ons, p, false, file, line_num, msglevel,
+ permission_mask, option_= types_found, es);
+ = }
}
}
return true;

}

+void
+options_server_import(struct options *o,
<= span style=3D"color: hsl(120, 100%, 40%);">+ const cha= r *filename,

+ = int msglevel,
+ unsigned int permission_mask,
+ unsigned int= *option_types_found,

+ struct env_set *es)
+{
+ msg(D_PUSH, "OPTIONS IMPORT: reading client specific options= from: %s", filename);
+ read_config_file(o,
+ filename,
+ 0,
+ filename,
+ 0,
+ msglevel,
+ p= ermission_mask,
+ = option_types_found,
+ es);
+}
+
+void+options_string_import(struct = options *options,
+ = const char *config,
+ const int msglevel,
+ const unsig= ned int permission_mask,

+ unsigned int *option_types_found,
+ struct env_s= et *es)
+{
= + read_config_string("[= CONFIG-STRING]", options, config, msglevel, permission_mask, option_ty= pes_found, es);
+}
+
stat= ic void
set_user_script(struct options *options, const char **script,
diff --git a/s= rc/openvpn/push.c b/src/openvpn/push.c
index 2afd539..9d9f0= 55 100644
--- a/src/openvpn/push.c
+++ b/sr= c/openvpn/push.c
@@ -542,6 +542,11 @@
= {
msg(M_WARN, "No upd= atable options found in incoming PUSH_UPDATE message");
}

= + else if (!do_update(c, option_types_found))
+ {
+ msg(D_PUSH_ERROR= S, "Failed to update options");
+ goto error;
+ }
= }
}
event_timeout_c= lear(&c->c2.push_request_interval);
diff --git a/src= /openvpn/route.c b/src/openvpn/route.c
index d17b285..5358e= 3a 100644
--- a/src/openvpn/route.c
+++ b/s= rc/openvpn/route.c
@@ -1291,6 +1291,60 @@
= }
}

+void
+destroy_routes_v4(struct route_list *rl, const struct tuntap *tt,
+ uns= igned int flags, const struct env_set *es,
+ openvpn_net_ctx_t *ctx, struct opt= ions *options)
+{
+ if (rl && (= rl->iflags & RL_ROUTES_ADDED))
+ {
+ struct route_ipv4 *r;
+ for (r =3D rl->routes; r; r =3D r->next)=
+ {
+ delete_route(r, tt, flag= s, &rl->rgi, es, ctx);
+ }
+= rl->iflags &=3D ~RL_ROUTES_ADDED;
+ }
+
+ = undo_redirect_default_route_to_vpn(rl, tt, flags, es, ctx);
+

+ if (rl)
+ {
+ = clear_route_list(rl);
+ }
+ i= f (options->routes)
+ opt= ions->routes->routes =3D NULL;
+ options->routes->flags =3D 0;
+ }

+}
+
+void
+destroy_routes_v6(struct = route_ipv6_list *rl6, const struct tuntap *tt,
+ unsigned int flags, const stru= ct env_set *es,
+ = openvpn_net_ctx_t *ctx, struct options *options)
+{

+ if (rl6 && (rl6->iflags & RL_RO= UTES_ADDED))
+ {
+ struct route_= ipv6 *r6;
+ fo= r (r6 =3D rl6->routes_ipv6; r6; r6 =3D r6->next)
+ {
+ delete_route_ipv6(r6, tt, flags, es, c= tx);
+ }
+ rl6->iflags &a= mp;=3D ~RL_ROUTES_ADDED;
+ }
++ if (rl6)
+ {

+ clear_route_ipv6_list(rl6);
+ }

+ if (options->routes_ipv6)
+ {
+ options->routes_ipv6->routes_ipv6 = =3D NULL;
+ op= tions->routes_ipv6->flags =3D 0;
+ }
+}
+
#ifndef ENABLE_SMALL

static const c= har *
diff --git a/src/openvpn/route.h b/src/openvpn/route.= h
index 421e7d2..b798c9d 100644
--- a/src/o= penvpn/route.h
+++ b/src/openvpn/route.h
@@= -321,6 +321,16 @@
const struct env_set= *es,
openvpn_net_ctx_t *ctx);
+void
+destroy_routes_v4(struct = route_list *rl, const struct tuntap *tt,
+ unsigned int flags, const struct env= _set *es,
+ = openvpn_net_ctx_t *ctx, struct options *options);
+
+void
+destroy_routes_v6(struct route_ipv6_list *rl6, const struct tuntap *tt,=
+ u= nsigned int flags, const struct env_set *es,
+ openvpn_net_ctx_t *ctx, struct o= ptions *options);
+
void setenv_routes(struct env_set *es, const struct route_l= ist *rl);

void setenv_routes_ipv6(struct= env_set *es, const struct route_ipv6_list *rl6);

To view, visit change 809. To unsubscribe, or for help writing mail f= ilters, visit settings.<= /p>

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I507180d7397b6959844a3090801= 0132bc3411067
Gerrit-Change-Number: 809
Gerrit-PatchSet: 10
Gerrit-Owner: mrbff <marco@...2726...> <= /div>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: stipa <lstipakov@...277...= >
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: mrbff <marco@...2726...&g= t;
Gerrit-MessageType: newpatchset
--y+3dA8u4ETw=--