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

dco: properly name variables

Browse source 
renamed remote_addrX variables to vpn_addrX to make it clear that they
refer to the address over the VPN/tunnel

Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20220813204224.22576-7-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24916.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Antonio Quartulli 2022-08-13 22:42:24 +02:00 committed by Gert Doering
parent 1e1ec03816
commit cea978bcb6
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/openvpn/dco.c
View file

@ -552,19 +552,20 @@ dco_multi_add_new_peer(struct multi_context *m, struct multi_instance *mi)
remoteaddr = &c->c2.link_socket_info->lsa->actual.dest.addr.sa;
}
struct in_addr remote_ip4 = { 0 };
struct in6_addr *remote_addr6 = NULL;
struct in_addr *remote_addr4 = NULL;
/* In server mode we need to fetch the remote addresses from the push config */
struct in_addr vpn_ip4 = { 0 };
struct in_addr *vpn_addr4 = NULL;
if (c->c2.push_ifconfig_defined)
{
remote_ip4.s_addr = htonl(c->c2.push_ifconfig_local);
remote_addr4 = &remote_ip4;
vpn_ip4.s_addr = htonl(c->c2.push_ifconfig_local);
vpn_addr4 = &vpn_ip4;
}
struct in6_addr *vpn_addr6 = NULL;
if (c->c2.push_ifconfig_ipv6_defined)
{
remote_addr6 = &c->c2.push_ifconfig_ipv6_local;
vpn_addr6 = &c->c2.push_ifconfig_ipv6_local;
}
if (dco_multi_get_localaddr(m, mi, &local))
@ -573,7 +574,7 @@ dco_multi_add_new_peer(struct multi_context *m, struct multi_instance *mi)
}
int ret = dco_new_peer(&c->c1.tuntap->dco, peer_id, sd, localaddr,
remoteaddr, remote_addr4, remote_addr6);
remoteaddr, vpn_addr4, vpn_addr6);
if (ret < 0)
{
return ret;