diff options
Diffstat (limited to 'src/tests/test-ip4-config.c')
| -rw-r--r-- | src/tests/test-ip4-config.c | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index 3eee5f13..657f7e05 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -18,11 +18,14 @@ * */ +#include "config.h" + #include <glib.h> #include <string.h> #include <arpa/inet.h> #include "nm-ip4-config.h" +#include "nm-platform.h" static void addr_init (NMPlatformIP4Address *a, const char *addr, const char *peer, guint plen) @@ -138,7 +141,7 @@ test_subtract (void) nm_ip4_config_add_wins (dst, expected_wins); nm_ip4_config_set_mss (dst, expected_mss); - nm_ip4_config_set_mtu (dst, expected_mtu); + nm_ip4_config_set_mtu (dst, expected_mtu, NM_IP_CONFIG_SOURCE_UNKNOWN); nm_ip4_config_subtract (dst, src); @@ -193,18 +196,18 @@ test_compare_with_source (void) /* Address */ addr_init (&addr, "1.2.3.4", NULL, 24); - addr.source = NM_PLATFORM_SOURCE_USER; + addr.source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_address (a, &addr); - addr.source = NM_PLATFORM_SOURCE_VPN; + addr.source = NM_IP_CONFIG_SOURCE_VPN; nm_ip4_config_add_address (b, &addr); /* Route */ route_new (&route, "10.0.0.0", 8, "192.168.1.1"); - route.source = NM_PLATFORM_SOURCE_USER; + route.source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_route (a, &route); - route.source = NM_PLATFORM_SOURCE_VPN; + route.source = NM_IP_CONFIG_SOURCE_VPN; nm_ip4_config_add_route (b, &route); /* Assert that the configs are basically the same, eg that the source is ignored */ @@ -225,31 +228,31 @@ test_add_address_with_source (void) /* Test that a higher priority source is not overwritten */ addr_init (&addr, "1.2.3.4", NULL, 24); - addr.source = NM_PLATFORM_SOURCE_USER; + addr.source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_address (a, &addr); test_addr = nm_ip4_config_get_address (a, 0); - g_assert_cmpint (test_addr->source, ==, NM_PLATFORM_SOURCE_USER); + g_assert_cmpint (test_addr->source, ==, NM_IP_CONFIG_SOURCE_USER); - addr.source = NM_PLATFORM_SOURCE_VPN; + addr.source = NM_IP_CONFIG_SOURCE_VPN; nm_ip4_config_add_address (a, &addr); test_addr = nm_ip4_config_get_address (a, 0); - g_assert_cmpint (test_addr->source, ==, NM_PLATFORM_SOURCE_USER); + g_assert_cmpint (test_addr->source, ==, NM_IP_CONFIG_SOURCE_USER); /* Test that a lower priority address source is overwritten */ nm_ip4_config_del_address (a, 0); - addr.source = NM_PLATFORM_SOURCE_KERNEL; + addr.source = NM_IP_CONFIG_SOURCE_KERNEL; nm_ip4_config_add_address (a, &addr); test_addr = nm_ip4_config_get_address (a, 0); - g_assert_cmpint (test_addr->source, ==, NM_PLATFORM_SOURCE_KERNEL); + g_assert_cmpint (test_addr->source, ==, NM_IP_CONFIG_SOURCE_KERNEL); - addr.source = NM_PLATFORM_SOURCE_USER; + addr.source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_address (a, &addr); test_addr = nm_ip4_config_get_address (a, 0); - g_assert_cmpint (test_addr->source, ==, NM_PLATFORM_SOURCE_USER); + g_assert_cmpint (test_addr->source, ==, NM_IP_CONFIG_SOURCE_USER); g_object_unref (a); } @@ -265,31 +268,31 @@ test_add_route_with_source (void) /* Test that a higher priority source is not overwritten */ route_new (&route, "1.2.3.4", 24, "1.2.3.1"); - route.source = NM_PLATFORM_SOURCE_USER; + route.source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_route (a, &route); test_route = nm_ip4_config_get_route (a, 0); - g_assert_cmpint (test_route->source, ==, NM_PLATFORM_SOURCE_USER); + g_assert_cmpint (test_route->source, ==, NM_IP_CONFIG_SOURCE_USER); - route.source = NM_PLATFORM_SOURCE_VPN; + route.source = NM_IP_CONFIG_SOURCE_VPN; nm_ip4_config_add_route (a, &route); test_route = nm_ip4_config_get_route (a, 0); - g_assert_cmpint (test_route->source, ==, NM_PLATFORM_SOURCE_USER); + g_assert_cmpint (test_route->source, ==, NM_IP_CONFIG_SOURCE_USER); /* Test that a lower priority address source is overwritten */ nm_ip4_config_del_route (a, 0); - route.source = NM_PLATFORM_SOURCE_KERNEL; + route.source = NM_IP_CONFIG_SOURCE_KERNEL; nm_ip4_config_add_route (a, &route); test_route = nm_ip4_config_get_route (a, 0); - g_assert_cmpint (test_route->source, ==, NM_PLATFORM_SOURCE_KERNEL); + g_assert_cmpint (test_route->source, ==, NM_IP_CONFIG_SOURCE_KERNEL); - route.source = NM_PLATFORM_SOURCE_USER; + route.source = NM_IP_CONFIG_SOURCE_USER; nm_ip4_config_add_route (a, &route); test_route = nm_ip4_config_get_route (a, 0); - g_assert_cmpint (test_route->source, ==, NM_PLATFORM_SOURCE_USER); + g_assert_cmpint (test_route->source, ==, NM_IP_CONFIG_SOURCE_USER); g_object_unref (a); } @@ -309,9 +312,9 @@ test_merge_subtract_mss_mtu (void) /* add MSS, MTU to configs to test them */ nm_ip4_config_set_mss (cfg2, expected_mss2); - nm_ip4_config_set_mtu (cfg2, expected_mtu2); + nm_ip4_config_set_mtu (cfg2, expected_mtu2, NM_IP_CONFIG_SOURCE_UNKNOWN); nm_ip4_config_set_mss (cfg3, expected_mss3); - nm_ip4_config_set_mtu (cfg3, expected_mtu3); + nm_ip4_config_set_mtu (cfg3, expected_mtu3, NM_IP_CONFIG_SOURCE_UNKNOWN); nm_ip4_config_merge (cfg1, cfg2); /* ensure MSS and MTU are in cfg1 */ |