ifname should be l3_device

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

diff --git a/src/ubus.c b/src/ubus.c
index 41d538a..bfa052e 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -166,7 +166,7 @@ enum {
 
 static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
-       [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_IFNAME] = { .name = "l3_device", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_UP] = { .name = "up", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
        [IFACE_ATTR_PREFIX] = { .name = "ipv6-prefix", .type = BLOBMSG_TYPE_ARRAY },
@@ -222,14 +222,14 @@ static void subscribe_netifd(void)
 void ubus_apply_network(void)
 {
        struct blob_attr *c;
-       int rem;
+       unsigned rem;
 
        if (!dump)
                return;
 
        blobmsg_for_each_attr(c, dump, rem) {
                struct blob_attr *tb[IFACE_ATTR_MAX];
-               blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(c), blob_len(c));
+               blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
 
                if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_DATA])
                        continue;
@@ -289,14 +289,14 @@ static struct ubus_event_handler event_handler = { .cb = handle_event };
 const char* ubus_get_ifname(const char *name)
 {
        struct blob_attr *c;
-       int rem;
+       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, blob_data(c), blob_len(c));
+               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])))
@@ -313,14 +313,14 @@ const char* ubus_get_ifname(const char *name)
 bool ubus_has_prefix(const char *name, const char *ifname)
 {
        struct blob_attr *c, *cur;
-       int rem;
+       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, blob_data(c), blob_len(c));
+               blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
 
                if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_IFNAME])
                        continue;
@@ -334,7 +334,7 @@ bool ubus_has_prefix(const char *name, const char *ifname)
                                continue;
 
                        struct blob_attr *d;
-                       int drem;
+                       unsigned drem;
                        blobmsg_for_each_attr(d, cur, drem) {
                                return true;
                        }