dhcpv4: add for_each ipv4-address array in ubus_get_address4 ubus_get_mask4 function

[project/odhcpd.git] / src / ubus.c

diff --git a/src/ubus.c b/src/ubus.c
index 19bd3af..63bfd3c 100644 (file)
--- 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 },
 };
 
        [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];
 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,75 @@ bool ubus_has_prefix(const char *name, const char *ifname)
        return false;
 }
 
        return false;
 }
 

+struct in_addr 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 *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;
+                       }
+               }
+       }
+
+       return NULL;
+}
+
+struct in_addr ubus_get_mask4(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 *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;
+                       }
+               }
+       }
+
+       return NULL;
+}

 
 int init_ubus(void)
 {
 
 int init_ubus(void)
 {