make ubusd_get_client_by_id static

diff --git a/ubusd.c b/ubusd.c
index 14eb537ca48fc504771276a3513c7ac36c1025e2..a283f597a1c916e4d56aa38cecfc3c0e4554b781 100644 (file)
--- a/ubusd.c
+++ b/ubusd.c
@@ -12,7 +12,7 @@
 
 #include "ubusd.h"
 
-static struct avl_tree clients;
+struct avl_tree clients;
 
 static struct ubus_msg_buf *ubus_msg_unshare(struct ubus_msg_buf *ub)
 {
@@ -249,17 +249,6 @@ disconnect:
        handle_client_disconnect(cl);
 }
 
-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 bool get_next_connection(int fd)
 {
        struct ubus_client *cl;

diff --git a/ubusd.h b/ubusd.h
index 87cc831383022aa605053df95e5e591c9aa28336..4959a91f1d8200ee38cd7e002abad4623fc023ec 100644 (file)
--- a/ubusd.h
+++ b/ubusd.h
@@ -13,6 +13,7 @@
 #define UBUS_OBJ_HASH_BITS     4
 
 extern struct blob_buf b;
+extern struct avl_tree clients;
 
 struct ubus_msg_buf {
        uint32_t refcount; /* ~0: uses external data buffer */
@@ -48,8 +49,6 @@ void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free);
 struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub);
 void ubus_msg_free(struct ubus_msg_buf *ub);
 
-struct ubus_client *ubusd_get_client_by_id(uint32_t id);
-
 void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub);
 bool ubusd_send_hello(struct ubus_client *cl);
 

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 1a675013842d7b047b043aa2ecc62e9aca42f851..57f9a28c9e8911f588b7be19631776970d782fbe 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -231,6 +231,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;