netifd: reconnect to ubus if the connection is lost

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index e4b2ee2..b31bc25 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -26,6 +26,7 @@
 static struct ubus_context *ctx = NULL;
 static struct blob_buf b;
 static struct netifd_fd ubus_fd;
+static const char *ubus_path;
 
 /* global object */
 
@@ -202,20 +203,54 @@ static struct ubus_object dev_object = {
        .n_methods = ARRAY_SIZE(dev_object_methods),
 };
 
+static void
+netifd_ubus_add_fd(void)
+{
+       ubus_add_uloop(ctx);
+       ubus_fd.fd = ctx->sock.fd;
+       netifd_fd_add(&ubus_fd);
+}
+
+static void
+netifd_ubus_reconnect_timer(struct uloop_timeout *timeout)
+{
+       static struct uloop_timeout retry = {
+               .cb = netifd_ubus_reconnect_timer,
+       };
+       int t = 2;
+
+       if (ubus_reconnect(ctx, ubus_path) != 0) {
+               DPRINTF("failed to reconnect, trying again in %d seconds\n", t);
+               uloop_timeout_set(&retry, t * 1000);
+               return;
+       }
+
+       DPRINTF("reconnected to ubus, new id: %08x\n", ctx->local_id);
+       netifd_ubus_add_fd();
+}
+
+static void
+netifd_ubus_connection_lost(struct ubus_context *ctx)
+{
+       netifd_fd_delete(&ubus_fd);
+       netifd_ubus_reconnect_timer(NULL);
+}
+
 int
 netifd_ubus_init(const char *path)
 {
        int ret;
 
+       uloop_init();
+       ubus_path = path;
+
        ctx = ubus_connect(path);
        if (!ctx)
                return -EIO;
 
        DPRINTF("connected as %08x\n", ctx->local_id);
-       uloop_init();
-       ubus_add_uloop(ctx);
-       ubus_fd.fd = ctx->sock.fd;
-       netifd_fd_add(&ubus_fd);
+       ctx->connection_lost = netifd_ubus_connection_lost;
+       netifd_ubus_add_fd();
 
        ret = ubus_add_object(ctx, &main_object);
        if (ret)
@@ -290,7 +325,7 @@ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
 }
 
 static void
-interface_ip_dump_address_list(struct interface_ip_settings *ip)
+interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6)
 {
        struct device_addr *addr;
        char *buf;
@@ -304,6 +339,9 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip)
                else
                        af = AF_INET6;
 
+               if (af != (v6 ? AF_INET6 : AF_INET))
+                       continue;
+
                a = blobmsg_open_table(&b, NULL);
 
                buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
@@ -320,8 +358,8 @@ static void
 interface_ip_dump_route_list(struct interface_ip_settings *ip)
 {
        struct device_route *route;
-       static char *buf;
        int buflen = 128;
+       char *buf;
        void *r;
        int af;
 
@@ -347,6 +385,30 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip)
        }
 }
 
+static void
+interface_ip_dump_dns_server_list(struct interface_ip_settings *ip)
+{
+       struct dns_server *dns;
+       int buflen = 128;
+       char *buf;
+
+       vlist_simple_for_each_element(&ip->dns_servers, dns, node) {
+               buf = blobmsg_alloc_string_buffer(&b, NULL, buflen);
+               inet_ntop(dns->af, &dns->addr, buf, buflen);
+               blobmsg_add_string_buffer(&b);
+       }
+}
+
+static void
+interface_ip_dump_dns_search_list(struct interface_ip_settings *ip)
+{
+       struct dns_search_domain *dns;
+
+       vlist_simple_for_each_element(&ip->dns_search, dns, node) {
+               blobmsg_add_string(&b, NULL, dns->name);
+       }
+}
+
 static int
 netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
                     struct ubus_request_data *req, const char *method,
@@ -376,14 +438,26 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
                blobmsg_add_string(&b, "device", dev->ifname);
 
        if (iface->state == IFS_UP) {
-               a = blobmsg_open_array(&b, "address");
-               interface_ip_dump_address_list(&iface->config_ip);
-               interface_ip_dump_address_list(&iface->proto_ip);
+               a = blobmsg_open_array(&b, "ipv4-address");
+               interface_ip_dump_address_list(&iface->config_ip, false);
+               interface_ip_dump_address_list(&iface->proto_ip, false);
+               blobmsg_close_array(&b, a);
+               a = blobmsg_open_array(&b, "ipv6-address");
+               interface_ip_dump_address_list(&iface->config_ip, true);
+               interface_ip_dump_address_list(&iface->proto_ip, true);
                blobmsg_close_array(&b, a);
                a = blobmsg_open_array(&b, "route");
                interface_ip_dump_route_list(&iface->config_ip);
                interface_ip_dump_route_list(&iface->proto_ip);
                blobmsg_close_array(&b, a);
+               a = blobmsg_open_array(&b, "dns-server");
+               interface_ip_dump_dns_server_list(&iface->config_ip);
+               interface_ip_dump_dns_server_list(&iface->proto_ip);
+               blobmsg_close_array(&b, a);
+               a = blobmsg_open_array(&b, "dns-search");
+               interface_ip_dump_dns_search_list(&iface->config_ip);
+               interface_ip_dump_dns_search_list(&iface->proto_ip);
+               blobmsg_close_array(&b, a);
        }
 
        a = blobmsg_open_table(&b, "data");