X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=dbb43a69f6f1cfd73ec807fd71707537f2658deb;hp=bf1d072d5d5bc3fae37ec1e3512ccfbd10541ecb;hb=56c6a4a72a0e086074f69d2ee5cc46079d179dac;hpb=3d5e419ca3214b9e9f1e183b64be049f139a8235

diff --git a/src/ubus.c b/src/ubus.c
index bf1d072..dbb43a6 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -161,6 +161,7 @@ enum {
 	IFACE_ATTR_UP,
 	IFACE_ATTR_DATA,
 	IFACE_ATTR_PREFIX,
+	IFACE_ATTR_ADDRESS,
 	IFACE_ATTR_MAX,
 };
 
@@ -170,6 +171,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[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)
@@ -182,7 +184,7 @@ 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();
 }
 
 
@@ -246,7 +248,7 @@ void ubus_apply_network(void)
 			bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);
 			matched |= cmatched;
 
-			if (!cmatched && (!f || (f != c->upstream && f[-1] != 0)))
+			if (!cmatched && (!c->upstream_len || !f || (f != c->upstream && f[-1] != 0)))
 				continue;
 
 			if (!c->ignore)
@@ -278,7 +280,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;
@@ -332,8 +333,8 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 		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,6 +353,68 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 }
 
 
+enum {
+	ADDR_ATTR_ADDR,
+	ADDR_ATTR_CLASS,
+	ADDR_ATTR_MAX
+};
+
+static const struct blobmsg_policy addr_attrs[ADDR_ATTR_MAX] = {
+	[ADDR_ATTR_ADDR] = { .name = "address", .type = BLOBMSG_TYPE_STRING },
+	[ADDR_ATTR_CLASS] = { .name = "class", .type = BLOBMSG_TYPE_STRING },
+};
+
+bool ubus_get_class(const char *ifname, const struct in6_addr *addr, uint16_t *pclass)
+{
+	struct blob_attr *c, *cur;
+	unsigned rem;
+
+	if (!dump)
+		return false;
+
+	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_IFNAME])
+			continue;
+
+		if (strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME])))
+			continue;
+
+		if ((cur = tb[IFACE_ATTR_ADDRESS])) {
+			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) {
+				struct blob_attr *t[ADDR_ATTR_MAX];
+				blobmsg_parse(addr_attrs, ADDR_ATTR_MAX, t, blobmsg_data(d), blobmsg_data_len(d));
+
+				if (!t[ADDR_ATTR_ADDR] || !t[ADDR_ATTR_CLASS])
+					continue;
+
+				const char *addrs = blobmsg_get_string(t[ADDR_ATTR_ADDR]);
+				const char *class = blobmsg_get_string(t[ADDR_ATTR_CLASS]);
+
+				struct in6_addr ip6addr;
+				inet_pton(AF_INET6, addrs, &ip6addr);
+
+				if (IN6_ARE_ADDR_EQUAL(&ip6addr, addr)) {
+					*pclass = atoi(class);
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	return false;
+}
+
+
 int init_ubus(void)
 {
 	if (!(ubus = ubus_connect(NULL))) {