colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wireguard: merge branch 'th/wireguard-dns-endpoint-sticky-addr'

Browse Source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/754

(cherry picked from commit cd86b462fc)
This commit is contained in:
Thomas Haller
2021-02-16 14:05:14 +01:00
parent c7fa8d0a16 2e00d161b2
commit ea4c64deea
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/devices/nm-device-wireguard.c
View File

@@ -729,7 +729,7 @@ _peers_resolve_cb(GObject *source_object, GAsyncResult *res, gpointer user_data)
PeerData * peer_data; PeerData * peer_data;
gs_free_error GError *resolv_error = NULL; gs_free_error GError *resolv_error = NULL;
GList * list; GList * list;
gboolean changed = FALSE; gboolean changed;
NMSockAddrUnion sockaddr; NMSockAddrUnion sockaddr;
gint64 retry_in_msec; gint64 retry_in_msec;
char s_sockaddr[100]; char s_sockaddr[100];
@@ -775,36 +775,49 @@ _peers_resolve_cb(GObject *source_object, GAsyncResult *res, gpointer user_data)
} }
sockaddr = (NMSockAddrUnion) NM_SOCK_ADDR_UNION_INIT_UNSPEC; sockaddr = (NMSockAddrUnion) NM_SOCK_ADDR_UNION_INIT_UNSPEC;
changed = FALSE;
if (!resolv_error) { if (!resolv_error) {
GList *iter; GList *iter;
for (iter = list; iter; iter = iter->next) { for (iter = list; iter; iter = iter->next) {
GInetAddress * a = iter->data; GInetAddress * a = iter->data;
GSocketFamily f = g_inet_address_get_family(a); NMSockAddrUnion sockaddr_tmp;
NMSockAddrUnion *s;
if (f == G_SOCKET_FAMILY_IPV4) { s = sockaddr.sa.sa_family == AF_UNSPEC ? &sockaddr : &sockaddr_tmp;
switch (g_inet_address_get_family(a)) {
case G_SOCKET_FAMILY_IPV4:
nm_assert(g_inet_address_get_native_size(a) == sizeof(struct in_addr)); nm_assert(g_inet_address_get_native_size(a) == sizeof(struct in_addr));
sockaddr.in = (struct sockaddr_in){ s->in = (struct sockaddr_in){
.sin_family = AF_INET, .sin_family = AF_INET,
.sin_port = htons(nm_sock_addr_endpoint_get_port( .sin_port = htons(nm_sock_addr_endpoint_get_port(
_nm_wireguard_peer_get_endpoint(peer_data->peer))), _nm_wireguard_peer_get_endpoint(peer_data->peer))),
}; };
memcpy(&sockaddr.in.sin_addr, g_inet_address_to_bytes(a), sizeof(struct in_addr)); memcpy(&s->in.sin_addr, g_inet_address_to_bytes(a), sizeof(struct in_addr));
break; break;
} case G_SOCKET_FAMILY_IPV6:
if (f == G_SOCKET_FAMILY_IPV6) {
nm_assert(g_inet_address_get_native_size(a) == sizeof(struct in6_addr)); nm_assert(g_inet_address_get_native_size(a) == sizeof(struct in6_addr));
sockaddr.in6 = (struct sockaddr_in6){ s->in6 = (struct sockaddr_in6){
.sin6_family = AF_INET6, .sin6_family = AF_INET6,
.sin6_port = htons(nm_sock_addr_endpoint_get_port( .sin6_port = htons(nm_sock_addr_endpoint_get_port(
_nm_wireguard_peer_get_endpoint(peer_data->peer))), _nm_wireguard_peer_get_endpoint(peer_data->peer))),
.sin6_scope_id = 0, .sin6_scope_id = 0,
.sin6_flowinfo = 0, .sin6_flowinfo = 0,
}; };
memcpy(&sockaddr.in6.sin6_addr, memcpy(&s->in6.sin6_addr, g_inet_address_to_bytes(a), sizeof(struct in6_addr));
g_inet_address_to_bytes(a), break;
sizeof(struct in6_addr)); default:
continue;
}
changed = TRUE;
if (peer_data->ep_resolv.sockaddr.sa.sa_family == AF_UNSPEC)
break;
if (nm_sock_addr_union_cmp(&peer_data->ep_resolv.sockaddr, &sockaddr) == 0) {
changed = FALSE;
break; break;
} }
} }
@@ -819,11 +832,8 @@ _peers_resolve_cb(GObject *source_object, GAsyncResult *res, gpointer user_data)
* a possibly good IP address, since WireGuard supports automatic roaming * a possibly good IP address, since WireGuard supports automatic roaming
* anyway. Either the IP address is still good (and we would wrongly * anyway. Either the IP address is still good (and we would wrongly
* reject it), or it isn't -- in which case it does not hurt much. */ * reject it), or it isn't -- in which case it does not hurt much. */
} else { } else if (changed)
if (nm_sock_addr_union_cmp(&peer_data->ep_resolv.sockaddr, &sockaddr) != 0)
changed = TRUE;
peer_data->ep_resolv.sockaddr = sockaddr; peer_data->ep_resolv.sockaddr = sockaddr;
}
if (resolv_error || peer_data->ep_resolv.sockaddr.sa.sa_family == AF_UNSPEC) { if (resolv_error || peer_data->ep_resolv.sockaddr.sa.sa_family == AF_UNSPEC) {
/* while it technically did not fail, something is probably odd. Retry frequently to /* while it technically did not fail, something is probably odd. Retry frequently to

8
src/core/platform/nmp-object.h
View File

@@ -34,10 +34,14 @@ typedef union {
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
} NMSockAddrUnion; } NMSockAddrUnion;
G_STATIC_ASSERT(sizeof(NMSockAddrUnion) == sizeof(((NMSockAddrUnion *) NULL)->in6));
/* we initialize the largest union member, to ensure that all fields are initialized. */
#define NM_SOCK_ADDR_UNION_INIT_UNSPEC \ #define NM_SOCK_ADDR_UNION_INIT_UNSPEC \
{ \ { \
.sa = { \ .in6 = { \
.sa_family = AF_UNSPEC, \ .sin6_family = AF_UNSPEC, \
}, \ }, \
} }