Fix ubus message handling again

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

diff --git a/src/ubus.c b/src/ubus.c
index 5b901d2..1989510 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -191,7 +191,7 @@ static int handle_update(_unused struct ubus_context *ctx, _unused struct ubus_o
                struct blob_attr *msg)
 {
        struct blob_attr *tb[IFACE_ATTR_MAX];
-       blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+       blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(msg), blob_data(msg));
 
        const char *interface = (tb[IFACE_ATTR_INTERFACE]) ?
                        blobmsg_get_string(tb[IFACE_ATTR_INTERFACE]) : "";
@@ -229,7 +229,7 @@ void ubus_apply_network(void)
 
        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;
@@ -296,7 +296,7 @@ const char* ubus_get_ifname(const char *name)
 
        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])))
@@ -320,7 +320,7 @@ bool ubus_has_prefix(const char *name, const char *ifname)
 
        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;
                        }