X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=c729c5d3a40a2be09cbe32fd2550452540dc6889;hp=d5a7007a08dd47172a517dee68c9ba705fc1ee57;hb=e8f450ba2e67716cf3ed70060a309b80aa24cf00;hpb=367f5edba8abe7e03890ceb00c00617d64d7bf73 diff --git a/ubus.c b/ubus.c index d5a7007..c729c5d 100644 --- a/ubus.c +++ b/ubus.c @@ -1,53 +1,20 @@ +#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; +static struct netifd_fd ubus_fd; /* global object */ -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) -{ - struct device *dev; - 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 (!add || (tb[DEV_FORCE] && blobmsg_get_u8(tb[DEV_FORCE]))) - device_set_present(dev, add); - else - check_device_state(dev); - - return 0; -} - static int netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, @@ -67,8 +34,6 @@ netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj, } 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), { .name = "restart", .handler = netifd_handle_restart }, { .name = "reload", .handler = netifd_handle_reload }, }; @@ -77,12 +42,107 @@ static struct ubus_object_type main_object_type = UBUS_OBJECT_TYPE("netifd", main_object_methods); static struct ubus_object main_object = { - .name = "network.interface", + .name = "network", .type = &main_object_type, .methods = main_object_methods, .n_methods = ARRAY_SIZE(main_object_methods), }; +enum { + DEV_NAME, + __DEV_MAX, +}; + +static const struct blobmsg_policy dev_policy[__DEV_MAX] = { + [DEV_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING }, +}; + +static int +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 = NULL; + struct blob_attr *tb[__DEV_MAX]; + + blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg)); + + if (tb[DEV_NAME]) { + dev = device_get(blobmsg_data(tb[DEV_NAME]), false); + if (!dev) + return UBUS_STATUS_INVALID_ARGUMENT; + } + + blob_buf_init(&b, 0); + device_dump_status(&b, dev); + ubus_send_reply(ctx, req, b.head); + + return 0; +} + +enum { + ALIAS_ATTR_ALIAS, + ALIAS_ATTR_DEV, + __ALIAS_ATTR_MAX, +}; + +static const struct blobmsg_policy alias_attrs[__ALIAS_ATTR_MAX] = { + [ALIAS_ATTR_ALIAS] = { "alias", BLOBMSG_TYPE_ARRAY }, + [ALIAS_ATTR_DEV] = { "device", BLOBMSG_TYPE_STRING }, +}; + +static int +netifd_handle_alias(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct device *dev = NULL; + struct blob_attr *tb[__ALIAS_ATTR_MAX]; + struct blob_attr *cur; + int rem; + + blobmsg_parse(alias_attrs, __ALIAS_ATTR_MAX, tb, blob_data(msg), blob_len(msg)); + + if (!tb[ALIAS_ATTR_ALIAS]) + return UBUS_STATUS_INVALID_ARGUMENT; + + if ((cur = tb[ALIAS_ATTR_DEV]) != NULL) { + dev = device_get(blobmsg_data(cur), true); + if (!dev) + return UBUS_STATUS_NOT_FOUND; + } + + blobmsg_for_each_attr(cur, tb[ALIAS_ATTR_ALIAS], rem) { + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) + goto error; + + if (!blobmsg_check_attr(cur, NULL)) + goto error; + + alias_notify_device(blobmsg_data(cur), dev); + } + return 0; + +error: + device_free_unused(dev); + return UBUS_STATUS_INVALID_ARGUMENT; +} + +static struct ubus_method dev_object_methods[] = { + UBUS_METHOD("status", netifd_dev_status, dev_policy), + UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs), +}; + +static struct ubus_object_type dev_object_type = + UBUS_OBJECT_TYPE("device", dev_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 netifd_ubus_init(const char *path) { @@ -95,12 +155,19 @@ netifd_ubus_init(const char *path) DPRINTF("connected as %08x\n", ctx->local_id); uloop_init(); ubus_add_uloop(ctx); + ubus_fd.fd = ctx->sock.fd; + netifd_fd_add(&ubus_fd); 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 @@ -169,6 +236,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { struct interface *iface; + struct device *dev; iface = container_of(obj, struct interface, ubus); @@ -177,26 +245,17 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP); blobmsg_add_u8(&b, "available", iface->available); blobmsg_add_u8(&b, "autostart", iface->autostart); - if (iface->main_dev.dev) { - struct device *dev = iface->main_dev.dev; - const char *field; - void *devinfo; - - /* use a different field for virtual devices */ - if (dev->avl.key) - field = "device"; - else - field = "link"; - 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); + if (iface->state == IFS_UP) { + time_t cur = system_get_rtime(); + blobmsg_add_u32(&b, "uptime", cur - iface->start_time); + blobmsg_add_string(&b, "l3_device", iface->l3_dev->dev->ifname); } + dev = iface->main_dev.dev; + if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) + blobmsg_add_string(&b, "device", dev->ifname); + if (!list_is_empty(&iface->errors)) netifd_add_interface_errors(&b, iface); @@ -211,9 +270,10 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { struct interface *iface; - struct device *dev, *main_dev; + struct device *dev, *main_dev = NULL; struct blob_attr *tb[__DEV_MAX]; bool add = !strncmp(method, "add", 3); + const char *devname; int ret; iface = container_of(obj, struct interface, ubus); @@ -223,16 +283,44 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, if (!tb[DEV_NAME]) return UBUS_STATUS_INVALID_ARGUMENT; - main_dev = iface->main_dev.dev; - if (!main_dev) - return UBUS_STATUS_NOT_FOUND; + devname = blobmsg_data(tb[DEV_NAME]); - if (!main_dev->hotplug_ops) - return UBUS_STATUS_NOT_SUPPORTED; + device_lock(); + + if (iface->main_dev.hotplug) { + dev = iface->main_dev.dev; + + if (dev) { + if (!add && strcmp(dev->ifname, devname) != 0) { + ret = UBUS_STATUS_INVALID_ARGUMENT; + goto out; + } + + interface_set_available(iface, false); + device_remove_user(&iface->main_dev); + } + } else + main_dev = iface->main_dev.dev; dev = device_get(blobmsg_data(tb[DEV_NAME]), add); - if (!dev) - return UBUS_STATUS_NOT_FOUND; + if (!dev && (main_dev || add)) { + ret = UBUS_STATUS_NOT_FOUND; + goto out; + } + + if (!main_dev) { + if (add) { + device_add_user(&iface->main_dev, dev); + iface->main_dev.hotplug = true; + } + ret = 0; + goto out; + } + + if (!main_dev->hotplug_ops) { + ret = UBUS_STATUS_NOT_SUPPORTED; + goto out; + } if (main_dev != dev) { if (add) @@ -245,8 +333,8 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, ret = UBUS_STATUS_INVALID_ARGUMENT; } - if (add) - device_free_unused(dev); +out: + device_unlock(); return ret; } @@ -296,10 +384,8 @@ 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 }, - { .name = "remove_device", .handler = netifd_iface_handle_device, - .policy = dev_policy, .n_policy = __DEV_MAX_NOFORCE }, + UBUS_METHOD("add_device", netifd_iface_handle_device, dev_policy ), + UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_policy ), { .name = "notify_proto", .handler = netifd_iface_notify_proto }, { .name = "remove", .handler = netifd_iface_remove } }; @@ -309,16 +395,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;