{
struct ubus_object *obj;
char *objpath;
- bool wildcard = false;
bool found = false;
int len;
}
objpath[--len] = 0;
- wildcard = true;
obj = avl_find_ge_element(&path, objpath, obj, path);
if (!obj)
static int ubusd_handle_invoke(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
{
+ struct ubus_msg_buf *ub_new;
struct ubus_object *obj = NULL;
struct ubus_id *id;
const char *method;
blob_put(&b, UBUS_ATTR_DATA, blob_data(attr[UBUS_ATTR_DATA]),
blob_len(attr[UBUS_ATTR_DATA]));
+ ub_new = ubus_reply_from_blob(ub, true);
ubus_msg_free(ub);
+ ub = ub_new;
- ub = ubus_reply_from_blob(ub, true);
if (!ub)
return UBUS_STATUS_NO_DATA;
return -1;
}
+static int ubusd_handle_add_watch(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+ struct ubus_object *obj, *target;
+
+ if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_TARGET] ||
+ !attr[UBUS_ATTR_METHOD]) {
+ return UBUS_STATUS_INVALID_ARGUMENT;
+ }
+
+ obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+ if (!obj)
+ return UBUS_STATUS_NOT_FOUND;
+
+ if (cl != obj->client)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ target = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_TARGET]));
+ if (!target)
+ return UBUS_STATUS_NOT_FOUND;
+
+ if (cl == target->client)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ ubus_subscribe(obj, target, blob_data(attr[UBUS_ATTR_METHOD]));
+ return 0;
+}
+
+static int ubusd_handle_remove_watch(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
+{
+ struct ubus_object *obj;
+ struct ubus_subscription *s;
+ uint32_t id;
+
+ if (!attr[UBUS_ATTR_OBJID] || !attr[UBUS_ATTR_TARGET])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ obj = ubusd_find_object(blob_get_u32(attr[UBUS_ATTR_OBJID]));
+ if (!obj)
+ return UBUS_STATUS_NOT_FOUND;
+
+ if (cl != obj->client)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ id = blob_get_u32(attr[UBUS_ATTR_TARGET]);
+ list_for_each_entry(s, &obj->target_list, target_list) {
+ if (s->target->id.id != id)
+ continue;
+
+ ubus_unsubscribe(s);
+ return 0;
+ }
+
+ return UBUS_STATUS_NOT_FOUND;
+}
+
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_INVOKE] = ubusd_handle_invoke,
[UBUS_MSG_STATUS] = ubusd_handle_response,
[UBUS_MSG_DATA] = ubusd_handle_response,
+ [UBUS_MSG_SUBSCRIBE] = ubusd_handle_add_watch,
+ [UBUS_MSG_UNSUBSCRIBE] = ubusd_handle_remove_watch,
};
void ubusd_proto_receive_message(struct ubus_client *cl, struct ubus_msg_buf *ub)
ubus_free_id(&clients, &cl->id);
}
+void ubus_notify_unsubscribe(struct ubus_subscription *s)
+{
+ struct ubus_msg_buf *ub;
+
+ blob_buf_init(&b, 0);
+ blob_put_int32(&b, UBUS_ATTR_OBJID, s->subscriber->id.id);
+ blob_put_int32(&b, UBUS_ATTR_TARGET, s->target->id.id);
+
+ ub = ubus_msg_from_blob(false);
+ ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0);
+ ubus_msg_send(s->subscriber->client, ub, true);
+
+ ubus_unsubscribe(s);
+}
+
static void __init ubusd_proto_init(void)
{
ubus_init_id_tree(&clients);