device: Don't process link events anymore in device user specific callback handlers

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 422b652250a38c3b8fe813ae74c6f4a3a6c33fd3..c834d11bba38db4e4ba610db56d6b882f38a4efd 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -166,38 +166,12 @@ error:
        return UBUS_STATUS_UNKNOWN_ERROR;
 }
 
-static int
-netifd_del_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
-                     struct ubus_request_data *req, const char *method,
-                     struct blob_attr *msg)
-{
-       struct blob_attr *tb[__DI_MAX];
-       struct interface *iface;
-
-       blobmsg_parse(dynamic_policy, __DI_MAX, tb, blob_data(msg), blob_len(msg));
-
-       if (!tb[DI_NAME])
-               return UBUS_STATUS_INVALID_ARGUMENT;
-
-       const char *name = blobmsg_get_string(tb[DI_NAME]);
-       iface = vlist_find(&interfaces, name, iface, node);
-
-       if (!iface)
-               return UBUS_STATUS_NOT_FOUND;
-       else if (!iface->dynamic)
-               return UBUS_STATUS_INVALID_COMMAND;
-
-       vlist_delete(&interfaces, &iface->node);
-       return UBUS_STATUS_OK;
-}
-
 static struct ubus_method main_object_methods[] = {
        { .name = "restart", .handler = netifd_handle_restart },
        { .name = "reload", .handler = netifd_handle_reload },
        UBUS_METHOD("add_host_route", netifd_add_host_route, route_policy),
        { .name = "get_proto_handlers", .handler = netifd_get_proto_handlers },
        UBUS_METHOD("add_dynamic", netifd_add_dynamic, dynamic_policy),
-       UBUS_METHOD("del_dynamic", netifd_del_dynamic, dynamic_policy),
 };
 
 static struct ubus_object_type main_object_type =
@@ -843,7 +817,7 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
 
        cur = tb[DEV_LINK_EXT];
        if (cur)
-               link_ext = !!blobmsg_get_u8(cur);
+               link_ext = blobmsg_get_bool(cur);
 
        return interface_handle_link(iface, blobmsg_data(tb[DEV_LINK_NAME]), add, link_ext);
 }