add copyright/license information

[project/ubus.git] / ubusd_proto.c

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 57f9a28..902eb0f 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -1,9 +1,23 @@
+/*
+ * Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include <arpa/inet.h>
 #include "ubusd.h"
 
 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];
 
@@ -40,7 +54,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 +62,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;
 
@@ -281,7 +295,7 @@ static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = {
        [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;
@@ -306,8 +320,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);