if (!attrbuf[UBUS_ATTR_STATUS])
return false;
- *ret = blob_get_int32(attrbuf[UBUS_ATTR_STATUS]);
+ *ret = blob_get_u32(attrbuf[UBUS_ATTR_STATUS]);
return true;
}
if (!attrbuf[UBUS_ATTR_OBJID])
return;
- objid = blob_get_int32(attrbuf[UBUS_ATTR_OBJID]);
+ objid = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]);
if (!attrbuf[UBUS_ATTR_METHOD]) {
ret = UBUS_STATUS_INVALID_ARGUMENT;
return;
memset(&obj, 0, sizeof(obj));
- obj.id = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+ obj.id = blob_get_u32(attr[UBUS_ATTR_OBJID]);
obj.path = blob_data(attr[UBUS_ATTR_OBJPATH]);
- obj.type_id = blob_get_int32(attr[UBUS_ATTR_OBJTYPE]);
+ obj.type_id = blob_get_u32(attr[UBUS_ATTR_OBJTYPE]);
obj.signature = attr[UBUS_ATTR_SIGNATURE];
req->cb(ureq->ctx, &obj, ureq->priv);
}
if (!attr[UBUS_ATTR_OBJID])
return;
- *id = blob_get_int32(attr[UBUS_ATTR_OBJID]);
+ *id = blob_get_u32(attr[UBUS_ATTR_OBJID]);
}
int ubus_lookup_id(struct ubus_context *ctx, const char *path, uint32_t *id)
return ubus_complete_request(ctx, &req);
}
-static void ubus_publish_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+static void ubus_add_object_cb(struct ubus_request *req, int type, struct blob_attr *msg)
{
struct ubus_object *obj = req->priv;
if (!attrbuf[UBUS_ATTR_OBJID])
return;
- obj->id = blob_get_int32(attrbuf[UBUS_ATTR_OBJID]);
+ obj->id = blob_get_u32(attrbuf[UBUS_ATTR_OBJID]);
if (attrbuf[UBUS_ATTR_OBJTYPE])
- obj->type->id = blob_get_int32(attrbuf[UBUS_ATTR_OBJTYPE]);
+ obj->type->id = blob_get_u32(attrbuf[UBUS_ATTR_OBJTYPE]);
obj->avl.key = &obj->id;
avl_insert(&req->ctx->objects, &obj->avl);
return true;
}
-static int __ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
+static int __ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
{
struct ubus_request req;
int ret;
return UBUS_STATUS_INVALID_ARGUMENT;
}
- ubus_start_request(ctx, &req, b.head, UBUS_MSG_PUBLISH, 0);
- req.raw_data_cb = ubus_publish_cb;
+ ubus_start_request(ctx, &req, b.head, UBUS_MSG_ADD_OBJECT, 0);
+ req.raw_data_cb = ubus_add_object_cb;
req.priv = obj;
ret = ubus_complete_request(ctx, &req);
if (ret)
return 0;
}
-int ubus_publish(struct ubus_context *ctx, struct ubus_object *obj)
+int ubus_add_object(struct ubus_context *ctx, struct ubus_object *obj)
{
if (!obj->name || !obj->type)
return UBUS_STATUS_INVALID_ARGUMENT;
- return __ubus_publish(ctx, 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,
if (!!obj->name ^ !!obj->type)
return UBUS_STATUS_INVALID_ARGUMENT;
- ret = __ubus_publish(ctx, obj);
+ ret = __ubus_add_object(ctx, obj);
if (ret)
return ret;
}