X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=libubus-req.c;h=2197f2a9fdd997183a3f641653be5e071d5af478;hp=7378a92405fe3d757536195351ecf2a22d519b6d;hb=e59b44573423ad608d0752b46a6073222db9ed45;hpb=bbd3fbc9cc914abfca9030253c0f2a68e1144c85

diff --git a/libubus-req.c b/libubus-req.c
index 7378a92..2197f2a 100644
--- a/libubus-req.c
+++ b/libubus-req.c
@@ -153,6 +153,7 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
 			timeout = time_end - get_time_msec();
 			if (timeout <= 0) {
 				ubus_set_req_status(req, UBUS_STATUS_TIMEOUT);
+				uloop_cancelled = cancelled;
 				break;
 			}
 		}
@@ -171,9 +172,13 @@ int ubus_complete_request(struct ubus_context *ctx, struct ubus_request *req,
 	if (req->complete_cb)
 		req->complete_cb(req, status);
 
-	if (!registered)
+	if (!registered) {
 		uloop_fd_delete(&ctx->sock);
 
+		if (!ctx->stack_depth)
+			ctx->pending_timer.cb(&ctx->pending_timer);
+	}
+
 	return status;
 }
 
@@ -220,8 +225,12 @@ int ubus_invoke(struct ubus_context *ctx, uint32_t obj, const char *method,
 		int timeout)
 {
 	struct ubus_request req;
+	int rc;
+
+	rc = ubus_invoke_async(ctx, obj, method, msg, &req);
+	if (rc)
+		return rc;
 
-	ubus_invoke_async(ctx, obj, method, msg, &req);
 	req.data_cb = cb;
 	req.priv = priv;
 	return ubus_complete_request(ctx, &req, timeout);
@@ -293,9 +302,9 @@ int ubus_notify(struct ubus_context *ctx, struct ubus_object *obj,
 	return ubus_complete_request(ctx, &req.req, timeout);
 }
 
-static bool ubus_get_status(struct ubus_msghdr *hdr, int *ret)
+static bool ubus_get_status(struct ubus_msghdr_buf *buf, int *ret)
 {
-	struct blob_attr **attrbuf = ubus_parse_msg(ubus_msghdr_data(hdr));
+	struct blob_attr **attrbuf = ubus_parse_msg(buf->data);
 
 	if (!attrbuf[UBUS_ATTR_STATUS])
 		return false;
@@ -305,27 +314,26 @@ static bool ubus_get_status(struct ubus_msghdr *hdr, int *ret)
 }
 
 static int
-ubus_process_req_status(struct ubus_request *req, struct ubus_msghdr *hdr)
+ubus_process_req_status(struct ubus_request *req, struct ubus_msghdr_buf *buf)
 {
 	int ret = UBUS_STATUS_INVALID_ARGUMENT;
 
-	ubus_get_status(hdr, &ret);
-	req->peer = hdr->peer;
+	ubus_get_status(buf, &ret);
+	req->peer = buf->hdr.peer;
 	ubus_set_req_status(req, ret);
 
 	return ret;
 }
 
 static void
-ubus_process_req_data(struct ubus_request *req, struct ubus_msghdr *hdr)
+ubus_process_req_data(struct ubus_request *req, struct ubus_msghdr_buf *buf)
 {
-	struct blob_attr *msg_data = ubus_msghdr_data(hdr);
 	struct ubus_pending_data *data;
 	int len;
 
 	if (!req->blocked) {
 		req->blocked = true;
-		req_data_cb(req, hdr->type, msg_data);
+		req_data_cb(req, buf->hdr.type, buf->data);
 		__ubus_process_req_data(req);
 		req->blocked = false;
 
@@ -335,13 +343,13 @@ ubus_process_req_data(struct ubus_request *req, struct ubus_msghdr *hdr)
 		return;
 	}
 
-	len = blob_raw_len(msg_data);
+	len = blob_raw_len(buf->data);
 	data = calloc(1, sizeof(*data) + len);
 	if (!data)
 		return;
 
-	data->type = hdr->type;
-	memcpy(data->data, msg_data, len);
+	data->type = buf->hdr.type;
+	memcpy(data->data, buf->data, len);
 	list_add(&data->list, &req->pending);
 }
 
@@ -389,7 +397,7 @@ ubus_find_request(struct ubus_context *ctx, uint32_t seq, uint32_t peer, int *id
 	return NULL;
 }
 
-static void ubus_process_notify_status(struct ubus_request *req, int id, struct ubus_msghdr *hdr)
+static void ubus_process_notify_status(struct ubus_request *req, int id, struct ubus_msghdr_buf *buf)
 {
 	struct ubus_notify_request *nreq;
 	struct blob_attr **tb;
@@ -402,7 +410,7 @@ static void ubus_process_notify_status(struct ubus_request *req, int id, struct
 
 	if (!id) {
 		/* first id: ubusd's status message with a list of ids */
-		tb = ubus_parse_msg(ubus_msghdr_data(hdr));
+		tb = ubus_parse_msg(buf->data);
 		if (tb[UBUS_ATTR_SUBSCRIBERS]) {
 			blob_for_each_attr(cur, tb[UBUS_ATTR_SUBSCRIBERS], rem) {
 				if (!blob_check_type(blob_data(cur), blob_len(cur), BLOB_ATTR_INT32))
@@ -417,7 +425,7 @@ static void ubus_process_notify_status(struct ubus_request *req, int id, struct
 			}
 		}
 	} else {
-		ubus_get_status(hdr, &ret);
+		ubus_get_status(buf, &ret);
 		if (nreq->status_cb)
 			nreq->status_cb(nreq, id, ret);
 	}
@@ -426,8 +434,9 @@ static void ubus_process_notify_status(struct ubus_request *req, int id, struct
 		ubus_set_req_status(req, 0);
 }
 
-void __hidden ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr, int fd)
+void __hidden ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr_buf *buf, int fd)
 {
+	struct ubus_msghdr *hdr = &buf->hdr;
 	struct ubus_request *req;
 	int id = -1;
 
@@ -445,15 +454,15 @@ void __hidden ubus_process_req_msg(struct ubus_context *ctx, struct ubus_msghdr
 		}
 
 		if (id >= 0)
-			ubus_process_notify_status(req, id, hdr);
+			ubus_process_notify_status(req, id, buf);
 		else
-			ubus_process_req_status(req, hdr);
+			ubus_process_req_status(req, buf);
 		break;
 
 	case UBUS_MSG_DATA:
 		req = ubus_find_request(ctx, hdr->seq, hdr->peer, &id);
 		if (req && (req->data_cb || req->raw_data_cb))
-			ubus_process_req_data(req, hdr);
+			ubus_process_req_data(req, buf);
 		break;
 	}
 }