networkd: IP address equality

[elogind.git] / src / network / test-network.c

diff --git a/src/network/test-network.c b/src/network/test-network.c
index 7a7840ee16500472f731913ed688c407d6da61de..a0e04f8fd2416856a08490b51a20df08561b5f81 100644 (file)
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -21,34 +21,70 @@
 
 #include "networkd.h"
 
-static void test_link(struct udev_device *loopback) {
-        _cleanup_manager_free_ Manager *manager = NULL;
-        _cleanup_link_free_ Link *link = NULL;
-
-        manager_new(&manager);
-
-        assert(link_new(manager, loopback, &link) >= 0);
-        assert(link);
-}
-
-static void test_network_load(Manager *manager) {
+static void test_load_config(Manager *manager) {
 /*  TODO: should_reload, is false if the config dirs do not exist, so
  *        so we can't do this test here, move it to a test for paths_check_timestamps
  *        directly
  *
- *        assert(network_should_reload(manager) == true);
+ *        assert_se(network_should_reload(manager) == true);
 */
-        assert(network_load(manager) >= 0);
-        assert(network_should_reload(manager) == false);
+        assert_se(manager_load_config(manager) >= 0);
+        assert_se(manager_should_reload(manager) == false);
 }
 
 static void test_network_get(Manager *manager, struct udev_device *loopback) {
         Network *network;
+        const struct ether_addr mac = {};
 
         /* let's assume that the test machine does not have a .network file
            that applies to the loopback device... */
-        assert(network_get(manager, loopback, &network) == -ENOENT);
-        assert(!network);
+        assert_se(network_get(manager, loopback, "lo", &mac, &network) == -ENOENT);
+        assert_se(!network);
+}
+
+static void test_address_equality(void) {
+        Address *a1, *a2;
+
+        assert_se(address_new_dynamic(&a1) >= 0);
+        assert_se(address_new_dynamic(&a2) >= 0);
+
+        assert_se(address_equal(NULL, NULL));
+        assert_se(!address_equal(a1, NULL));
+        assert_se(!address_equal(NULL, a2));
+        assert_se(address_equal(a1, a2));
+
+        a1->family = AF_INET;
+        assert_se(!address_equal(a1, a2));
+
+        a2->family = AF_INET;
+        assert_se(address_equal(a1, a2));
+
+        assert_se(inet_pton(AF_INET, "192.168.3.9", &a1->in_addr.in));
+        assert_se(!address_equal(a1, a2));
+        assert_se(inet_pton(AF_INET, "192.168.3.9", &a2->in_addr.in));
+        assert_se(address_equal(a1, a2));
+
+        a1->prefixlen = 10;
+        assert_se(!address_equal(a1, a2));
+        a2->prefixlen = 10;
+        assert_se(address_equal(a1, a2));
+
+        assert_se(inet_pton(AF_INET, "192.168.3.10", &a2->in_addr.in));
+        assert_se(address_equal(a1, a2));
+
+        a1->family = AF_INET6;
+        assert_se(!address_equal(a1, a2));
+
+        a2->family = AF_INET6;
+        assert_se(inet_pton(AF_INET6, "2001:4ca0:4f01::2", &a1->in_addr.in6));
+        assert_se(inet_pton(AF_INET6, "2001:4ca0:4f01::2", &a2->in_addr.in6));
+        assert_se(address_equal(a1, a2));
+
+        a2->prefixlen = 8;
+        assert_se(address_equal(a1, a2));
+
+        assert_se(inet_pton(AF_INET6, "2001:4ca0:4f01::1", &a2->in_addr.in6));
+        assert_se(!address_equal(a1, a2));
 }
 
 int main(void) {
@@ -56,24 +92,24 @@ int main(void) {
         struct udev *udev;
         struct udev_device *loopback;
 
-        assert(manager_new(&manager) >= 0);
+        test_address_equality();
 
-        test_network_load(manager);
+        assert_se(manager_new(&manager) >= 0);
+
+        test_load_config(manager);
 
         udev = udev_new();
-        assert(udev);
+        assert_se(udev);
 
         loopback = udev_device_new_from_syspath(udev, "/sys/class/net/lo");
-        assert(loopback);
-        assert(udev_device_get_ifindex(loopback) == 1);
+        assert_se(loopback);
+        assert_se(udev_device_get_ifindex(loopback) == 1);
 
         test_network_get(manager, loopback);
 
-        test_link(loopback);
-
-        assert(manager_udev_listen(manager) >= 0);
-        assert(manager_udev_enumerate_links(manager) >= 0);
-        assert(manager_rtnl_listen(manager) >= 0);
+        assert_se(manager_udev_listen(manager) >= 0);
+        assert_se(manager_rtnl_listen(manager) >= 0);
+        assert_se(manager_rtnl_enumerate_links(manager) >= 0);
 
         udev_device_unref(loopback);
         udev_unref(udev);