X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus.h;h=94e5f950f7e6f89221dd05dacefd8cf2ba42b20a;hp=99cbbb44701f96621489ce906cfe42b38a58bc61;hb=3e45a782b22c067eab125b377474f5da11eabbe9;hpb=a62e2f8c15a65efb1a82404d8f31e3bfc1cbe7d9 diff --git a/libubus.h b/libubus.h index 99cbbb4..94e5f95 100644 --- a/libubus.h +++ b/libubus.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Felix Fietkau + * Copyright (C) 2011-2014 Felix Fietkau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 2.1 @@ -22,6 +22,8 @@ #include "ubusmsg.h" #include "ubus_common.h" +#define UBUS_MAX_NOTIFY_PEERS 16 + struct ubus_context; struct ubus_msg_src; struct ubus_object; @@ -29,7 +31,13 @@ struct ubus_request; struct ubus_request_data; struct ubus_object_data; struct ubus_event_handler; -struct ubus_watch_object; +struct ubus_subscriber; +struct ubus_notify_request; + +struct ubus_msghdr_buf { + struct ubus_msghdr hdr; + struct blob_attr *data; +}; typedef void (*ubus_lookup_handler_t)(struct ubus_context *ctx, struct ubus_object_data *obj, @@ -37,13 +45,18 @@ 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_state_handler_t)(struct ubus_context *ctx, struct ubus_object *obj); +typedef void (*ubus_remove_handler_t)(struct ubus_context *ctx, + struct ubus_subscriber *obj, uint32_t id); 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_watch_handler_t)(struct ubus_context *ctx, struct ubus_watch_object *w, - uint32_t id); typedef void (*ubus_data_handler_t)(struct ubus_request *req, int type, struct blob_attr *msg); +typedef void (*ubus_fd_handler_t)(struct ubus_request *req, int fd); typedef void (*ubus_complete_handler_t)(struct ubus_request *req, int ret); +typedef void (*ubus_notify_complete_handler_t)(struct ubus_notify_request *req, + int idx, int ret); +typedef void (*ubus_connect_handler_t)(struct ubus_context *ctx); #define UBUS_OBJECT_TYPE(_name, _methods) \ { \ @@ -53,18 +66,32 @@ typedef void (*ubus_complete_handler_t)(struct ubus_request *req, int ret); .methods = _methods \ } +#define __UBUS_METHOD_NOARG(_name, _handler) \ + .name = _name, \ + .handler = _handler + +#define __UBUS_METHOD(_name, _handler, _policy) \ + __UBUS_METHOD_NOARG(_name, _handler), \ + .policy = _policy, \ + .n_policy = ARRAY_SIZE(_policy) + #define UBUS_METHOD(_name, _handler, _policy) \ + { __UBUS_METHOD(_name, _handler, _policy) } + +#define UBUS_METHOD_MASK(_name, _handler, _policy, _mask) \ { \ - .name = _name, \ - .handler = _handler, \ - .policy = _policy, \ - .n_policy = ARRAY_SIZE(_policy) \ + __UBUS_METHOD(_name, _handler, _policy),\ + .mask = _mask \ } +#define UBUS_METHOD_NOARG(_name, _handler) \ + { __UBUS_METHOD_NOARG(_name, _handler) } + struct ubus_method { const char *name; ubus_handler_t handler; + unsigned long mask; const struct blobmsg_policy *policy; int n_policy; }; @@ -86,14 +113,18 @@ struct ubus_object { const char *path; struct ubus_object_type *type; + ubus_state_handler_t subscribe_cb; + bool has_subscribers; + const struct ubus_method *methods; int n_methods; }; -struct ubus_watch_object { +struct ubus_subscriber { struct ubus_object obj; - ubus_watch_handler_t cb; + ubus_handler_t cb; + ubus_remove_handler_t remove_cb; }; struct ubus_event_handler { @@ -108,17 +139,17 @@ struct ubus_context { struct list_head pending; struct uloop_fd sock; + struct uloop_timeout pending_timer; uint32_t local_id; - uint32_t request_seq; + uint16_t request_seq; int stack_depth; void (*connection_lost)(struct ubus_context *ctx); - struct { - struct ubus_msghdr hdr; - char data[UBUS_MAX_MSGLEN]; - } msgbuf; + struct ubus_msghdr_buf msgbuf; + uint32_t msgbuf_data_len; + int msgbuf_reduction_counter; }; struct ubus_object_data { @@ -131,31 +162,54 @@ struct ubus_object_data { struct ubus_request_data { uint32_t object; uint32_t peer; - uint32_t seq; + uint16_t seq; + + /* internal use */ + bool deferred; + int fd; }; struct ubus_request { struct list_head list; struct list_head pending; - bool status_msg; int status_code; + bool status_msg; bool blocked; bool cancelled; + bool notify; uint32_t peer; - uint32_t seq; + uint16_t seq; ubus_data_handler_t raw_data_cb; ubus_data_handler_t data_cb; + ubus_fd_handler_t fd_cb; ubus_complete_handler_t complete_cb; struct ubus_context *ctx; void *priv; }; +struct ubus_notify_request { + struct ubus_request req; + + ubus_notify_complete_handler_t status_cb; + ubus_notify_complete_handler_t complete_cb; + + uint32_t pending; + uint32_t id[UBUS_MAX_NOTIFY_PEERS + 1]; +}; + +struct ubus_auto_conn { + struct ubus_context ctx; + struct uloop_timeout timer; + const char *path; + ubus_connect_handler_t cb; +}; struct ubus_context *ubus_connect(const char *path); +void ubus_auto_connect(struct ubus_auto_conn *conn); int ubus_reconnect(struct ubus_context *ctx, const char *path); void ubus_free(struct ubus_context *ctx); @@ -198,12 +252,17 @@ int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj); /* remove the object from the ubus connection */ int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj); -/* add an object for watching other object state changes */ -int ubus_register_watch_object(struct ubus_context *ctx, struct ubus_watch_object *obj); +/* add a subscriber notifications from another object */ +int ubus_register_subscriber(struct ubus_context *ctx, struct ubus_subscriber *obj); -int ubus_watch_object_add(struct ubus_context *ctx, struct ubus_watch_object *obj, uint32_t id); +static inline int +ubus_unregister_subscriber(struct ubus_context *ctx, struct ubus_subscriber *obj) +{ + return ubus_remove_object(ctx, &obj->obj); +} -int ubus_watch_object_remove(struct ubus_context *ctx, struct ubus_watch_object *obj, uint32_t id); +int ubus_subscribe(struct ubus_context *ctx, struct ubus_subscriber *obj, uint32_t id); +int ubus_unsubscribe(struct ubus_context *ctx, struct ubus_subscriber *obj, uint32_t id); /* ----------- rpc ----------- */ @@ -220,6 +279,35 @@ int ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req, struct blob_attr *msg); +static inline void ubus_defer_request(struct ubus_context *ctx, + struct ubus_request_data *req, + struct ubus_request_data *new_req) +{ + memcpy(new_req, req, sizeof(*req)); + req->deferred = true; +} + +static inline void ubus_request_set_fd(struct ubus_context *ctx, + struct ubus_request_data *req, int fd) +{ + req->fd = fd; +} + +void ubus_complete_deferred_request(struct ubus_context *ctx, + struct ubus_request_data *req, int ret); + +/* + * send a notification to all subscribers of an object + * if timeout < 0, no reply is expected from subscribers + */ +int ubus_notify(struct ubus_context *ctx, struct ubus_object *obj, + const char *type, struct blob_attr *msg, int timeout); + +int ubus_notify_async(struct ubus_context *ctx, struct ubus_object *obj, + const char *type, struct blob_attr *msg, + struct ubus_notify_request *req); + + /* ----------- events ----------- */ int ubus_send_event(struct ubus_context *ctx, const char *id,