[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];
return false;
}
-struct in_addr ubus_get_address4(const char *name)
+const char* ubus_get_address4(const char *name)
{
- struct blob_attr *c;
+ struct blob_attr *c, *cur;
unsigned rem;
if (!dump)
blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
continue;
- if (tb[IFACE_ATTR_IFNAME]) {
- struct in_addr addr4;
- if (inet_pton(AF_INET, blobmsg_get_string(tb[IFACE_ATTR_ADDRESS4]), &addr4) == 1)
- return addr4;
+ 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;
}
-struct in_addr ubus_get_mask4(const char *name)
+int ubus_get_mask4(const char *name)
{
- struct blob_attr *c;
+ 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];
blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
continue;
- if (tb[IFACE_ATTR_IFNAME]) {
- struct in_addr mask4;
- if (inet_pton(AF_INET, blobmsg_get_string(tb[IFACE_ATTR_MASK4]), &mask4) == 1)
- return mask4;
+ 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 NULL;
+ return 0;
}
int init_ubus(void)