+#include <libubox/blobmsg_json.h>
#include "libubus.h"
+static struct blob_buf b;
+
+static const char *attr_types[] = {
+ [BLOBMSG_TYPE_INT32] = "\"Integer\"",
+ [BLOBMSG_TYPE_STRING] = "\"String\"",
+};
+
+static const char *format_type(void *priv, struct blob_attr *attr)
+{
+ const char *type = NULL;
+ int typeid;
+
+ if (blob_id(attr) != BLOBMSG_TYPE_INT32)
+ return NULL;
+
+ typeid = blobmsg_get_u32(attr);
+ if (typeid < ARRAY_SIZE(attr_types))
+ type = attr_types[typeid];
+ if (!type)
+ type = "\"(unknown)\"";
+
+ return type;
+}
+
static void receive_lookup(struct ubus_context *ctx, struct ubus_object_data *obj, void *priv)
{
struct blob_attr *cur;
return;
blob_for_each_attr(cur, obj->signature, rem) {
- s = blobmsg_format_json(cur, false);
+ s = blobmsg_format_json_with_cb(cur, false, format_type, NULL);
fprintf(stderr, "\t%s\n", s);
free(s);
}
{
static struct ubus_context *ctx;
char *cmd;
- int ret;
+ int ret = 0;
ctx = ubus_connect(NULL);
if (!ctx) {
if (argc < 4 || argc > 5)
return usage(argv[0]);
+ blob_buf_init(&b, 0);
+ if (argc == 5 && !blobmsg_add_json_from_string(&b, argv[4])) {
+ fprintf(stderr, "Failed to parse message data\n");
+ goto out;
+ }
+
ret = ubus_lookup_id(ctx, argv[2], &id);
if (!ret)
- ret = ubus_invoke(ctx, id, argv[3], NULL, receive_data, NULL);
+ ret = ubus_invoke(ctx, id, argv[3], b.head, receive_data, NULL);
} else if (!strcmp(cmd, "listen")) {
ret = ubus_cli_listen(ctx, argc - 2, argv + 2);
} else {
if (ret)
fprintf(stderr, "Failed: %s\n", ubus_strerror(ret));
+out:
ubus_free(ctx);
return ret;
}