X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=2f0019c9a6c2585df2a474fd16a141050ccc6a46;hp=5e51d3ebb0c372285ccade3854e94e9a32465f9c;hb=4b284038e226b4deace501eae66c67737c7f324c;hpb=e7ac4074bf497cd19e38adbb49e2b3eb275eeb05

diff --git a/ubus.c b/ubus.c
index 5e51d3e..2f0019c 100644
--- 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 */
 
@@ -91,10 +92,23 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
 	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 =
@@ -187,9 +201,47 @@ error:
 	return UBUS_STATUS_INVALID_ARGUMENT;
 }
 
+enum {
+	DEV_STATE_NAME,
+	DEV_STATE_DEFER,
+	__DEV_STATE_MAX,
+};
+
+static const struct blobmsg_policy dev_state_policy[__DEV_STATE_MAX] = {
+	[DEV_STATE_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+	[DEV_STATE_DEFER] = { .name = "defer", .type = BLOBMSG_TYPE_BOOL },
+};
+
+static int
+netifd_handle_set_state(struct ubus_context *ctx, struct ubus_object *obj,
+			struct ubus_request_data *req, const char *method,
+			struct blob_attr *msg)
+{
+	struct device *dev = NULL;
+	struct blob_attr *tb[__DEV_STATE_MAX];
+	struct blob_attr *cur;
+
+	blobmsg_parse(dev_state_policy, __DEV_STATE_MAX, tb, blob_data(msg), blob_len(msg));
+
+	cur = tb[DEV_STATE_NAME];
+	if (!cur)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	dev = device_get(blobmsg_data(cur), false);
+	if (!dev)
+		return UBUS_STATUS_NOT_FOUND;
+
+	cur = tb[DEV_STATE_DEFER];
+	if (cur)
+		device_set_deferred(dev, !!blobmsg_get_u8(cur));
+
+	return 0;
+}
+
 static struct ubus_method dev_object_methods[] = {
 	UBUS_METHOD("status", netifd_dev_status, dev_policy),
 	UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
+	UBUS_METHOD("set_state", netifd_handle_set_state, dev_state_policy),
 };
 
 static struct ubus_object_type dev_object_type =
@@ -202,20 +254,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)
@@ -346,6 +432,14 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip)
 		inet_ntop(af, &route->nexthop, buf, buflen);
 		blobmsg_add_string_buffer(&b);
 
+		if (route->flags & DEVROUTE_MTU)
+			blobmsg_add_u32(&b, "mtu", route->mtu);
+
+		if (route->flags & DEVROUTE_METRIC)
+			blobmsg_add_u32(&b, "metric", route->metric);
+
+		blobmsg_add_u8(&b, "enabled", route->enabled);
+
 		blobmsg_close_table(&b, r);
 	}
 }
@@ -398,11 +492,15 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
 		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);
 
 	if (iface->state == IFS_UP) {
+		blobmsg_add_u32(&b, "metric", iface->metric);
 		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);