[UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING },
};
-static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
+struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
{
blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
return attrbuf;
return new;
}
-static void
-ubus_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
+void
+ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
uint8_t type)
{
ub = ubus_reply_from_blob(ub, true);
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
ubusd_free_object(obj);
- ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+ ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
return 0;
}
if (attr[UBUS_ATTR_SIGNATURE])
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
- ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+ ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
return 0;
}
blob_buf_init(&b, 0);
- if (obj->path.key)
- blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
+ blob_put_string(&b, UBUS_ATTR_OBJPATH, obj->path.key);
blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
if (data)
blob_put(&b, UBUS_ATTR_DATA, blob_data(data), blob_len(data));
- ubus_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
+ ubus_proto_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
}
static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
method = blob_data(attr[UBUS_ATTR_METHOD]);
if (!obj->client)
- return obj->recv_msg(cl, method, attr[UBUS_ATTR_DATA]);
+ return obj->recv_msg(cl, ub, method, attr[UBUS_ATTR_DATA]);
ub->hdr.peer = cl->id.id;
blob_buf_init(&b, 0);
}
blob_nest_end(&b, c);
blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
- ubus_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
+ ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
}
ub->hdr.peer = cl->id.id;