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

core: accept %NULL as source argument for nm_utils_ipx_address_clear_host_address()

Browse Source 
Just for convenience.
This commit is contained in:
Thomas Haller
2019-03-04 15:50:52 +01:00
parent d943ea415f
commit be107c75c9
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NetworkManagerUtils.c
View File

@@ -404,8 +404,8 @@ route_compare (NMIPRoute *route1, NMIPRoute *route2, gint64 default_metric)
nm_assert_not_reached (); nm_assert_not_reached ();
if (!inet_pton (family, nm_ip_route_get_dest (route2), &a2)) if (!inet_pton (family, nm_ip_route_get_dest (route2), &a2))
nm_assert_not_reached (); nm_assert_not_reached ();
nm_utils_ipx_address_clear_host_address (family, &a1, &a1, plen); nm_utils_ipx_address_clear_host_address (family, &a1, NULL, plen);
nm_utils_ipx_address_clear_host_address (family, &a2, &a2, plen); nm_utils_ipx_address_clear_host_address (family, &a2, NULL, plen);
NM_CMP_DIRECT_MEMCMP (&a1, &a2, nm_utils_addr_family_to_size (family)); NM_CMP_DIRECT_MEMCMP (&a1, &a2, nm_utils_addr_family_to_size (family));
return 0; return 0;

10
src/nm-core-utils.c
View File

@@ -244,16 +244,20 @@ nm_ethernet_address_is_valid (gconstpointer addr, gssize len)
gconstpointer gconstpointer
nm_utils_ipx_address_clear_host_address (int family, gpointer dst, gconstpointer src, guint8 plen) nm_utils_ipx_address_clear_host_address (int family, gpointer dst, gconstpointer src, guint8 plen)
{ {
g_return_val_if_fail (src, NULL);
g_return_val_if_fail (dst, NULL); g_return_val_if_fail (dst, NULL);
switch (family) { switch (family) {
case AF_INET: case AF_INET:
g_return_val_if_fail (plen <= 32, NULL); g_return_val_if_fail (plen <= 32, NULL);
if (!src) {
/* allow "self-assignment", by specifying %NULL as source. */
src = dst;
}
*((guint32 *) dst) = nm_utils_ip4_address_clear_host_address (*((guint32 *) src), plen); *((guint32 *) dst) = nm_utils_ip4_address_clear_host_address (*((guint32 *) src), plen);
break; break;
case AF_INET6: case AF_INET6:
g_return_val_if_fail (plen <= 128, NULL);
nm_utils_ip6_address_clear_host_address (dst, src, plen); nm_utils_ip6_address_clear_host_address (dst, src, plen);
break; break;
default: default:
@@ -4017,7 +4021,7 @@ nm_utils_get_reverse_dns_domains_ip6 (const struct in6_addr *ip, guint8 plen, GP
return; return;
memcpy (&addr, ip, sizeof (struct in6_addr)); memcpy (&addr, ip, sizeof (struct in6_addr));
nm_utils_ip6_address_clear_host_address (&addr, &addr, plen); nm_utils_ip6_address_clear_host_address (&addr, NULL, plen);
/* Number of nibbles to include in domains */ /* Number of nibbles to include in domains */
nibbles = (plen - 1) / 4 + 1; nibbles = (plen - 1) / 4 + 1;