networkd: add dbus interface for lease raw options (#3528)

Add a dbus object to represent dhcp leases and their raw options (i.e.
options 224-254).

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 532557ed6c5e628859b4e52b3d80ff6b0ba851b8..10ec08351a44bd717c65ce21e2cdd64704d072a9 100644 (file)
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -23,6 +23,7 @@
 #include "networkd.h"
 #include "parse-util.h"
 #include "strv.h"
+#include "dhcp-lease-internal.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_administrative_state, link_state, LinkState);
@@ -36,6 +37,50 @@ const sd_bus_vtable link_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
+static int get_private_options(sd_bus *bus,
+                       const char *path,
+                       const char *interface,
+                       const char *property,
+                       sd_bus_message *reply,
+                       void *userdata,
+                       sd_bus_error *error) {
+        sd_dhcp_lease *lease = userdata;
+        struct sd_dhcp_raw_option *option = NULL;
+        int r;
+
+        assert(bus);
+        assert(reply);
+        assert(lease);
+
+        r = sd_bus_message_open_container(reply, SD_BUS_TYPE_ARRAY, "{yay}");
+        if (r < 0)
+                return r;
+
+        LIST_FOREACH(options, option, lease->private_options) {
+                r = sd_bus_message_open_container(reply, SD_BUS_TYPE_DICT_ENTRY, "yay");
+                if (r < 0)
+                        return r;
+                r = sd_bus_message_append(reply, "y", option->tag);
+                if (r < 0)
+                        return r;
+                r = sd_bus_message_append_array(reply, 'y', option->data, option->length);
+                if (r < 0)
+                        return r;
+                r = sd_bus_message_close_container(reply);
+                if (r < 0)
+                        return r;
+        }
+        return sd_bus_message_close_container(reply);
+}
+
+const sd_bus_vtable lease_vtable[] = {
+        SD_BUS_VTABLE_START(0),
+
+        SD_BUS_PROPERTY("PrivateOptions", "a{yay}", get_private_options, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+
+        SD_BUS_VTABLE_END
+};
+
 static char *link_bus_path(Link *link) {
         _cleanup_free_ char *ifindex = NULL;
         char *p;
@@ -54,6 +99,24 @@ static char *link_bus_path(Link *link) {
         return p;
 }
 
+static char *lease_bus_path(Link *link) {
+        _cleanup_free_ char *p = NULL;
+        char *ret = NULL;
+        int r;
+
+        assert(link);
+
+        p = link_bus_path(link);
+        if (!p)
+                return NULL;
+
+        r = sd_bus_path_encode(p, "lease", &ret);
+        if (r < 0)
+                return NULL;
+
+        return ret;
+}
+
 int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
         _cleanup_strv_free_ char **l = NULL;
         Manager *m = userdata;
@@ -87,6 +150,42 @@ int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
         return 1;
 }
 
+int lease_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
+        _cleanup_strv_free_ char **l = NULL;
+        Manager *m = userdata;
+        unsigned c = 0;
+        Link *link;
+        Iterator i;
+
+        assert(bus);
+        assert(path);
+        assert(m);
+        assert(nodes);
+
+        l = new0(char*, hashmap_size(m->links) + 1);
+        if (!l)
+                return -ENOMEM;
+
+        HASHMAP_FOREACH(link, m->links, i) {
+                char *p;
+
+                if (!link->dhcp_lease)
+                        continue;
+
+                p = lease_bus_path(link);
+                if (!p)
+                        return -ENOMEM;
+
+                l[c++] = p;
+        }
+
+        l[c] = NULL;
+        *nodes = l;
+        l = NULL;
+
+        return 1;
+}
+
 int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
         _cleanup_free_ char *identifier = NULL;
         Manager *m = userdata;
@@ -116,6 +215,38 @@ int link_object_find(sd_bus *bus, const char *path, const char *interface, void
         return 1;
 }
 
+int lease_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
+        _cleanup_free_ char *identifier = NULL;
+        Manager *m = userdata;
+        Link *link;
+        int ifindex, r;
+
+        assert(bus);
+        assert(path);
+        assert(interface);
+        assert(m);
+        assert(found);
+
+        r = sd_bus_path_decode_many(path, "/org/freedesktop/network1/link/%/lease", &identifier);
+        if (r <= 0)
+                return 0;
+
+        r = parse_ifindex(identifier, &ifindex);
+        if (r < 0)
+                return 0;
+
+        r = link_get(m, ifindex, &link);
+        if (r < 0)
+                return 0;
+
+        if (!link->dhcp_lease)
+                return 0;
+
+        *found = link->dhcp_lease;
+
+        return 1;
+}
+
 int link_send_changed(Link *link, const char *property, ...) {
         _cleanup_free_ char *p = NULL;
         char **l;

diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 77f72d070e3d74e539d0f6760126be21fe41257b..1178999bb4164d9b1c1f47de2135342d497ebe66 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -179,6 +179,11 @@ int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
 int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
 int link_send_changed(Link *link, const char *property, ...) _sentinel_;
 
+extern const sd_bus_vtable lease_vtable[];
+
+int lease_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
+int lease_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
+
 DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref);
 #define _cleanup_link_unref_ _cleanup_(link_unrefp)
 

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 9174dcc7f48c7f868ae325fdba8b867b395fb27a..0ad34e0cc2c4797587d018bef15491dfd1eea243 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -176,6 +176,14 @@ int manager_connect_bus(Manager *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to add link enumerator: %m");
 
+        r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/network1/link", "org.freedesktop.network1.Link.Lease", lease_vtable, lease_object_find, m);
+        if (r < 0)
+               return log_error_errno(r, "Failed to add lease object vtable: %m");
+
+        r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/network1/link", lease_node_enumerator, m);
+        if (r < 0)
+                return log_error_errno(r, "Failed to add lease enumerator: %m");
+
         r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/network1/network", "org.freedesktop.network1.Network", network_vtable, network_object_find, m);
         if (r < 0)
                return log_error_errno(r, "Failed to add network object vtable: %m");