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

core/trivial: rename nm_utils_get_reverse_dns_domains_ip*() functions

Browse Source 
Let's add a nm_utils_get_reverse_dns_domains_ip() function, which can
operate on both address families. We frequently do that, but then our
address family specific functions tend to have an underscore in the name.

Rename.
This commit is contained in:
Thomas Haller
2020-11-20 20:08:37 +01:00
parent 757443d0c5
commit beda25dec0
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dns/nm-dns-manager.c
View File

@@ -1277,11 +1277,11 @@ get_ip_rdns_domains(NMIPConfig *ip_config)
const NMPlatformIP4Route * route; const NMPlatformIP4Route * route;
nm_ip_config_iter_ip4_address_for_each (&ipconf_iter, ip4, &address) nm_ip_config_iter_ip4_address_for_each (&ipconf_iter, ip4, &address)
nm_utils_get_reverse_dns_domains_ip4(address->address, address->plen, domains); nm_utils_get_reverse_dns_domains_ip_4(address->address, address->plen, domains);
nm_ip_config_iter_ip4_route_for_each (&ipconf_iter, ip4, &route) { nm_ip_config_iter_ip4_route_for_each (&ipconf_iter, ip4, &route) {
if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT(route)) if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT(route))
nm_utils_get_reverse_dns_domains_ip4(route->network, route->plen, domains); nm_utils_get_reverse_dns_domains_ip_4(route->network, route->plen, domains);
} }
} else { } else {
NMIP6Config * ip6 = (gpointer) ip_config; NMIP6Config * ip6 = (gpointer) ip_config;
@@ -1289,11 +1289,11 @@ get_ip_rdns_domains(NMIPConfig *ip_config)
const NMPlatformIP6Route * route; const NMPlatformIP6Route * route;
nm_ip_config_iter_ip6_address_for_each (&ipconf_iter, ip6, &address) nm_ip_config_iter_ip6_address_for_each (&ipconf_iter, ip6, &address)
nm_utils_get_reverse_dns_domains_ip6(&address->address, address->plen, domains); nm_utils_get_reverse_dns_domains_ip_6(&address->address, address->plen, domains);
nm_ip_config_iter_ip6_route_for_each (&ipconf_iter, ip6, &route) { nm_ip_config_iter_ip6_route_for_each (&ipconf_iter, ip6, &route) {
if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT(route)) if (!NM_PLATFORM_IP_ROUTE_IS_DEFAULT(route))
nm_utils_get_reverse_dns_domains_ip6(&route->network, route->plen, domains); nm_utils_get_reverse_dns_domains_ip_6(&route->network, route->plen, domains);
} }
} }

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

