X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fubus.c;h=0ef3153b405fd73f837b4d568649e7ade9fd4487;hp=63bfd3c4c395a6c2a807a1a194b35d20ac0b5c43;hb=73850ae66e29b6cebf73a787a639f8400c6c94ab;hpb=cc0763d6edff3ec43a025067f1c8f13a42821a8d

diff --git a/src/ubus.c b/src/ubus.c
index 63bfd3c..0ef3153 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -177,17 +177,6 @@ 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];
@@ -372,7 +361,7 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 	return false;
 }
 
-struct in_addr ubus_get_address4(const char *name)
+const char* ubus_get_address4(const char *name)
 {
 	struct blob_attr *c, *cur;
 	unsigned rem;
@@ -395,11 +384,13 @@ struct in_addr ubus_get_address4(const char *name)
 			struct blob_attr *d;
 			unsigned drem;
 			blobmsg_for_each_attr(d, cur, drem) {
-				struct blob_attr *addr[ADDR_ATTR_MAX];
-				blobmsg_parse(addr_attrs, ADDR_ATTR_MAX, addr, blobmsg_data(d), blobmsg_data_len(d));
-				struct in_addr addr4;
-				if (inet_pton(AF_INET, blobmsg_get_string(addr[ADDR_ATTR_ADDRESS]), &addr4) == 1)
-					return addr4;
+				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);
+				}
 			}
 		}
 	}
@@ -407,13 +398,12 @@ struct in_addr ubus_get_address4(const char *name)
 	return NULL;
 }
 
-struct in_addr ubus_get_mask4(const char *name)
+int ubus_get_mask4(const char *name)
 {
 	struct blob_attr *c, *cur;
 	unsigned rem;
-
 	if (!dump)
-		return NULL;
+		return 0;
 
 	blobmsg_for_each_attr(c, dump, rem) {
 		struct blob_attr *tb[IFACE_ATTR_MAX];
@@ -430,16 +420,18 @@ struct in_addr ubus_get_mask4(const char *name)
 			struct blob_attr *d;
 			unsigned drem;
 			blobmsg_for_each_attr(d, cur, drem) {
-				struct blob_attr *addr[ADDR_ATTR_MAX];
-				blobmsg_parse(addr_attrs, ADDR_ATTR_MAX, addr, blobmsg_data(d), blobmsg_data_len(d));
-				struct in_addr addr4;
-				if (inet_pton(AF_INET, blobmsg_get_string(addr[ADDR_ATTR_MASK]), &addr4) == 1)
-					return addr4;
+				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 NULL;
+	return 0;
 }
 
 int init_ubus(void)