remove some duplication

[project/ubus.git] / ubusd_proto.c

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 550e116..ff2725b 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -1,9 +1,10 @@
 #include <arpa/inet.h>
 #include "ubusd.h"
 
-static struct blob_buf b;
+struct blob_buf b;
 static struct ubus_msg_buf *retmsg;
 static int *retmsg_data;
+static struct avl_tree clients;
 
 static struct blob_attr *attrbuf[UBUS_ATTR_MAX];
 
@@ -17,7 +18,7 @@ static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
        [UBUS_ATTR_STATUS] = { .type = BLOB_ATTR_INT32 },
 };
 
-struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
+static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
 {
        blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
        return attrbuf;
@@ -40,7 +41,7 @@ static struct ubus_msg_buf *ubus_reply_from_blob(struct ubus_msg_buf *ub, bool s
 {
        struct ubus_msg_buf *new;
 
-       new = ubus_msg_new(b.head, blob_raw_len(b.head), shared);
+       new = ubus_msg_from_blob(shared);
        if (!new)
                return NULL;
 
@@ -48,7 +49,7 @@ static struct ubus_msg_buf *ubus_reply_from_blob(struct ubus_msg_buf *ub, bool s
        return new;
 }
 
-bool ubusd_send_hello(struct ubus_client *cl)
+static bool ubusd_send_hello(struct ubus_client *cl)
 {
        struct ubus_msg_buf *ub;
 
@@ -69,6 +70,37 @@ static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
        return 0;
 }
 
+static int ubusd_handle_remove_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+       struct ubus_object *obj;
+
+       if (!attr[UBUS_ATTR_OBJID])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+       if (!obj)
+               return UBUS_STATUS_NOT_FOUND;
+
+       if (obj->client != cl)
+               return UBUS_STATUS_PERMISSION_DENIED;
+
+       blob_buf_init(&b, 0);
+       blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id);
+
+       /* check if we're removing the object type as well */
+       if (obj->type && obj->type->refcount == 1)
+               blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
+
+       ubusd_free_object(obj);
+
+       ub = ubus_reply_from_blob(ub, true);
+       if (!ub)
+               return UBUS_STATUS_NO_DATA;
+
+       ubus_msg_send(cl, ub, true);
+       return 0;
+}
+
 static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
        struct ubus_object *obj;
@@ -169,7 +201,7 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
        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]));
+       id = ubus_find_id(&objects, blob_get_u32(attr[UBUS_ATTR_OBJID]));
        if (!id)
                return UBUS_STATUS_NOT_FOUND;
 
@@ -200,6 +232,17 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
        return -1;
 }
 
+static struct ubus_client *ubusd_get_client_by_id(uint32_t id)
+{
+       struct ubus_id *clid;
+
+       clid = ubus_find_id(&clients, id);
+       if (!clid)
+               return NULL;
+
+       return container_of(clid, struct ubus_client, id);
+}
+
 static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
 {
        struct ubus_object *obj;
@@ -209,7 +252,7 @@ static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub
            (ub->hdr.type == UBUS_MSG_DATA && !attr[UBUS_ATTR_DATA]))
                goto error;
 
-       obj = ubusd_find_object(blob_get_int32(attr[UBUS_ATTR_OBJID]));
+       obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
        if (!obj)
                goto error;
 
@@ -220,7 +263,7 @@ static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub
        if (!cl)
                goto error;
 
-       ub->hdr.peer = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+       ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
        ubus_msg_send(cl, ub, true);
        return -1;
 
@@ -232,13 +275,14 @@ error:
 static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
        [UBUS_MSG_PING] = ubusd_send_pong,
        [UBUS_MSG_ADD_OBJECT] = ubusd_handle_add_object,
+       [UBUS_MSG_REMOVE_OBJECT] = ubusd_handle_remove_object,
        [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)
+void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
 {
        ubus_cmd_cb cb = NULL;
        int ret;
@@ -263,8 +307,49 @@ void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
        ubus_msg_send(cl, retmsg, false);
 }
 
+struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
+{
+       struct ubus_client *cl;
+
+       cl = calloc(1, sizeof(*cl));
+       if (!cl)
+               return NULL;
+
+       INIT_LIST_HEAD(&cl->objects);
+       cl->sock.fd = fd;
+       cl->sock.cb = cb;
+
+       if (!ubus_alloc_id(&clients, &cl->id, 0))
+               goto free;
+
+       if (!ubusd_send_hello(cl))
+               goto delete;
+
+       return cl;
+
+delete:
+       ubus_free_id(&clients, &cl->id);
+free:
+       free(cl);
+       return NULL;
+}
+
+void ubusd_proto_free_client(struct ubus_client *cl)
+{
+       struct ubus_object *obj;
+
+       while (!list_empty(&cl->objects)) {
+               obj = list_first_entry(&cl->objects, struct ubus_object, list);
+               ubusd_free_object(obj);
+       }
+
+       ubus_free_id(&clients, &cl->id);
+}
+
 static void __init ubusd_proto_init(void)
 {
+       ubus_init_id_tree(&clients);
+
        blob_buf_init(&b, 0);
        blob_put_int32(&b, UBUS_ATTR_STATUS, 0);