X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=0b51183f5c9cec3cdd4c2ac6ebc20d9e2cc1e21c;hp=f014eda2e1e805e41b48c56cfe8b5761a5681e8f;hb=01d3f9d64486ac1daa144848944e877e7f0cb762;hpb=a9739e68e7697dc833af0473b37a0632f42d107c;ds=sidebyside

diff --git a/src/ubus.c b/src/ubus.c
index f014eda..0b51183 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -13,6 +13,7 @@ static struct ubus_subscriber netifd;
 static struct blob_buf b;
 static struct blob_attr *dump = NULL;
 static uint32_t objid = 0;
+static struct ubus_request req_dump = { .list = LIST_HEAD_INIT(req_dump.list) };
 
 
 static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_object *obj,
@@ -161,20 +162,22 @@ enum {
 	IFACE_ATTR_UP,
 	IFACE_ATTR_DATA,
 	IFACE_ATTR_PREFIX,
+	IFACE_ATTR_ADDRESS,
 	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 },
+	[IFACE_ATTR_ADDRESS] = { .name = "ipv6-address", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
 {
-	struct blob_attr *tb[DUMP_ATTR_INTERFACE];
+	struct blob_attr *tb[DUMP_ATTR_MAX];
 	blobmsg_parse(dump_attrs, DUMP_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
 
 	if (!tb[DUMP_ATTR_INTERFACE])
@@ -182,7 +185,20 @@ static void handle_dump(_unused struct ubus_request *req, _unused int type, stru
 
 	free(dump);
 	dump = blob_memdup(tb[DUMP_ATTR_INTERFACE]);
-	raise(SIGHUP);
+	odhcpd_reload();
+}
+
+
+static void update_netifd(bool subscribe)
+{
+	if (subscribe)
+		ubus_subscribe(ubus, &netifd, objid);
+
+	ubus_abort_request(ubus, &req_dump);
+	if (!ubus_invoke_async(ubus, objid, "dump", NULL, &req_dump)) {
+		req_dump.data_cb = handle_dump;
+		ubus_complete_request_async(ubus, &req_dump);
+	}
 }
 
 
@@ -206,30 +222,22 @@ static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_o
 	if (iface && iface->ignore)
 		return 0;
 
-	ubus_invoke(ubus, objid, "dump", NULL, handle_dump, NULL, 0);
+	update_netifd(false);
 	return 0;
 }
 
 
-static void subscribe_netifd(void)
-{
-	netifd.cb = handle_update;
-	ubus_subscribe(ubus, &netifd, objid);
-	ubus_invoke(ubus, objid, "dump", NULL, handle_dump, NULL, 0);
-}
-
-
 void ubus_apply_network(void)
 {
-	struct blob_attr *c;
+	struct blob_attr *a;
 	unsigned rem;
 
 	if (!dump)
 		return;
 
-	blobmsg_for_each_attr(c, dump, rem) {
+	blobmsg_for_each_attr(a, 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(a), blobmsg_data_len(a));
 
 		if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_DATA])
 			continue;
@@ -239,17 +247,25 @@ void ubus_apply_network(void)
 		const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
 				blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
 
-		struct interface *c;
-		list_for_each_entry(c, &interfaces, head) {
+		bool matched = false;
+		struct interface *c, *n;
+		list_for_each_entry_safe(c, n, &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)))
+			bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);
+			matched |= cmatched;
+
+			if (!cmatched && (!c->upstream_len || !f || (f != c->upstream && f[-1] != 0)))
 				continue;
 
-			if (!c || !c->ignore)
-				config_parse_interface(tb[IFACE_ATTR_DATA], interface, false);
+			if (!c->ignore)
+				config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+						blobmsg_data_len(tb[IFACE_ATTR_DATA]), c->name, false);
 		}
+
+		if (!matched)
+			config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+					blobmsg_data_len(tb[IFACE_ATTR_DATA]), interface, false);
 	}
 }
 
@@ -271,7 +287,6 @@ static void handle_event(_unused struct ubus_context *ctx, _unused struct ubus_e
 {
 	struct blob_attr *tb[OBJ_ATTR_MAX];
 	blobmsg_parse(obj_attrs, OBJ_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
-	objid = 0;
 
 	if (!tb[OBJ_ATTR_ID] || !tb[OBJ_ATTR_PATH])
 		return;
@@ -280,7 +295,7 @@ static void handle_event(_unused struct ubus_context *ctx, _unused struct ubus_e
 		return;
 
 	objid = blobmsg_get_u32(tb[OBJ_ATTR_ID]);
-	subscribe_netifd();
+	update_netifd(true);
 }
 
 static struct ubus_event_handler event_handler = { .cb = handle_event };
@@ -296,7 +311,7 @@ const char* ubus_get_ifname(const char *name)
 
 	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])))
@@ -320,13 +335,13 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 
 	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] || !tb[IFACE_ATTR_IFNAME])
 			continue;
 
-		if (!strcmp(name, blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])) ||
-				!strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME])))
+		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])) {
@@ -352,11 +367,14 @@ int init_ubus(void)
 		return -1;
 	}
 
+	netifd.cb = handle_update;
+	ubus_register_subscriber(ubus, &netifd);
+
 	ubus_add_uloop(ubus);
 	ubus_add_object(ubus, &main_object);
 	ubus_register_event_handler(ubus, &event_handler, "ubus.object.add");
 	if (!ubus_lookup_id(ubus, "network.interface", &objid))
-		subscribe_netifd();
+		update_netifd(true);
 
 	return 0;
 }