make ubusd load the acl on start and HUP

[project/ubus.git] / ubusd_proto.c

diff --git a/ubusd_proto.c b/ubusd_proto.c
index 991a70a8cb21d14ed89439664810e911629d117d..47f81c06ed3e989133a73cd35cf44507c36a99d8 100644 (file)
--- a/ubusd_proto.c
+++ b/ubusd_proto.c
@@ -34,7 +34,7 @@ static const struct blob_attr_info ubus_policy[UBUS_ATTR_MAX] = {
        [UBUS_ATTR_METHOD] = { .type = BLOB_ATTR_STRING },
 };
 
-static struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
+struct blob_attr **ubus_parse_msg(struct blob_attr *msg)
 {
        blob_parse(msg, attrbuf, ubus_policy, UBUS_ATTR_MAX);
        return attrbuf;
@@ -74,8 +74,8 @@ static struct ubus_msg_buf *ubus_reply_from_blob(struct ubus_msg_buf *ub, bool s
        return new;
 }
 
-static void
-ubus_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
+void
+ubus_proto_send_msg_from_blob(struct ubus_client *cl, struct ubus_msg_buf *ub,
                        uint8_t type)
 {
        ub = ubus_reply_from_blob(ub, true);
@@ -129,7 +129,7 @@ static int ubusd_handle_remove_object(struct ubus_client *cl, struct ubus_msg_bu
                blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
        ubusd_free_object(obj);
-       ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+       ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
 
        return 0;
 }
@@ -147,7 +147,7 @@ static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *
        if (attr[UBUS_ATTR_SIGNATURE])
                blob_put_int32(&b, UBUS_ATTR_OBJTYPE, obj->type->id.id);
 
-       ubus_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
+       ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
        return 0;
 }
 
@@ -158,8 +158,7 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
 
        blob_buf_init(&b, 0);
 
-       if (obj->path.key)
-               blob_put_string(&b, UBUS_ATTR_OBJPATH, 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);
 
@@ -224,7 +223,7 @@ ubusd_forward_invoke(struct ubus_object *obj, const char *method,
        if (data)
                blob_put(&b, UBUS_ATTR_DATA, blob_data(data), blob_len(data));
 
-       ubus_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
+       ubus_proto_send_msg_from_blob(obj->client, ub, UBUS_MSG_INVOKE);
 }
 
 static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
@@ -245,7 +244,7 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub,
        method = blob_data(attr[UBUS_ATTR_METHOD]);
 
        if (!obj->client)
-               return obj->recv_msg(cl, method, attr[UBUS_ATTR_DATA]);
+               return obj->recv_msg(cl, ub, method, attr[UBUS_ATTR_DATA]);
 
        ub->hdr.peer = cl->id.id;
        blob_buf_init(&b, 0);
@@ -287,7 +286,7 @@ static int ubusd_handle_notify(struct ubus_client *cl, struct ubus_msg_buf *ub,
                }
                blob_nest_end(&b, c);
                blob_put_int32(&b, UBUS_ATTR_STATUS, 0);
-               ubus_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
+               ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_STATUS);
        }
 
        ub->hdr.peer = cl->id.id;