X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=e8563bd50d8b1eca4753e25d681bf8fb83c93df3;hp=19bd3afb7aa10766cbac19e50d162595aa899a84;hb=ebbff3872a1f242ef5b0a7c029895848876a54b2;hpb=3ee43ee22302fb38f74454c38710a5937afb74e3

diff --git a/src/ubus.c b/src/ubus.c
index 19bd3af..e8563bd 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -177,6 +177,17 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_ADDRESS4] = { .name = "ipv4-address", .type = BLOBMSG_TYPE_ARRAY },
 };
 
+enum {
+	ADDR_ATTR_ADDRESS,
+	ADDR_ATTR_MASK,
+	ADDR_ATTR_MAX,
+};
+
+static const struct blobmsg_policy addr_attrs[ADDR_ATTR_MAX] = {
+	[ADDR_ATTR_ADDRESS] = { .name = "address", .type = BLOBMSG_TYPE_ARRAY },
+	[ADDR_ATTR_MASK] = { .name = "mask", .type = BLOBMSG_TYPE_INT32 },
+};
+
 static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
 {
 	struct blob_attr *tb[DUMP_ATTR_MAX];
@@ -361,6 +372,78 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 	return false;
 }
 
+const char* ubus_get_address4(const char *name)
+{
+	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] || strcmp(name,
+				blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
+			continue;
+
+		if ((cur = tb[IFACE_ATTR_ADDRESS4])) {
+			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 *ccur;
+				unsigned ddrem;
+				struct blob_attr *dict = blobmsg_data(cur);
+				blobmsg_for_each_attr(ccur, dict, ddrem) {
+					if (!strcmp(blobmsg_name(ccur), "address"))
+						return blobmsg_get_string(ccur);
+				}
+			}
+		}
+	}
+
+	return NULL;
+}
+
+int ubus_get_mask4(const char *name)
+{
+	struct blob_attr *c, *cur;
+	unsigned rem;
+	if (!dump)
+		return 0;
+
+	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] || strcmp(name,
+				blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
+			continue;
+
+		if ((cur = tb[IFACE_ATTR_ADDRESS4])) {
+			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 *ccur;
+				unsigned ddrem;
+				struct blob_attr *dict = blobmsg_data(cur);
+				blobmsg_for_each_attr(ccur, dict, ddrem) {
+					if (!strcmp(blobmsg_name(ccur), "mask"))
+						return blobmsg_get_u32(ccur);
+				}
+			}
+		}
+	}
+
+	return 0;
+}
 
 int init_ubus(void)
 {