mirrors/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-11-23 09:43:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

dco: better naming for function parameters

Browse Source 
Current naming (remote_in4/6) is confusing, since
those are in fact VPN IPv4/v6 addresses and not
related to remote at all.

Change-Id: I101bbc9f682375ec733bca10b52da82f0abfec27
Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Antonio Quartulli <a@unstable.cc>
Message-Id: <20240927093045.22753-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29460.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Lev Stipakov 2024-09-27 11:30:45 +02:00 committed by Gert Doering
parent 2ad9325d1b
commit 95e5a0b4f0
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openvpn/dco_freebsd.c
View File

@ -75,7 +75,7 @@ sockaddr_to_nvlist(const struct sockaddr *sa)
int
dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd,
struct sockaddr *localaddr, struct sockaddr *remoteaddr,
struct in_addr *remote_in4, struct in6_addr *remote_in6)
struct in_addr *vpn_ipv4, struct in6_addr *vpn_ipv6)
{
struct ifdrv drv;
nvlist_t *nvl;
@ -95,15 +95,15 @@ dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd,
nvlist_add_nvlist(nvl, "remote", sockaddr_to_nvlist(remoteaddr));
}
if (remote_in4)
if (vpn_ipv4)
{
nvlist_add_binary(nvl, "vpn_ipv4", &remote_in4->s_addr,
sizeof(remote_in4->s_addr));
nvlist_add_binary(nvl, "vpn_ipv4", &vpn_ipv4->s_addr,
sizeof(vpn_ipv4->s_addr));
}
if (remote_in6)
if (vpn_ipv6)
{
nvlist_add_binary(nvl, "vpn_ipv6", remote_in6, sizeof(*remote_in6));
nvlist_add_binary(nvl, "vpn_ipv6", vpn_ipv6, sizeof(*vpn_ipv6));
}
nvlist_add_number(nvl, "fd", sd);

2
src/openvpn/dco_internal.h
View File

@ -62,7 +62,7 @@ dco_get_cipher(const char *cipher)
int dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd,
struct sockaddr *localaddr, struct sockaddr *remoteaddr,
struct in_addr *remote_in4, struct in6_addr *remote_in6);
struct in_addr *vpn_ipv4, struct in6_addr *vpn_ipv6);
int dco_del_peer(dco_context_t *dco, unsigned int peerid);

10
src/openvpn/dco_linux.c
View File

@ -220,7 +220,7 @@ mapped_v4_to_v6(struct sockaddr *sock, struct gc_arena *gc)
int
dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd,
struct sockaddr *localaddr, struct sockaddr *remoteaddr,
struct in_addr *remote_in4, struct in6_addr *remote_in6)
struct in_addr *vpn_ipv4, struct in6_addr *vpn_ipv6)
{
struct gc_arena gc = gc_new();
const char *remotestr = "[undefined]";
@ -263,14 +263,14 @@ dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd,
}
/* Set the primary VPN IP addresses of the peer */
if (remote_in4)
if (vpn_ipv4)
{
NLA_PUT_U32(nl_msg, OVPN_NEW_PEER_ATTR_IPV4, remote_in4->s_addr);
NLA_PUT_U32(nl_msg, OVPN_NEW_PEER_ATTR_IPV4, vpn_ipv4->s_addr);
}
if (remote_in6)
if (vpn_ipv6)
{
NLA_PUT(nl_msg, OVPN_NEW_PEER_ATTR_IPV6, sizeof(struct in6_addr),
remote_in6);
vpn_ipv6);
}
nla_nest_end(nl_msg, attr);

2
src/openvpn/dco_win.c
View File

@ -247,7 +247,7 @@ dco_create_socket(HANDLE handle, struct addrinfo *remoteaddr, bool bind_local,
int
dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd,
struct sockaddr *localaddr, struct sockaddr *remoteaddr,
struct in_addr *remote_in4, struct in6_addr *remote_in6)
struct in_addr *vpn_ipv4, struct in6_addr *vpn_ipv6)
{
msg(D_DCO_DEBUG, "%s: peer-id %d, fd %d", __func__, peerid, sd);
return 0;