X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=ba9fb9e3bd75c789340583c5ab0b4f6184577425;hp=6eba0b07e8faa12739c54b010f0d85da17606166;hb=05c1f3b0c2058a579ca1a6e2b06329b8c814e5bd;hpb=d24673d0f2fbb5b8a38f3e3fec9b06ce9a3dec3f diff --git a/ubus.c b/ubus.c index 6eba0b0..ba9fb9e 100644 --- a/ubus.c +++ b/ubus.c @@ -1,65 +1,96 @@ +#define _GNU_SOURCE + #include +#include #include "netifd.h" #include "interface.h" +#include "proto.h" #include "ubus.h" +#include "system.h" static struct ubus_context *ctx = NULL; static struct blob_buf b; /* global object */ +static int +netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + netifd_restart(); + return 0; +} + +static int +netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + netifd_reload(); + return 0; +} + +static struct ubus_method main_object_methods[] = { + { .name = "restart", .handler = netifd_handle_restart }, + { .name = "reload", .handler = netifd_handle_reload }, +}; + +static struct ubus_object_type main_object_type = + UBUS_OBJECT_TYPE("netifd", main_object_methods); + +static struct ubus_object main_object = { + .name = "network", + .type = &main_object_type, + .methods = main_object_methods, + .n_methods = ARRAY_SIZE(main_object_methods), +}; + enum { DEV_NAME, - DEV_FORCE, __DEV_MAX, - __DEV_MAX_NOFORCE = __DEV_MAX - 1, }; static const struct blobmsg_policy dev_policy[__DEV_MAX] = { [DEV_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING }, - [DEV_FORCE] = { .name = "force", .type = BLOBMSG_TYPE_INT8 }, }; static int -netifd_handle_device(struct ubus_context *ctx, struct ubus_object *obj, - struct ubus_request_data *req, const char *method, - struct blob_attr *msg) +netifd_dev_status(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) { - struct device *dev; + struct device *dev = NULL; struct blob_attr *tb[__DEV_MAX]; - bool add = !strncmp(method, "add", 3); blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg)); - if (!tb[DEV_NAME]) - return UBUS_STATUS_INVALID_ARGUMENT; - - dev = device_get(blobmsg_data(tb[DEV_NAME]), false); - if (!dev) - return UBUS_STATUS_NOT_FOUND; + if (tb[DEV_NAME]) { + dev = device_get(blobmsg_data(tb[DEV_NAME]), false); + if (!dev) + return UBUS_STATUS_INVALID_ARGUMENT; + } - if (!add || (tb[DEV_FORCE] && blobmsg_get_u8(tb[DEV_FORCE]))) - device_set_present(dev, add); - else - check_device_state(dev); + blob_buf_init(&b, 0); + device_dump_status(&b, dev); + ubus_send_reply(ctx, req, b.head); return 0; } -static struct ubus_method main_object_methods[] = { - UBUS_METHOD("add_device", netifd_handle_device, dev_policy), - UBUS_METHOD("remove_device", netifd_handle_device, dev_policy), +static struct ubus_method dev_object_methods[] = { + UBUS_METHOD("status", netifd_dev_status, dev_policy) }; -static struct ubus_object_type main_object_type = - UBUS_OBJECT_TYPE("netifd", main_object_methods); +static struct ubus_object_type dev_object_type = + UBUS_OBJECT_TYPE("device", dev_object_methods); -static struct ubus_object main_object = { - .name = "network.interface", - .type = &main_object_type, - .methods = main_object_methods, - .n_methods = ARRAY_SIZE(main_object_methods), +static struct ubus_object dev_object = { + .name = "network.device", + .type = &dev_object_type, + .methods = dev_object_methods, + .n_methods = ARRAY_SIZE(dev_object_methods), }; int @@ -76,10 +107,15 @@ netifd_ubus_init(const char *path) ubus_add_uloop(ctx); ret = ubus_add_object(ctx, &main_object); + if (ret) + goto out; + + ret = ubus_add_object(ctx, &dev_object); + +out: if (ret != 0) fprintf(stderr, "Failed to publish object: %s\n", ubus_strerror(ret)); - - return 0; + return ret; } void @@ -154,8 +190,14 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, blob_buf_init(&b, 0); blobmsg_add_u8(&b, "up", iface->state == IFS_UP); blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP); - blobmsg_add_u8(&b, "active", iface->active); + blobmsg_add_u8(&b, "available", iface->available); blobmsg_add_u8(&b, "autostart", iface->autostart); + + if (iface->state == IFS_UP) { + time_t cur = system_get_rtime(); + blobmsg_add_u32(&b, "uptime", cur - iface->start_time); + } + if (iface->main_dev.dev) { struct device *dev = iface->main_dev.dev; const char *field; @@ -170,9 +212,6 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, devinfo = blobmsg_open_table(&b, field); blobmsg_add_string(&b, "name", dev->ifname); - if (dev->type->dump_status) - dev->type->dump_status(dev, &b); - blobmsg_close_table(&b, devinfo); } @@ -231,14 +270,56 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, } +static int +netifd_iface_notify_proto(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct interface *iface; + + iface = container_of(obj, struct interface, ubus); + + if (!iface->proto || !iface->proto->notify) + return UBUS_STATUS_NOT_SUPPORTED; + + return iface->proto->notify(iface->proto, msg); +} + +static void +netifd_iface_do_remove(struct uloop_timeout *timeout) +{ + struct interface *iface; + + iface = container_of(timeout, struct interface, remove_timer); + vlist_delete(&interfaces, &iface->node); +} + +static int +netifd_iface_remove(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct interface *iface; + + iface = container_of(obj, struct interface, ubus); + if (iface->remove_timer.cb) + return UBUS_STATUS_INVALID_ARGUMENT; + + iface->remove_timer.cb = netifd_iface_do_remove; + uloop_timeout_set(&iface->remove_timer, 100); + return 0; +} + static struct ubus_method iface_object_methods[] = { { .name = "up", .handler = netifd_handle_up }, { .name = "down", .handler = netifd_handle_down }, { .name = "status", .handler = netifd_handle_status }, { .name = "add_device", .handler = netifd_iface_handle_device, - .policy = dev_policy, .n_policy = __DEV_MAX_NOFORCE }, + .policy = dev_policy, .n_policy = __DEV_MAX }, { .name = "remove_device", .handler = netifd_iface_handle_device, - .policy = dev_policy, .n_policy = __DEV_MAX_NOFORCE }, + .policy = dev_policy, .n_policy = __DEV_MAX }, + { .name = "notify_proto", .handler = netifd_iface_notify_proto }, + { .name = "remove", .handler = netifd_iface_remove } }; static struct ubus_object_type iface_object_type = @@ -246,16 +327,24 @@ static struct ubus_object_type iface_object_type = void +netifd_ubus_interface_event(struct interface *iface, bool up) +{ + blob_buf_init(&b, 0); + blobmsg_add_string(&b, "action", up ? "ifup" : "ifdown"); + blobmsg_add_string(&b, "interface", iface->name); + ubus_send_event(ctx, "network.interface", b.head); +} + +void netifd_ubus_add_interface(struct interface *iface) { struct ubus_object *obj = &iface->ubus; - char *name; + char *name = NULL; - name = malloc(strlen(main_object.name) + strlen(iface->name) + 2); + asprintf(&name, "%s.interface.%s", main_object.name, iface->name); if (!name) return; - sprintf(name, "%s.%s", main_object.name, iface->name); obj->name = name; obj->type = &iface_object_type; obj->methods = iface_object_methods;