diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-02 13:15:18 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-02 14:07:10 +0200 |
| commit | ea6648cea13219fac81b01f1ea85292a08f671b3 (patch) | |
| tree | f2adf1d146a808041ce694ce194e0eca68c90966 /src/dhcp/tests/test-dhcp-dhclient.c | |
| parent | c0419257e70cc64c889a9a906445a74efb92dc44 (diff) | |
| download | NetworkManager-ea6648cea13219fac81b01f1ea85292a08f671b3.tar.gz | |
all: replace uses of inet_aton() and friends
rpmdiff complains about uses of inet_aton, inet_makeaddr, inet_netof,
inet_ntoa under the IPv6 section:
usr/sbin/NetworkManager on aarch64 i686 x86_64 ppc ppc64 ppc64le s390 s390x uses function inet_aton, which may impact IPv6 support
I think the warning is bogus, but refactor our code to avoid it.
Note that systemd code still uses them, so it don't avoid the rpmdiff
warning. But let's not diverge our systemd import from upstream for this.
- for NMSettingBond:validate_ip() also avoid g_strsplit_set() which
allocates a full strv. Instead, we can do with one g_strdup().
- for test-resolvconf-capture.c, replace the functions with macros.
Macros should be avoided usually, but for test asserts they are
more convenient as they preserved the __FILE__:__LINE__ of where
the assertion fails.
Diffstat (limited to 'src/dhcp/tests/test-dhcp-dhclient.c')
| -rw-r--r-- | src/dhcp/tests/test-dhcp-dhclient.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c index 6e75578d69..2308cf75fa 100644 --- a/src/dhcp/tests/test-dhcp-dhclient.c +++ b/src/dhcp/tests/test-dhcp-dhclient.c @@ -863,19 +863,19 @@ test_read_lease_ip4_config_basic (void) /* Address */ g_assert_cmpint (nm_ip4_config_get_num_addresses (config), ==, 1); - g_assert (inet_aton ("192.168.1.180", (struct in_addr *) &expected_addr)); + expected_addr = nmtst_inet4_from_string ("192.168.1.180"); addr = nm_ip4_config_get_address (config, 0); g_assert_cmpint (addr->address, ==, expected_addr); g_assert_cmpint (addr->peer_address, ==, expected_addr); g_assert_cmpint (addr->plen, ==, 24); /* Gateway */ - g_assert (inet_aton ("192.168.1.1", (struct in_addr *) &expected_addr)); + expected_addr = nmtst_inet4_from_string ("192.168.1.1"); g_assert_cmpint (nm_ip4_config_get_gateway (config), ==, expected_addr); /* DNS */ g_assert_cmpint (nm_ip4_config_get_num_nameservers (config), ==, 1); - g_assert (inet_aton ("192.168.1.1", (struct in_addr *) &expected_addr)); + expected_addr = nmtst_inet4_from_string ("192.168.1.1"); g_assert_cmpint (nm_ip4_config_get_nameserver (config, 0), ==, expected_addr); g_assert_cmpint (nm_ip4_config_get_num_domains (config), ==, 0); @@ -886,21 +886,21 @@ test_read_lease_ip4_config_basic (void) /* Address */ g_assert_cmpint (nm_ip4_config_get_num_addresses (config), ==, 1); - g_assert (inet_aton ("10.77.52.141", (struct in_addr *) &expected_addr)); + expected_addr = nmtst_inet4_from_string ("10.77.52.141"); addr = nm_ip4_config_get_address (config, 0); g_assert_cmpint (addr->address, ==, expected_addr); g_assert_cmpint (addr->peer_address, ==, expected_addr); g_assert_cmpint (addr->plen, ==, 8); /* Gateway */ - g_assert (inet_aton ("10.77.52.254", (struct in_addr *) &expected_addr)); + expected_addr = nmtst_inet4_from_string ("10.77.52.254"); g_assert_cmpint (nm_ip4_config_get_gateway (config), ==, expected_addr); /* DNS */ g_assert_cmpint (nm_ip4_config_get_num_nameservers (config), ==, 2); - g_assert (inet_aton ("8.8.8.8", (struct in_addr *) &expected_addr)); + expected_addr = nmtst_inet4_from_string ("8.8.8.8"); g_assert_cmpint (nm_ip4_config_get_nameserver (config, 0), ==, expected_addr); - g_assert (inet_aton ("8.8.4.4", (struct in_addr *) &expected_addr)); + expected_addr = nmtst_inet4_from_string ("8.8.4.4"); g_assert_cmpint (nm_ip4_config_get_nameserver (config, 1), ==, expected_addr); /* Domains */ |