From e019e23b37ffece5b6b624824a263083866bc728 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 15 Oct 2013 15:17:20 +0200 Subject: [PATCH] Fix ubus message handling again --- src/ubus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ubus.c b/src/ubus.c index dd478a9..1989510 100644 --- 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, blobmsg_data(msg), blobmsg_data_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]) : ""; @@ -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; -- 2.11.0