X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=libubus.c;h=34250b4daf4042f4e72a505d9b1679dac2fb0c9b;hb=e76b1a29ca3b6d44c62fbb3a7c080e0c45a69d12;hp=d4ba427f62deae534b09c48cfc5c085bc59f97bf;hpb=cb1feedb5e1388d7aea8bddef1284690c590874f;p=project%2Fubus.git

diff --git a/libubus.c b/libubus.c
index d4ba427..34250b4 100644
--- a/libubus.c
+++ b/libubus.c
@@ -10,14 +10,6 @@
 #include "libubus.h"
 #include "ubusmsg.h"
 
-#define DEBUG 1
-
-#ifdef DEBUG
-#define DPRINTF(_format, ...) fprintf(stderr, "ubus: " _format, ## __VA_ARGS__)
-#else
-#define DPRINTF(...) do {} while(0)
-#endif
-
 #define STATIC_IOV(_var) { .iov_base = (char *) &(_var), .iov_len = sizeof(_var) }
 
 const char *__ubus_strerror[__UBUS_STATUS_LAST] = {
@@ -153,7 +145,7 @@ static bool ubus_validate_hdr(struct ubus_msghdr *hdr)
 	if (blob_raw_len(hdr->data) < sizeof(*hdr->data))
 		return false;
 
-	if (blob_raw_len(hdr->data) + sizeof(*hdr) > UBUS_MAX_MSGLEN)
+	if (blob_pad_len(hdr->data) > UBUS_MAX_MSGLEN)
 		return false;
 
 	return true;
@@ -323,7 +315,7 @@ found:
 	req.peer = hdr->peer;
 	req.seq = hdr->seq;
 	ret = obj->methods[method].handler(ctx, obj, &req,
-					   obj->methods[method].name,
+					   blob_data(attrbuf[UBUS_ATTR_METHOD]),
 					   attrbuf[UBUS_ATTR_DATA]);
 
 send:
@@ -355,9 +347,6 @@ static void ubus_process_msg(struct ubus_context *ctx, struct ubus_msghdr *hdr)
 	case UBUS_MSG_INVOKE:
 		ubus_process_invoke(ctx, hdr);
 		break;
-	default:
-		DPRINTF("unknown message type: %d\n", hdr->type);
-		break;
 	}
 }
 
@@ -646,6 +635,43 @@ int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
 	return __ubus_add_object(ctx, obj);
 }
 
+static void ubus_remove_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+	struct ubus_object *obj = req->priv;
+
+	ubus_parse_msg(msg);
+
+	if (!attrbuf[UBUS_ATTR_OBJID])
+		return;
+
+	obj->id = 0;
+
+	if (attrbuf[UBUS_ATTR_OBJTYPE] && obj->type)
+		obj->type->id = 0;
+
+	avl_delete(&req->ctx->objects, &obj->avl);
+}
+
+int ubus_remove_object(struct ubus_context *ctx, struct ubus_object *obj)
+{
+	struct ubus_request req;
+	int ret;
+
+	blob_buf_init(&b, 0);
+	blob_put_int32(&b, UBUS_ATTR_OBJID, obj->id);
+	ubus_start_request(ctx, &req, b.head, UBUS_MSG_REMOVE_OBJECT, 0);
+	req.raw_data_cb = ubus_remove_object_cb;
+	req.priv = obj;
+	ret = ubus_complete_request(ctx, &req);
+	if (ret)
+		return ret;
+
+	if (obj->id)
+		return UBUS_STATUS_NO_DATA;
+
+	return 0;
+}
+
 static int ubus_event_cb(struct ubus_context *ctx, struct ubus_object *obj,
 			 struct ubus_request_data *req,
 			 const char *method, struct blob_attr *msg)
@@ -695,8 +721,25 @@ int ubus_register_event_handler(struct ubus_context *ctx,
 	return 0;
 }
 
+int ubus_send_event(struct ubus_context *ctx, const char *id,
+		    struct blob_attr *data)
+{
+	struct ubus_request req;
+	void *s;
+
+	blob_buf_init(&b, 0);
+	blob_put_int32(&b, UBUS_ATTR_OBJID, UBUS_SYSTEM_OBJECT_EVENT);
+	blob_put_string(&b, UBUS_ATTR_METHOD, "send");
+	s = blob_nest_start(&b, UBUS_ATTR_DATA);
+	blobmsg_add_string(&b, "id", id);
+	blobmsg_add_field(&b, BLOBMSG_TYPE_TABLE, "data", blob_data(data), blob_len(data));
+	blob_nest_end(&b, s);
+
+	ubus_start_request(ctx, &req, b.head, UBUS_MSG_INVOKE, UBUS_SYSTEM_OBJECT_EVENT);
+	return ubus_complete_request(ctx, &req);
+}
 
-void ubus_default_connection_lost(struct ubus_context *ctx)
+static void ubus_default_connection_lost(struct ubus_context *ctx)
 {
 	if (ctx->sock.registered)
 		uloop_end();