X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_proto.c;h=7d6e01a95beadb7ff1bd55d7b99d4a70782bb0e4;hp=3c5a2367557c64c979ea811fb2d20a3843107c2e;hb=09cb02f798bc1d7a02fd1d6a348358506ae87f77;hpb=527d2523330cb41e23a435d89352680d108c789a diff --git a/ubusd_proto.c b/ubusd_proto.c index 3c5a236..7d6e01a 100644 --- a/ubusd_proto.c +++ b/ubusd_proto.c @@ -1,13 +1,13 @@ #include #include "ubusd.h" -static struct blob_buf b; +struct blob_buf b; static struct ubus_msg_buf *retmsg; 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 }, @@ -58,23 +58,52 @@ bool ubusd_send_hello(struct ubus_client *cl) return false; ubus_msg_init(ub, UBUS_MSG_HELLO, 0, cl->id.id); - ubus_msg_send(cl, ub); + ubus_msg_send(cl, ub, true); 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)); + ubus_msg_send(cl, ub, false); return 0; } -static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub) +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; - struct blob_attr **attr; - attr = ubus_parse_msg(ub->data); obj = ubusd_create_object(cl, attr); if (!obj) return UBUS_STATUS_INVALID_ARGUMENT; @@ -88,7 +117,7 @@ static int ubusd_handle_publish(struct ubus_client *cl, struct ubus_msg_buf *ub) if (!ub) return UBUS_STATUS_NO_DATA; - ubus_msg_send(cl, ub); + ubus_msg_send(cl, ub, true); return 0; } @@ -102,6 +131,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) @@ -112,19 +142,17 @@ static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru if (!ub) return; - ubus_msg_send(cl, ub); + ubus_msg_send(cl, ub, true); } -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); @@ -163,29 +191,26 @@ 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) +static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr) { struct ubus_object *obj = NULL; - struct blob_attr **attr; + struct ubus_id *id; const char *method; - attr = ubus_parse_msg(ub->data); - if (!attr[UBUS_ATTR_METHOD]) + if (!attr[UBUS_ATTR_METHOD] || !attr[UBUS_ATTR_OBJID]) return UBUS_STATUS_INVALID_ARGUMENT; - if (attr[UBUS_ATTR_OBJID]) { - struct ubus_id *id; - id = ubus_find_id(&objects, blob_get_int32(attr[UBUS_ATTR_OBJID])); - if (id) - obj = container_of(id, struct ubus_object, id); - } else if (attr[UBUS_ATTR_OBJPATH]) { - const char *objpath = blob_data(attr[UBUS_ATTR_OBJPATH]); - obj = avl_find_element(&path, objpath, obj, path); - } - if (!obj) + id = ubus_find_id(&objects, blob_get_u32(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]); + + if (!obj->client) + return obj->recv_msg(cl, method, attr[UBUS_ATTR_DATA]); + blob_buf_init(&b, 0); blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id.id); blob_put_string(&b, UBUS_ATTR_METHOD, method); @@ -201,25 +226,33 @@ static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub) ub->hdr.type = UBUS_MSG_INVOKE; ub->hdr.peer = cl->id.id; - ubus_msg_send(obj->client, ub); + ubus_msg_send(obj->client, ub, true); return -1; } -static int ubusd_handle_status(struct ubus_client *cl, struct ubus_msg_buf *ub) +static int ubusd_handle_response(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr) { - struct blob_attr **attr; + struct ubus_object *obj; + + 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; + + obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID])); + if (!obj) + goto error; - attr = ubus_parse_msg(ub->data); - if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_STATUS]) + 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); + ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]); + ubus_msg_send(cl, ub, true); return -1; error: @@ -229,10 +262,12 @@ error: static const ubus_cmd_cb handlers[__UBUS_MSG_LAST] = { [UBUS_MSG_PING] = ubusd_send_pong, - [UBUS_MSG_PUBLISH] = ubusd_handle_publish, + [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_status, + [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) @@ -247,7 +282,7 @@ 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; @@ -257,7 +292,7 @@ void ubusd_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub) ubus_msg_free(ub); *retmsg_data = htonl(ret); - ubus_msg_send(cl, ubus_msg_ref(retmsg)); + ubus_msg_send(cl, retmsg, false); } static void __init ubusd_proto_init(void)