X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.h;h=bab919ff5ff39d9a1beead60e09a10e59e0e763d;hp=49a147a931c3b270fc88a0ce5d252ccd2cdae18a;hb=d2f9e766ffc818610262d44e0cb02b1f73d71a1f;hpb=36b1a80b075203c650a6612f1ef45674210fb7a6 diff --git a/libubus.h b/libubus.h index 49a147a..bab919f 100644 --- a/libubus.h +++ b/libubus.h @@ -12,6 +12,7 @@ struct ubus_object; struct ubus_request; struct ubus_request_data; struct ubus_object_data; +struct ubus_event_handler; typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx, struct ubus_object_data *obj, @@ -19,6 +20,8 @@ typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx, typedef int (*ubus_handler_t)(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg); +typedef void (*ubus_event_handler_t)(struct ubus_context *ctx, struct ubus_event_handler *ev, + const char *type, struct blob_attr *msg); typedef void (*ubus_data_handler_t)(struct ubus_request *req, int type, struct blob_attr *msg); typedef void (*ubus_complete_handler_t)(struct ubus_request *req, int ret); @@ -75,6 +78,12 @@ struct ubus_object { int n_methods; }; +struct ubus_event_handler { + struct ubus_object obj; + + ubus_event_handler_t cb; +}; + struct ubus_context { struct list_head requests; struct avl_tree objects; @@ -125,16 +134,16 @@ struct ubus_request { void *priv; }; -#define BLOBMSG_END_TABLE BLOBMSG_TYPE_UNSPEC struct ubus_context *ubus_connect(const char *path); void ubus_free(struct ubus_context *ctx); const char *ubus_strerror(int error); -/* ----------- helpers for message handling ----------- */ - -struct blob_attr **ubus_parse_msg(struct blob_attr *msg); +static inline void ubus_add_uloop(struct ubus_context *ctx) +{ + uloop_fd_add(&ctx->sock, ULOOP_EDGE_TRIGGER | ULOOP_BLOCKING | ULOOP_READ); +} /* ----------- raw request handling ----------- */ @@ -166,8 +175,13 @@ void ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *metho struct blob_attr *msg, struct ubus_request *req); /* make an object visible to remote connections */ -int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj); +int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj); /* send a reply to an incoming object method call */ int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req, struct blob_attr *msg); + +/* ----------- events ----------- */ +int ubus_register_event_handler(struct ubus_context *ctx, + struct ubus_event_handler *ev, + const char *pattern);