X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=f203fd1d19edcb656bfda12144cd2fdbcc7f2273;hp=f2421cc3f66b23afa892ea1fca7ba79e093ea692;hb=da279866a33682e590428b740b4564a4b2e6f780;hpb=f73f11865e8601a0cb3983a6f2b2beb5ebabd14d

diff --git a/ubus.c b/ubus.c
index f2421cc..f203fd1 100644
--- a/ubus.c
+++ b/ubus.c
@@ -50,12 +50,14 @@ netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj,
 enum {
 	HR_TARGET,
 	HR_V6,
+	HR_INTERFACE,
 	__HR_MAX
 };
 
 static const struct blobmsg_policy route_policy[__HR_MAX] = {
 	[HR_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
 	[HR_V6] = { .name = "v6", .type = BLOBMSG_TYPE_BOOL },
+	[HR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
 };
 
 static int
@@ -64,7 +66,7 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
 		      struct blob_attr *msg)
 {
 	struct blob_attr *tb[__HR_MAX];
-	struct interface *iface;
+	struct interface *iface = NULL;
 	union if_addr a;
 	bool v6 = false;
 
@@ -75,12 +77,15 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
 	if (tb[HR_V6])
 		v6 = blobmsg_get_bool(tb[HR_V6]);
 
+	if (tb[HR_INTERFACE])
+		iface = vlist_find(&interfaces, blobmsg_data(tb[HR_INTERFACE]), iface, node);
+
 	memset(&a, 0, sizeof(a));
 	if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(tb[HR_TARGET]), &a))
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 
-	iface = interface_ip_add_target_route(&a, v6);
+	iface = interface_ip_add_target_route(&a, v6, iface);
 	if (!iface)
 		return UBUS_STATUS_NOT_FOUND;
 
@@ -419,6 +424,9 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
 		if (route->flags & DEVROUTE_METRIC)
 			blobmsg_add_u32(&b, "metric", route->metric);
 
+		if (route->flags & DEVROUTE_TABLE)
+			blobmsg_add_u32(&b, "table", route->table);
+
 		if (route->valid_until)
 			blobmsg_add_u32(&b, "valid", route->valid_until - now);
 
@@ -455,13 +463,21 @@ interface_ip_dump_prefix_list(struct interface_ip_settings *ip)
 		if (prefix->valid_until)
 			blobmsg_add_u32(&b, "valid", prefix->valid_until - now);
 
+		blobmsg_add_string(&b, "class", prefix->pclass);
+
 		c = blobmsg_open_table(&b, "assigned");
 		struct device_prefix_assignment *assign;
-		vlist_for_each_element(prefix->assignments, assign, node) {
+		list_for_each_entry(assign, &prefix->assignments, head) {
+			if (!assign->name[0])
+				continue;
+
+			struct in6_addr addr = prefix->addr;
+			addr.s6_addr32[1] |= htonl(assign->assigned);
+
 			void *d = blobmsg_open_table(&b, assign->name);
 
 			buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
-			inet_ntop(AF_INET6, &assign->addr, buf, buflen);
+			inet_ntop(AF_INET6, &addr, buf, buflen);
 			blobmsg_add_string_buffer(&b);
 
 			blobmsg_add_u32(&b, "mask", assign->length);
@@ -486,14 +502,17 @@ interface_ip_dump_prefix_assignment_list(struct interface *iface)
 	struct device_prefix *prefix;
 	list_for_each_entry(prefix, &prefixes, head) {
 		struct device_prefix_assignment *assign;
-		vlist_for_each_element(prefix->assignments, assign, node) {
+		list_for_each_entry(assign, &prefix->assignments, head) {
 			if (strcmp(assign->name, iface->name))
 				continue;
 
+			struct in6_addr addr = prefix->addr;
+			addr.s6_addr32[1] |= htonl(assign->assigned);
+
 			a = blobmsg_open_table(&b, NULL);
 
 			buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
-			inet_ntop(AF_INET6, &assign->addr, buf, buflen);
+			inet_ntop(AF_INET6, &addr, buf, buflen);
 			blobmsg_add_string_buffer(&b);
 
 			blobmsg_add_u32(&b, "mask", assign->length);