fix compiler warnings

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 159d5f5..aa1378b 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -1,6 +1,7 @@
 #include <string.h>
 
 #include "netifd.h"
+#include "interface.h"
 #include "ubus.h"
 
 static struct ubus_context *ctx = NULL;
@@ -32,12 +33,12 @@ static int netifd_handle_device(struct ubus_context *ctx, struct ubus_object *ob
        if (!tb[DEV_NAME])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       dev = get_device(blobmsg_data(tb[DEV_NAME]), false);
+       dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
        if (!dev)
                return UBUS_STATUS_NOT_FOUND;
 
        if (!add || (tb[DEV_FORCE] && blobmsg_get_u8(tb[DEV_FORCE])))
-               set_device_present(dev, add);
+               device_set_present(dev, add);
        else
                check_device_state(dev);
 
@@ -93,7 +94,7 @@ static int netifd_handle_up(struct ubus_context *ctx, struct ubus_object *obj,
        struct interface *iface;
 
        iface = container_of(obj, struct interface, ubus);
-       set_interface_up(iface);
+       interface_set_up(iface);
 
        return 0;
 }
@@ -105,7 +106,7 @@ static int netifd_handle_down(struct ubus_context *ctx, struct ubus_object *obj,
        struct interface *iface;
 
        iface = container_of(obj, struct interface, ubus);
-       set_interface_down(iface);
+       interface_set_down(iface);
 
        return 0;
 }
@@ -138,12 +139,18 @@ static int netifd_handle_status(struct ubus_context *ctx, struct ubus_object *ob
                                struct ubus_request_data *req, const char *method,
                                struct blob_attr *msg)
 {
+       static const char *iface_state[] = {
+               [IFS_SETUP] = "setup",
+               [IFS_UP] = "up",
+               [IFS_TEARDOWN] = "teardown",
+               [IFS_DOWN] = "down",
+       };
        struct interface *iface;
 
        iface = container_of(obj, struct interface, ubus);
 
        blob_buf_init(&b, 0);
-       blobmsg_add_u8(&b, "up", iface->up);
+       blobmsg_add_string(&b, "state", iface_state[iface->state]);
        blobmsg_add_u8(&b, "active", iface->active);
        blobmsg_add_u8(&b, "autostart", iface->autostart);
        if (iface->main_dev.dev) {