projects
/
project
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f448c0
)
Fix ubus message handling again
author
Steven Barth
<steven@midlink.org>
Tue, 15 Oct 2013 13:17:20 +0000
(15:17 +0200)
committer
Steven Barth
<steven@midlink.org>
Tue, 15 Oct 2013 13:17:20 +0000
(15:17 +0200)
src/ubus.c
patch
|
blob
|
history
diff --git
a/src/ubus.c
b/src/ubus.c
index
dd478a9
..
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];
struct blob_attr *msg)
{
struct blob_attr *tb[IFACE_ATTR_MAX];
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob
msg_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]) : "";
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_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, blob
msg_data(c), blobmsg_data
_len(c));
if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
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_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, blob
msg_data(c), blobmsg_data
_len(c));
if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_IFNAME])
continue;
if (!tb[IFACE_ATTR_INTERFACE] || !tb[IFACE_ATTR_IFNAME])
continue;