static struct ubus_context *ctx = NULL;
static struct blob_buf b;
static struct netifd_fd ubus_fd;
+static const char *ubus_path;
/* global object */
return 0;
}
+static int
+netifd_get_proto_handlers(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ blob_buf_init(&b, 0);
+ proto_dump_handlers(&b);
+ ubus_send_reply(ctx, req, b.head);
+
+ return 0;
+}
+
static struct ubus_method main_object_methods[] = {
{ .name = "restart", .handler = netifd_handle_restart },
{ .name = "reload", .handler = netifd_handle_reload },
UBUS_METHOD("add_host_route", netifd_add_host_route, route_policy),
+ { .name = "get_proto_handlers", .handler = netifd_get_proto_handlers },
};
static struct ubus_object_type main_object_type =
.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)
blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
}
+ if (iface->proto_handler)
+ blobmsg_add_string(&b, "proto", iface->proto_handler->name);
+
dev = iface->main_dev.dev;
if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
blobmsg_add_string(&b, "device", dev->ifname);