remove an obsolete define

[project/ubus.git] / ubusd_proto.c

diff --git a/ubusd_proto.c b/ubusd_proto.c
index a202ace..1b3216f 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -7,12 +7,14 @@ static int *retmsg_data;
 
 static struct blob_attr *attrbuf[UBUS_ATTR_MAX];
 
-typedef int (*ubus_cmd_cb)(struct ubus_client *cl, struct ubus_msg_buf *ub);
+typedef int (*ubus_cmd_cb)(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr);
 
 static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
        [UBUS_ATTR_SIGNATURE] = { .type = BLOB_ATTR_NESTED },
        [UBUS_ATTR_OBJTYPE] = { .type = BLOB_ATTR_INT32 },
        [UBUS_ATTR_OBJPATH] = { .type = BLOB_ATTR_STRING },
+       [UBUS_ATTR_OBJID] = { .type = BLOB_ATTR_INT32 },
+       [UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
 };
 
 struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
@@ -60,19 +62,17 @@ bool ubusd_send_hello(struct ubus_client *cl)
        return true;
 }
 
-static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
        ub->hdr.type = UBUS_MSG_DATA;
        ubus_msg_send(cl, ubus_msg_ref(ub));
        return 0;
 }
 
-static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
        struct ubus_object *obj;
-       struct blob_attr **attr;
 
-       attr = ubus_parse_msg(ub->data);
        obj = ubusd_create_object(cl, attr);
        if (!obj)
                return UBUS_STATUS_INVALID_ARGUMENT;
@@ -100,6 +100,7 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
        if (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);
 
        s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
        list_for_each_entry(m, &obj->type->methods, list)
@@ -113,16 +114,14 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
        ubus_msg_send(cl, ub);
 }
 
-static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub)
+static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
        struct ubus_object *obj;
-       struct blob_attr **attr;
        char *objpath;
        bool wildcard = false;
        bool found = false;
        int len;
 
-       attr = ubus_parse_msg(ub->data);
        if (!attr[UBUS_ATTR_OBJPATH]) {
                avl_for_each_element(&path, obj, path)
                        ubusd_send_obj(cl, ub, obj);
@@ -161,10 +160,80 @@ static int ubusd_handle_lookup(struct ubus_client *cl, struct ubus_msg_buf *ub)
        return 0;
 }
 
+static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+       struct ubus_object *obj = NULL;
+       struct ubus_id *id;
+       const char *method;
+
+       if (!attr[UBUS_ATTR_METHOD] || !attr[UBUS_ATTR_OBJID])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       id = ubus_find_id(&objects, blob_get_int32(attr[UBUS_ATTR_OBJID]));
+       if (!id)
+               return UBUS_STATUS_NOT_FOUND;
+
+       obj = container_of(id, struct ubus_object, id);
+
+       method = blob_data(attr[UBUS_ATTR_METHOD]);
+       blob_buf_init(&b, 0);
+       blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
+       blob_put_string(&b, UBUS_ATTR_METHOD, method);
+       if (attr[UBUS_ATTR_DATA])
+               blob_put(&b, UBUS_ATTR_DATA, blob_data(attr[UBUS_ATTR_DATA]),
+                        blob_len(attr[UBUS_ATTR_DATA]));
+
+       ubus_msg_free(ub);
+
+       ub = ubus_reply_from_blob(ub, true);
+       if (!ub)
+               return UBUS_STATUS_NO_DATA;
+
+       ub->hdr.type = UBUS_MSG_INVOKE;
+       ub->hdr.peer = cl->id.id;
+       ubus_msg_send(obj->client, ub);
+
+       return -1;
+}
+
+static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+       struct ubus_object *obj;
+       struct ubus_id *id;
+
+       if (!attr[UBUS_ATTR_OBJID] ||
+           (ub->hdr.type == UBUS_MSG_STATUS && !attr[UBUS_ATTR_STATUS]) ||
+           (ub->hdr.type == UBUS_MSG_DATA && !attr[UBUS_ATTR_DATA]))
+               goto error;
+
+       id = ubus_find_id(&objects, blob_get_int32(attr[UBUS_ATTR_OBJID]));
+       if (!id)
+               goto error;
+
+       obj = container_of(id, struct ubus_object, id);
+       if (cl != obj->client)
+               goto error;
+
+       cl = ubusd_get_client_by_id(ub->hdr.peer);
+       if (!cl)
+               goto error;
+
+       ub->hdr.peer = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+       ubus_msg_send(cl, ub);
+       return -1;
+
+error:
+       ubus_msg_free(ub);
+       return -1;
+}
+
 static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
        [UBUS_MSG_PING] = ubusd_send_pong,
        [UBUS_MSG_PUBLISH] = ubusd_handle_publish,
        [UBUS_MSG_LOOKUP] = ubusd_handle_lookup,
+       [UBUS_MSG_INVOKE] = ubusd_handle_invoke,
+       [UBUS_MSG_STATUS] = ubusd_handle_response,
+       [UBUS_MSG_DATA] = ubusd_handle_response,
 };
 
 void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
@@ -179,10 +248,13 @@ void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
                cb = handlers[ub->hdr.type];
 
        if (cb)
-               ret = cb(cl, ub);
+               ret = cb(cl, ub, ubus_parse_msg(ub->data));
        else
                ret = UBUS_STATUS_INVALID_COMMAND;
 
+       if (ret == -1)
+               return;
+
        ubus_msg_free(ub);
 
        *retmsg_data = htonl(ret);