X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=e549d9c4e839fb5122b25e7bc2b65e501f26d189;hp=438b08ca502fc3ffe1a2b3d762c3535af01f3052;hb=ed984c7aea436999c38cc40c5ebaf98bd8294df4;hpb=b7abfa09bd4c3ecb8936244dcfe0fc720a0e03ee

diff --git a/ubus.c b/ubus.c
index 438b08c..e549d9c 100644
--- a/ubus.c
+++ b/ubus.c
@@ -25,7 +25,6 @@
 
 static struct ubus_context *ctx = NULL;
 static struct blob_buf b;
-static struct netifd_fd ubus_fd;
 static const char *ubus_path;
 
 /* global object */
@@ -92,10 +91,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 =
@@ -188,9 +200,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 =
@@ -207,8 +257,7 @@ static void
 netifd_ubus_add_fd(void)
 {
 	ubus_add_uloop(ctx);
-	ubus_fd.fd = ctx->sock.fd;
-	netifd_fd_add(&ubus_fd);
+	system_fd_set_cloexec(ctx->sock.fd);
 }
 
 static void
@@ -232,7 +281,6 @@ netifd_ubus_reconnect_timer(struct uloop_timeout *timeout)
 static void
 netifd_ubus_connection_lost(struct ubus_context *ctx)
 {
-	netifd_fd_delete(&ubus_fd);
 	netifd_ubus_reconnect_timer(NULL);
 }
 
@@ -325,7 +373,8 @@ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
 }
 
 static void
-interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6)
+interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6,
+                               bool enabled)
 {
 	struct device_addr *addr;
 	char *buf;
@@ -334,6 +383,9 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6)
 	int af;
 
 	vlist_for_each_element(&ip->addr, addr, node) {
+		if (addr->enabled != enabled)
+			continue;
+
 		if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
 			af = AF_INET;
 		else
@@ -355,7 +407,7 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6)
 }
 
 static void
-interface_ip_dump_route_list(struct interface_ip_settings *ip)
+interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
 {
 	struct device_route *route;
 	int buflen = 128;
@@ -364,6 +416,9 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip)
 	int af;
 
 	vlist_for_each_element(&ip->route, route, node) {
+		if (route->enabled != enabled)
+			continue;
+
 		if ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
 			af = AF_INET;
 		else
@@ -381,18 +436,81 @@ 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_close_table(&b, r);
 	}
 }
 
+
+static void
+interface_ip_dump_prefix_list(struct interface_ip_settings *ip)
+{
+	struct device_prefix *prefix;
+	char *buf;
+	void *a, *c;
+	const int buflen = INET6_ADDRSTRLEN;
+
+	vlist_for_each_element(&ip->prefix, prefix, node) {
+		a = blobmsg_open_table(&b, NULL);
+
+		buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
+		inet_ntop(AF_INET6, &prefix->addr, buf, buflen);
+		blobmsg_add_string_buffer(&b);
+
+		blobmsg_add_u32(&b, "mask", prefix->length);
+
+		time_t now = system_get_rtime();
+		if (prefix->preferred_until) {
+			int preferred = prefix->preferred_until - now;
+			if (preferred < 0)
+				preferred = 0;
+			blobmsg_add_u32(&b, "preferred", preferred);
+		}
+
+		if (prefix->valid_until) {
+			int valid = prefix->valid_until - now;
+			if (valid < 0)
+				valid = 0;
+			blobmsg_add_u32(&b, "valid", valid);
+		}
+
+		c = blobmsg_open_table(&b, "assigned");
+		struct device_prefix_assignment *assign;
+		vlist_for_each_element(prefix->assignments, assign, node) {
+			void *d = blobmsg_open_table(&b, assign->name);
+
+			buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
+			inet_ntop(AF_INET6, &assign->addr, buf, buflen);
+			blobmsg_add_string_buffer(&b);
+
+			blobmsg_add_u32(&b, "mask", assign->length);
+
+			blobmsg_close_table(&b, d);
+		}
+		blobmsg_close_table(&b, c);
+
+		blobmsg_close_table(&b, a);
+	}
+}
+
+
 static void