@@ -4381,7 +4381,7 @@ nm_utils_dnsmasq_status_to_string(int status, char *dest, gsize size)
} }
/** /**
* nm_utils_get_reverse_dns_domains_ip4: * nm_utils_get_reverse_dns_domains_ip_4:
* @addr: IP address in network order * @addr: IP address in network order
* @plen: prefix length * @plen: prefix length
* @domains: array for results * @domains: array for results
@@ -4390,7 +4390,7 @@ nm_utils_dnsmasq_status_to_string(int status, char *dest, gsize size)
* append them to @domains. * append them to @domains.
*/ */
void void
nm_utils_get_reverse_dns_domains_ip4(guint32 addr, guint8 plen, GPtrArray *domains) nm_utils_get_reverse_dns_domains_ip_4(guint32 addr, guint8 plen, GPtrArray *domains)
{ {
guint32 ip, ip2, mask; guint32 ip, ip2, mask;
guchar *p; guchar *p;
@@ -4429,7 +4429,7 @@ nm_utils_get_reverse_dns_domains_ip4(guint32 addr, guint8 plen, GPtrArray *domai
} }
/** /**
* nm_utils_get_reverse_dns_domains_ip6: * nm_utils_get_reverse_dns_domains_ip_6:
* @addr: IPv6 address * @addr: IPv6 address
* @plen: prefix length * @plen: prefix length
* @domains: array for results * @domains: array for results
@@ -4438,7 +4438,7 @@ nm_utils_get_reverse_dns_domains_ip4(guint32 addr, guint8 plen, GPtrArray *domai
* append them to @domains. * append them to @domains.
*/ */
void void
nm_utils_get_reverse_dns_domains_ip6(const struct in6_addr *ip, guint8 plen, GPtrArray *domains) nm_utils_get_reverse_dns_domains_ip_6(const struct in6_addr *ip, guint8 plen, GPtrArray *domains)
{ {
struct in6_addr addr; struct in6_addr addr;
guint nibbles, bits, entries; guint nibbles, bits, entries;

4
src/nm-core-utils.h
View File

@@ -532,9 +532,9 @@ nm_utils_ip4_address_is_zeronet(in_addr_t network)
const char *nm_utils_dnsmasq_status_to_string(int status, char *dest, gsize size); const char *nm_utils_dnsmasq_status_to_string(int status, char *dest, gsize size);
void nm_utils_get_reverse_dns_domains_ip4(guint32 ip, guint8 plen, GPtrArray *domains); void nm_utils_get_reverse_dns_domains_ip_4(guint32 ip, guint8 plen, GPtrArray *domains);
void void
nm_utils_get_reverse_dns_domains_ip6(const struct in6_addr *ip, guint8 plen, GPtrArray *domains); nm_utils_get_reverse_dns_domains_ip_6(const struct in6_addr *ip, guint8 plen, GPtrArray *domains);
struct stat; struct stat;

26
src/tests/test-core.c
View File

@@ -1929,7 +1929,7 @@ test_reverse_dns_ip4(void)
GPtrArray *domains = g_ptr_array_new_full(8, g_free); GPtrArray *domains = g_ptr_array_new_full(8, g_free);
inet_pton(AF_INET, "7.2.3.0", &addr); inet_pton(AF_INET, "7.2.3.0", &addr);
nm_utils_get_reverse_dns_domains_ip4(addr, 27, domains); nm_utils_get_reverse_dns_domains_ip_4(addr, 27, domains);
g_assert_cmpuint(domains->len, ==, 32); g_assert_cmpuint(domains->len, ==, 32);
g_assert_cmpstr(domains->pdata[0], ==, "0.3.2.7.in-addr.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "0.3.2.7.in-addr.arpa");
g_assert_cmpstr(domains->pdata[31], ==, "31.3.2.7.in-addr.arpa"); g_assert_cmpstr(domains->pdata[31], ==, "31.3.2.7.in-addr.arpa");
@@ -1937,7 +1937,7 @@ test_reverse_dns_ip4(void)
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET, "10.155.16.0", &addr); inet_pton(AF_INET, "10.155.16.0", &addr);
nm_utils_get_reverse_dns_domains_ip4(addr, 22, domains); nm_utils_get_reverse_dns_domains_ip_4(addr, 22, domains);
g_assert_cmpuint(domains->len, ==, 4); g_assert_cmpuint(domains->len, ==, 4);
g_assert_cmpstr(domains->pdata[0], ==, "16.155.10.in-addr.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "16.155.10.in-addr.arpa");
g_assert_cmpstr(domains->pdata[1], ==, "17.155.10.in-addr.arpa"); g_assert_cmpstr(domains->pdata[1], ==, "17.155.10.in-addr.arpa");
@@ -1947,21 +1947,21 @@ test_reverse_dns_ip4(void)
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET, "4.5.6.7", &addr); inet_pton(AF_INET, "4.5.6.7", &addr);
nm_utils_get_reverse_dns_domains_ip4(addr, 32, domains); nm_utils_get_reverse_dns_domains_ip_4(addr, 32, domains);
g_assert_cmpuint(domains->len, ==, 1); g_assert_cmpuint(domains->len, ==, 1);
g_assert_cmpstr(domains->pdata[0], ==, "7.6.5.4.in-addr.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "7.6.5.4.in-addr.arpa");
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET, "4.5.6.7", &addr); inet_pton(AF_INET, "4.5.6.7", &addr);
nm_utils_get_reverse_dns_domains_ip4(addr, 8, domains); nm_utils_get_reverse_dns_domains_ip_4(addr, 8, domains);
g_assert_cmpuint(domains->len, ==, 1); g_assert_cmpuint(domains->len, ==, 1);
g_assert_cmpstr(domains->pdata[0], ==, "4.in-addr.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "4.in-addr.arpa");
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET, "4.180.6.7", &addr); inet_pton(AF_INET, "4.180.6.7", &addr);
nm_utils_get_reverse_dns_domains_ip4(addr, 9, domains); nm_utils_get_reverse_dns_domains_ip_4(addr, 9, domains);
g_assert_cmpuint(domains->len, ==, 128); g_assert_cmpuint(domains->len, ==, 128);
g_assert_cmpstr(domains->pdata[0], ==, "128.4.in-addr.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "128.4.in-addr.arpa");
g_assert_cmpstr(domains->pdata[1], ==, "129.4.in-addr.arpa"); g_assert_cmpstr(domains->pdata[1], ==, "129.4.in-addr.arpa");
@@ -1970,7 +1970,7 @@ test_reverse_dns_ip4(void)
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET, "172.16.0.0", &addr); inet_pton(AF_INET, "172.16.0.0", &addr);
nm_utils_get_reverse_dns_domains_ip4(addr, 12, domains); nm_utils_get_reverse_dns_domains_ip_4(addr, 12, domains);
g_assert_cmpuint(domains->len, ==, 16); g_assert_cmpuint(domains->len, ==, 16);
g_assert_cmpstr(domains->pdata[0], ==, "16.172.in-addr.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "16.172.in-addr.arpa");
g_assert_cmpstr(domains->pdata[1], ==, "17.172.in-addr.arpa"); g_assert_cmpstr(domains->pdata[1], ==, "17.172.in-addr.arpa");
@@ -1980,7 +1980,7 @@ test_reverse_dns_ip4(void)
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET, "1.2.3.4", &addr); inet_pton(AF_INET, "1.2.3.4", &addr);
nm_utils_get_reverse_dns_domains_ip4(addr, 0, domains); nm_utils_get_reverse_dns_domains_ip_4(addr, 0, domains);
g_assert_cmpuint(domains->len, ==, 0); g_assert_cmpuint(domains->len, ==, 0);
g_ptr_array_unref(domains); g_ptr_array_unref(domains);
@@ -1993,14 +1993,14 @@ test_reverse_dns_ip6(void)
GPtrArray * domains = g_ptr_array_new_full(8, g_free); GPtrArray * domains = g_ptr_array_new_full(8, g_free);
inet_pton(AF_INET6, "1234::56", &addr); inet_pton(AF_INET6, "1234::56", &addr);
nm_utils_get_reverse_dns_domains_ip6(&addr, 16, domains); nm_utils_get_reverse_dns_domains_ip_6(&addr, 16, domains);
g_assert_cmpuint(domains->len, ==, 1); g_assert_cmpuint(domains->len, ==, 1);
g_assert_cmpstr(domains->pdata[0], ==, "4.3.2.1.ip6.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "4.3.2.1.ip6.arpa");
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET6, "1234::56", &addr); inet_pton(AF_INET6, "1234::56", &addr);
nm_utils_get_reverse_dns_domains_ip6(&addr, 17, domains); nm_utils_get_reverse_dns_domains_ip_6(&addr, 17, domains);
g_assert_cmpuint(domains->len, ==, 8); g_assert_cmpuint(domains->len, ==, 8);
g_assert_cmpstr(domains->pdata[0], ==, "0.4.3.2.1.ip6.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "0.4.3.2.1.ip6.arpa");
g_assert_cmpstr(domains->pdata[1], ==, "1.4.3.2.1.ip6.arpa"); g_assert_cmpstr(domains->pdata[1], ==, "1.4.3.2.1.ip6.arpa");
@@ -2009,7 +2009,7 @@ test_reverse_dns_ip6(void)
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET6, "2001:db8::", &addr); inet_pton(AF_INET6, "2001:db8::", &addr);
nm_utils_get_reverse_dns_domains_ip6(&addr, 29, domains); nm_utils_get_reverse_dns_domains_ip_6(&addr, 29, domains);
g_assert_cmpuint(domains->len, ==, 8); g_assert_cmpuint(domains->len, ==, 8);
g_assert_cmpstr(domains->pdata[0], ==, "8.b.d.0.1.0.0.2.ip6.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "8.b.d.0.1.0.0.2.ip6.arpa");
g_assert_cmpstr(domains->pdata[1], ==, "9.b.d.0.1.0.0.2.ip6.arpa"); g_assert_cmpstr(domains->pdata[1], ==, "9.b.d.0.1.0.0.2.ip6.arpa");
@@ -2018,7 +2018,7 @@ test_reverse_dns_ip6(void)
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET6, "0123:4567:89ab:cdef::", &addr); inet_pton(AF_INET6, "0123:4567:89ab:cdef::", &addr);
nm_utils_get_reverse_dns_domains_ip6(&addr, 63, domains); nm_utils_get_reverse_dns_domains_ip_6(&addr, 63, domains);
g_assert_cmpuint(domains->len, ==, 2); g_assert_cmpuint(domains->len, ==, 2);
g_assert_cmpstr(domains->pdata[0], ==, "e.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.ip6.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "e.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.ip6.arpa");
g_assert_cmpstr(domains->pdata[1], ==, "f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.ip6.arpa"); g_assert_cmpstr(domains->pdata[1], ==, "f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.ip6.arpa");
@@ -2026,7 +2026,7 @@ test_reverse_dns_ip6(void)
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET6, "fec0:1234:5678:9ab0::", &addr); inet_pton(AF_INET6, "fec0:1234:5678:9ab0::", &addr);
nm_utils_get_reverse_dns_domains_ip6(&addr, 61, domains); nm_utils_get_reverse_dns_domains_ip_6(&addr, 61, domains);
g_assert_cmpuint(domains->len, ==, 8); g_assert_cmpuint(domains->len, ==, 8);
g_assert_cmpstr(domains->pdata[0], ==, "0.b.a.9.8.7.6.5.4.3.2.1.0.c.e.f.ip6.arpa"); g_assert_cmpstr(domains->pdata[0], ==, "0.b.a.9.8.7.6.5.4.3.2.1.0.c.e.f.ip6.arpa");
g_assert_cmpstr(domains->pdata[7], ==, "7.b.a.9.8.7.6.5.4.3.2.1.0.c.e.f.ip6.arpa"); g_assert_cmpstr(domains->pdata[7], ==, "7.b.a.9.8.7.6.5.4.3.2.1.0.c.e.f.ip6.arpa");
@@ -2034,7 +2034,7 @@ test_reverse_dns_ip6(void)
g_ptr_array_set_size(domains, 0); g_ptr_array_set_size(domains, 0);
inet_pton(AF_INET6, "0123:4567:89ab:cdee::", &addr); inet_pton(AF_INET6, "0123:4567:89ab:cdee::", &addr);
nm_utils_get_reverse_dns_domains_ip6(&addr, 0, domains); nm_utils_get_reverse_dns_domains_ip_6(&addr, 0, domains);
g_assert_cmpuint(domains->len, ==, 0); g_assert_cmpuint(domains->len, ==, 0);
g_ptr_array_unref(domains); g_ptr_array_unref(domains);