networkd: introduce an AddressFamilyBoolean enum type

[elogind.git] / src / network / networkd-manager.c

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index e2190b591e9e3a40f1e237ac3cb81f737ee7bb44..42b51137ef0c2872b1941a8b2033f91579ac6e6d 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -236,22 +236,33 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
         assert(message);
         assert(m);
 
         assert(message);
         assert(m);
 

+        if (sd_rtnl_message_is_error(message)) {
+                r = sd_rtnl_message_get_errno(message);
+                if (r < 0)
+                        log_warning_errno(r, "rtnl: could not receive link: %m");
+
+                return 0;
+        }
+

         r = sd_rtnl_message_get_type(message, &type);
         if (r < 0) {
         r = sd_rtnl_message_get_type(message, &type);
         if (r < 0) {

-                log_warning("rtnl: could not get message type");
+                log_warning_errno(r, "rtnl: could not get message type: %m");

                 return 0;
         }
 
         r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
                 return 0;
         }
 
         r = sd_rtnl_message_link_get_ifindex(message, &ifindex);

-        if (r < 0 || ifindex <= 0) {
-                log_warning("rtnl: received link message without valid ifindex");
+        if (r < 0) {
+                log_warning_errno(r, "rtnl: could not get ifindex: %m");
+                return 0;
+        } else if (ifindex <= 0) {
+                log_warning("rtnl: received link message with invalid ifindex: %d", ifindex);

                 return 0;
         } else
                 link_get(m, ifindex, &link);
 
         r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name);
                 return 0;
         } else
                 link_get(m, ifindex, &link);
 
         r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name);

-        if (r < 0 || !name) {
-                log_warning("rtnl: received link message without valid ifname");
+        if (r < 0) {
+                log_warning_errno(r, "rtnl: received link message without ifname: %m");

                 return 0;
         } else
                 netdev_get(m, name, &netdev);
                 return 0;
         } else
                 netdev_get(m, name, &netdev);


@@ -262,8 +273,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
                         /* link is new, so add it */
                         r = link_add(m, message, &link);
                         if (r < 0) {
                         /* link is new, so add it */
                         r = link_add(m, message, &link);
                         if (r < 0) {

-                                log_debug("could not add new link: %s",
-                                           strerror(-r));
+                                log_warning_errno(r, "could not add new link: %m");

                                 return 0;
                         }
                 }
                                 return 0;
                         }
                 }


@@ -272,7 +282,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
                         /* netdev exists, so make sure the ifindex matches */
                         r = netdev_set_ifindex(netdev, message);
                         if (r < 0) {
                         /* netdev exists, so make sure the ifindex matches */
                         r = netdev_set_ifindex(netdev, message);
                         if (r < 0) {

-                                log_debug("could not set ifindex on netdev");
+                                log_warning_errno(r, "could not set ifindex on netdev: %m");

                                 return 0;
                         }
                 }
                                 return 0;
                         }
                 }


@@ -299,7 +309,7 @@ static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
 int manager_rtnl_enumerate_links(Manager *m) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
         sd_rtnl_message *link;
 int manager_rtnl_enumerate_links(Manager *m) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
         sd_rtnl_message *link;

-        int r, k;
+        int r;

 
         assert(m);
         assert(m->rtnl);
 
         assert(m);
         assert(m->rtnl);


@@ -317,16 +327,40 @@ int manager_rtnl_enumerate_links(Manager *m) {
                 return r;
 
         for (link = reply; link; link = sd_rtnl_message_next(link)) {
                 return r;
 
         for (link = reply; link; link = sd_rtnl_message_next(link)) {

-                uint16_t type;
+                int k;

 
 

-                k = sd_rtnl_message_get_type(link, &type);
+                k = manager_rtnl_process_link(m->rtnl, link, m);

                 if (k < 0)
                 if (k < 0)

-                        return k;
+                        r = k;
+        }

 
 

-                if (type != RTM_NEWLINK)
-                        continue;
+        return r;
+}

 
 

-                k = manager_rtnl_process_link(m->rtnl, link, m);
+int manager_rtnl_enumerate_addresses(Manager *m) {
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
+        sd_rtnl_message *addr;
+        int r;
+
+        assert(m);
+        assert(m->rtnl);
+
+        r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, 0, 0);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_message_request_dump(req, true);
+        if (r < 0)
+                return r;
+
+        r = sd_rtnl_call(m->rtnl, req, 0, &reply);
+        if (r < 0)
+                return r;
+
+        for (addr = reply; addr; addr = sd_rtnl_message_next(addr)) {
+                int k;
+
+                k = link_rtnl_process_address(m->rtnl, addr, m);

                 if (k < 0)
                         r = k;
         }
                 if (k < 0)
                         r = k;
         }


@@ -356,10 +390,8 @@ int manager_udev_listen(Manager *m) {
         assert(m->udev_monitor);
 
         r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL);
         assert(m->udev_monitor);
 
         r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL);

-        if (r < 0) {
-                log_error_errno(-r, "Could not add udev monitor filter: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Could not add udev monitor filter: %m");

 
         r = udev_monitor_enable_receiving(m->udev_monitor);
         if (r < 0) {
 
         r = udev_monitor_enable_receiving(m->udev_monitor);
         if (r < 0) {


@@ -597,7 +629,7 @@ int manager_save(Manager *m) {
         return 0;
 
 fail:
         return 0;
 
 fail:

-        log_error_errno(-r, "Failed to save network state to %s: %m", m->state_file);
+        log_error_errno(r, "Failed to save network state to %s: %m", m->state_file);

         unlink(m->state_file);
         unlink(temp_path);
         return r;
         unlink(m->state_file);
         unlink(temp_path);
         return r;


@@ -622,3 +654,35 @@ int manager_address_pool_acquire(Manager *m, int family, unsigned prefixlen, uni
 
         return 0;
 }
 
         return 0;
 }

+
+const char *address_family_boolean_to_string(AddressFamilyBoolean b) {
+        if (b == ADDRESS_FAMILY_YES ||
+            b == ADDRESS_FAMILY_NO)
+                return yes_no(b == ADDRESS_FAMILY_YES);
+
+        if (b == ADDRESS_FAMILY_IPV4)
+                return "ipv4";
+        if (b == ADDRESS_FAMILY_IPV6)
+                return "ipv6";
+
+        return NULL;
+}
+
+AddressFamilyBoolean address_family_boolean_from_string(const char *s) {
+        int r;
+
+        /* Make this a true superset of a boolean */
+
+        r = parse_boolean(s);
+        if (r > 0)
+                return ADDRESS_FAMILY_YES;
+        if (r == 0)
+                return ADDRESS_FAMILY_NO;
+
+        if (streq(s, "ipv4"))
+                return ADDRESS_FAMILY_IPV4;
+        if (streq(s, "ipv6"))
+                return ADDRESS_FAMILY_IPV6;
+
+        return _ADDRESS_FAMILY_BOOLEAN_INVALID;
+}