X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=55f52dc8ef570d65168a57153f02ff501e1ce588;hp=0b7ec4107885ffc615a016a8950755085fca59da;hb=74cd69a0fe942e03429582f06969d26d478e54aa;hpb=8b19de666e02f24280728938dd985ecb3673b83e

diff --git a/src/ubus.c b/src/ubus.c
index 0b7ec41..55f52dc 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -160,14 +160,16 @@ enum {
 	IFACE_ATTR_IFNAME,
 	IFACE_ATTR_UP,
 	IFACE_ATTR_DATA,
+	IFACE_ATTR_PREFIX,
 	IFACE_ATTR_MAX,
 };
 
 static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
-	[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+	[IFACE_ATTR_IFNAME] = { .name = "l3_device", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_UP] = { .name = "up", .type = BLOBMSG_TYPE_BOOL },
 	[IFACE_ATTR_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
+	[IFACE_ATTR_PREFIX] = { .name = "ipv6-prefix", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
@@ -184,7 +186,9 @@ static void handle_dump(_unused struct ubus_request *req, _unused int type, stru
 }
 
 
-static struct interface* find_interface(struct blob_attr *msg)
+static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_object *obj,
+		_unused struct ubus_request_data *req, _unused const char *method,
+		struct blob_attr *msg)
 {
 	struct blob_attr *tb[IFACE_ATTR_MAX];
 	blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
@@ -194,20 +198,11 @@ static struct interface* find_interface(struct blob_attr *msg)
 	const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
 			blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
 
-	struct interface *c;
+	struct interface *c, *iface = NULL;
 	list_for_each_entry(c, &interfaces, head)
 		if (!strcmp(interface, c->name) || !strcmp(ifname, c->ifname))
-			return c;
-
-	return NULL;
-}
-
+			iface = c;
 
-static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_object *obj,
-		_unused struct ubus_request_data *req, _unused const char *method,
-		struct blob_attr *msg)
-{
-	struct interface *iface = find_interface(msg);
 	if (iface && iface->ignore)
 		return 0;
 
@@ -227,15 +222,35 @@ static void subscribe_netifd(void)
 void ubus_apply_network(void)
 {
 	struct blob_attr *c;
-	int rem;
+	unsigned rem;
 
 	if (!dump)
 		return;
 
 	blobmsg_for_each_attr(c, dump, rem) {
-		struct interface *iface = find_interface(c);
-		if (!iface || !iface->ignore)
-			config_parse_interface(c, NULL);
+		struct blob_attr *tb[IFACE_ATTR_MAX];
+		blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
+
+		if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_DATA])
+			continue;
+
+		const char *interface = (tb[IFACE_ATTR_INTERFACE]) ?
+				blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]) : "";
+		const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
+				blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
+
+		struct interface *c;
+		list_for_each_entry(c, &interfaces, head) {
+			char *f = memmem(c->upstream, c->upstream_len,
+					interface, strlen(interface) + 1);
+			if (strcmp(interface, c->name) && strcmp(ifname, c->ifname) &&
+					(!f || (f != c->upstream && f[-1] != 0)))
+				continue;
+
+			if (!c || !c->ignore)
+				config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+						blobmsg_data_len(tb[IFACE_ATTR_DATA]), interface, false);
+		}
 	}
 }
 
@@ -275,14 +290,14 @@ static struct ubus_event_handler event_handler = { .cb = handle_event };
 const char* ubus_get_ifname(const char *name)
 {
 	struct blob_attr *c;
-	int rem;
+	unsigned rem;
 
 	if (!dump)
 		return NULL;
 
 	blobmsg_for_each_attr(c, dump, rem) {
 		struct blob_attr *tb[IFACE_ATTR_MAX];
-		blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(c), blob_len(c));
+		blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
 
 		if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
 				blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
@@ -296,6 +311,41 @@ const char* ubus_get_ifname(const char *name)
 }
 
 
+bool ubus_has_prefix(const char *name, const char *ifname)
+{
+	struct blob_attr *c, *cur;
+	unsigned rem;
+
+	if (!dump)
+		return NULL;
+
+	blobmsg_for_each_attr(c, dump, rem) {
+		struct blob_attr *tb[IFACE_ATTR_MAX];
+		blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
+
+		if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_IFNAME])
+			continue;
+
+		if (!strcmp(name, blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])) ||
+				!strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME])))
+			continue;
+
+		if ((cur = tb[IFACE_ATTR_PREFIX])) {
+			if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
+				continue;
+
+			struct blob_attr *d;
+			unsigned drem;
+			blobmsg_for_each_attr(d, cur, drem) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+
 int init_ubus(void)
 {
 	if (!(ubus = ubus_connect(NULL))) {