do not reverse method sorting order

[project/ubus.git] / libubus.h

diff --git a/libubus.h b/libubus.h
index cdcc579..b58a4dc 100644 (file)
--- a/libubus.h
+++ b/libubus.h
@@ -49,7 +49,7 @@ typedef void (*ubus_complete_handler_t)(struct ubus_request *req, int ret);
        }
 
 struct ubus_signature {
-       enum blobmsg_type type;
+       int type;
        const char *name;
 };
 
@@ -145,10 +145,17 @@ static inline void ubus_add_uloop(struct ubus_context *ctx)
        uloop_fd_add(&ctx->sock, ULOOP_EDGE_TRIGGER | ULOOP_BLOCKING | ULOOP_READ);
 }
 
+/* call this for read events on ctx->sock.fd when not using uloop */
+static inline void ubus_handle_event(struct ubus_context *ctx)
+{
+       ctx->sock.cb(&ctx->sock, ULOOP_READ);
+}
+
 /* ----------- raw request handling ----------- */
 
 /* wait for a request to complete and return its status */
-int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req);
+int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
+                         int timeout);
 
 /* complete a request asynchronously */
 void ubus_complete_request_async(struct ubus_context *ctx,
@@ -174,11 +181,12 @@ int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj);
 
 /* invoke a method on a specific object */
 int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
-                struct blob_attr *msg, ubus_data_handler_t cb, void *priv);
+               struct blob_attr *msg, ubus_data_handler_t cb, void *priv,
+               int timeout);
 
 /* asynchronous version of ubus_invoke() */
 int ubus_invoke_async(struct ubus_context *ctx, uint32_t obj, const char *method,
-                      struct blob_attr *msg, struct ubus_request *req);
+                     struct blob_attr *msg, struct ubus_request *req);
 
 /* send a reply to an incoming object method call */
 int ubus_send_reply(struct ubus_context *ctx, struct ubus_request_data *req,