-interface_ip_dump_dns_server_list(struct interface_ip_settings *ip)
+interface_ip_dump_dns_server_list(struct interface_ip_settings *ip,
+                                  bool enabled)
 {
 	struct dns_server *dns;
 	int buflen = 128;
 	char *buf;
 
 	vlist_simple_for_each_element(&ip->dns_servers, dns, node) {
+		if (ip->no_dns == enabled)
+			continue;
+
 		buf = blobmsg_alloc_string_buffer(&b, NULL, buflen);
 		inet_ntop(dns->af, &dns->addr, buf, buflen);
 		blobmsg_add_string_buffer(&b);
@@ -400,11 +518,15 @@ interface_ip_dump_dns_server_list(struct interface_ip_settings *ip)
 }
 
 static void
-interface_ip_dump_dns_search_list(struct interface_ip_settings *ip)
+interface_ip_dump_dns_search_list(struct interface_ip_settings *ip,
+                                  bool enabled)
 {
 	struct dns_search_domain *dns;
 
 	vlist_simple_for_each_element(&ip->dns_search, dns, node) {
+		if (ip->no_dns == enabled)
+			continue;
+
 		blobmsg_add_string(&b, NULL, dns->name);
 	}
 }
@@ -417,7 +539,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
 	struct interface *iface;
 	struct interface_data *data;
 	struct device *dev;
-	void *a;
+	void *a, *inactive;
 
 	iface = container_of(obj, struct interface, ubus);
 
@@ -437,30 +559,59 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
 		blobmsg_add_string(&b, "proto", iface->proto_handler->name);
 
 	dev = iface->main_dev.dev;
-	if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
+	if (dev && !dev->hidden &&
+	    !(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);
+		interface_ip_dump_address_list(&iface->config_ip, false, true);
+		interface_ip_dump_address_list(&iface->proto_ip, false, true);
 		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);
+		interface_ip_dump_address_list(&iface->config_ip, true, true);
+		interface_ip_dump_address_list(&iface->proto_ip, true, true);
+		blobmsg_close_array(&b, a);
+		a = blobmsg_open_array(&b, "ipv6-prefix");
+		interface_ip_dump_prefix_list(&iface->config_ip);
+		interface_ip_dump_prefix_list(&iface->proto_ip);
 		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);
+		interface_ip_dump_route_list(&iface->config_ip, true);
+		interface_ip_dump_route_list(&iface->proto_ip, true);
 		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);
+		interface_ip_dump_dns_server_list(&iface->config_ip, true);
+		interface_ip_dump_dns_server_list(&iface->proto_ip, true);
 		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);
+		interface_ip_dump_dns_search_list(&iface->config_ip, true);
+		interface_ip_dump_dns_search_list(&iface->proto_ip, true);
+		blobmsg_close_array(&b, a);
+
+		inactive = blobmsg_open_table(&b, "inactive");
+		a = blobmsg_open_array(&b, "ipv4-address");
+		interface_ip_dump_address_list(&iface->config_ip, false, false);
+		interface_ip_dump_address_list(&iface->proto_ip, false, false);
+		blobmsg_close_array(&b, a);
+		a = blobmsg_open_array(&b, "ipv6-address");
+		interface_ip_dump_address_list(&iface->config_ip, true, false);
+		interface_ip_dump_address_list(&iface->proto_ip, true, false);
+		blobmsg_close_array(&b, a);
+		a = blobmsg_open_array(&b, "route");
+		interface_ip_dump_route_list(&iface->config_ip, false);
+		interface_ip_dump_route_list(&iface->proto_ip, false);
 		blobmsg_close_array(&b, a);
+		a = blobmsg_open_array(&b, "dns-server");
+		interface_ip_dump_dns_server_list(&iface->config_ip, false);
+		interface_ip_dump_dns_server_list(&iface->proto_ip, false);
+		blobmsg_close_array(&b, a);
+		a = blobmsg_open_array(&b, "dns-search");
+		interface_ip_dump_dns_search_list(&iface->config_ip, false);
+		interface_ip_dump_dns_search_list(&iface->proto_ip, false);
+		blobmsg_close_array(&b, a);
+		blobmsg_close_table(&b, inactive);
 	}
 
 	a = blobmsg_open_table(&b, "data");
@@ -498,14 +649,23 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 	device_lock();
 
 	dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
-	if (add && !dev)
-		return UBUS_STATUS_NOT_FOUND;
+	if (!dev) {
+		ret = UBUS_STATUS_NOT_FOUND;
+		goto out;
+	}
 
-	if (add)
-		return interface_add_link(iface, dev);
-	else
-		return interface_remove_link(iface, dev);
+	if (add) {
+		device_set_present(dev, true);
+		if (iface->device_config)
+			device_set_config(dev, &simple_device_type, iface->config);
 
+		system_if_apply_settings(dev, &dev->settings);
+		ret = interface_add_link(iface, dev);
+	} else {
+		ret = interface_remove_link(iface, dev);
+	}
+
+out:
 	device_unlock();
 
 	return ret;
@@ -624,8 +784,7 @@ netifd_ubus_add_interface(struct interface *iface)
 	struct ubus_object *obj = &iface->ubus;
 	char *name = NULL;
 
-	asprintf(&name, "%s.interface.%s", main_object.name, iface->name);
-	if (!name)
+	if (asprintf(&name, "%s.interface.%s", main_object.name, iface->name) == -1)
 		return;
 
 	obj->name = name;