Merge pull request #46 from stargieg/master

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

diff --git a/src/ubus.c b/src/ubus.c
index fbe7e1a..0ef3153 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -163,6 +163,7 @@ enum {
        IFACE_ATTR_DATA,
        IFACE_ATTR_PREFIX,
        IFACE_ATTR_ADDRESS,
+       IFACE_ATTR_ADDRESS4,
        IFACE_ATTR_MAX,
 };
 
@@ -173,6 +174,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [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 },
+       [IFACE_ATTR_ADDRESS4] = { .name = "ipv4-address", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
@@ -359,69 +361,79 @@ bool ubus_has_prefix(const char *name, const char *ifname)
        return false;
 }
 
-
-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)
+const char* ubus_get_address4(const char *name)
 {
        struct blob_attr *c, *cur;
        unsigned rem;
 
        if (!dump)
-               return false;
+               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_IFNAME])
-                       continue;
-
-               if (strcmp(ifname, blobmsg_get_string(tb[IFACE_ATTR_IFNAME])))
+               if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
+                               blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
                        continue;
 
-               if ((cur = tb[IFACE_ATTR_ADDRESS])) {
+               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 *t[ADDR_ATTR_MAX];
-                               blobmsg_parse(addr_attrs, ADDR_ATTR_MAX, t, blobmsg_data(d), blobmsg_data_len(d));
+                               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);
+                               }
+                       }
+               }
+       }
 
-                               if (!t[ADDR_ATTR_ADDR] || !t[ADDR_ATTR_CLASS])
-                                       continue;
+       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));
 
-                               const char *addrs = blobmsg_get_string(t[ADDR_ATTR_ADDR]);
-                               const char *class = blobmsg_get_string(t[ADDR_ATTR_CLASS]);
+               if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
+                               blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
+                       continue;
 
-                               struct in6_addr ip6addr;
-                               inet_pton(AF_INET6, addrs, &ip6addr);
+               if ((cur = tb[IFACE_ATTR_ADDRESS4])) {
+                       if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
+                               continue;
 
-                               if (IN6_ARE_ADDR_EQUAL(&ip6addr, addr)) {
-                                       *pclass = atoi(class);
-                                       return true;
+                       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 false;
        }
 
-       return false;
+       return 0;
 }
 
-
 int init_ubus(void)
 {
        if (!(ubus = ubus_connect(NULL))) {