OpenVPN/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2025-05-09 05:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

dns: clone options via pointer instead of copy

Browse Source 
Change-Id: I12b8bb26c0cb70e50b2d42b1c69018894e9f080c
Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Message-Id: <20241213164630.266045-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30112.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Heiko Hund 2024-12-13 17:46:30 +01:00 committed by Gert Doering
parent 6f2d222c92
commit db46d4d38b
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openvpn/dns.c
View File

@ -248,13 +248,15 @@ clone_dns_servers(const struct dns_server *server, struct gc_arena *gc)
}
struct dns_options
clone_dns_options(const struct dns_options o, struct gc_arena *gc)
clone_dns_options(const struct dns_options *o, struct gc_arena *gc)
{
struct dns_options clone;
memset(&clone, 0, sizeof(clone));
clone.search_domains = clone_dns_domains(o.search_domains, gc);
clone.servers = clone_dns_servers(o.servers, gc);
clone.servers_prepull = clone_dns_servers(o.servers_prepull, gc);
clone.search_domains = clone_dns_domains(o->search_domains, gc);
clone.servers = clone_dns_servers(o->servers, gc);
clone.servers_prepull = clone_dns_servers(o->servers_prepull, gc);
return clone;
}

3
src/openvpn/dns.h
View File

@ -129,7 +129,8 @@ bool dns_options_verify(int msglevel, const struct dns_options *o);
* @param gc Pointer to the gc_arena to use for the clone
* @return The dns_options clone
*/
struct dns_options clone_dns_options(const struct dns_options o, struct gc_arena *gc);
struct dns_options clone_dns_options(const struct dns_options *o,
struct gc_arena *gc);
/**
* Saves and resets the server options, so that pulled ones don't mix in.

4
src/openvpn/options.c
View File

@ -3311,7 +3311,7 @@ pre_connect_save(struct options *o)
o->pre_connect->route_default_gateway = o->route_default_gateway;
o->pre_connect->route_ipv6_default_gateway = o->route_ipv6_default_gateway;
o->pre_connect->dns_options = clone_dns_options(o->dns_options, &o->gc);
o->pre_connect->dns_options = clone_dns_options(&o->dns_options, &o->gc);
/* NCP related options that can be overwritten by a push */
o->pre_connect->ciphername = o->ciphername;
@ -3364,7 +3364,7 @@ pre_connect_restore(struct options *o, struct gc_arena *gc)
/* Free DNS options and reset them to pre-pull state */
gc_free(&o->dns_options.gc);
struct gc_arena dns_gc = gc_new();
o->dns_options = clone_dns_options(pp->dns_options, &dns_gc);
o->dns_options = clone_dns_options(&pp->dns_options, &dns_gc);
o->dns_options.gc = dns_gc;
if (pp->client_nat_defined)