X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=4746c4f6217b94e1971f62075345a0963bb84f20;hp=ce82a520c94417263b4d44fb179e7090dce4d809;hb=8a1a1dda9cfff45a7cd48f5d108d0174fadd84ee;hpb=1b48b50c9669ecf3fdd3f50d662fbfd18b971014 diff --git a/ubus.c b/ubus.c index ce82a52..4746c4f 100644 --- a/ubus.c +++ b/ubus.c @@ -1,5 +1,6 @@ #define _GNU_SOURCE +#include #include #include @@ -230,13 +231,73 @@ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface) blobmsg_close_array(b, e); } +static void +interface_ip_dump_address_list(struct interface_ip_settings *ip) +{ + struct device_addr *addr; + char *buf; + void *a; + int buflen = 128; + int af; + + vlist_for_each_element(&ip->addr, addr, node) { + if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) + af = AF_INET; + else + af = AF_INET6; + + a = blobmsg_open_table(&b, NULL); + + buf = blobmsg_alloc_string_buffer(&b, "address", buflen); + inet_ntop(af, &addr->addr, buf, buflen); + blobmsg_add_string_buffer(&b); + + blobmsg_add_u32(&b, "mask", addr->mask); + + blobmsg_close_table(&b, a); + } +} + +static void +interface_ip_dump_route_list(struct interface_ip_settings *ip) +{ + struct device_route *route; + static char *buf; + int buflen = 128; + void *r; + int af; + + vlist_for_each_element(&ip->route, route, node) { + if ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4) + af = AF_INET; + else + af = AF_INET6; + + r = blobmsg_open_table(&b, NULL); + + buf = blobmsg_alloc_string_buffer(&b, "target", buflen); + inet_ntop(af, &route->addr, buf, buflen); + blobmsg_add_string_buffer(&b); + + blobmsg_add_u32(&b, "mask", route->mask); + + buf = blobmsg_alloc_string_buffer(&b, "nexthop", buflen); + inet_ntop(af, &route->nexthop, buf, buflen); + blobmsg_add_string_buffer(&b); + + blobmsg_close_table(&b, r); + } +} + static int netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { struct interface *iface; + struct interface_data *data; struct device *dev; + void *a; iface = container_of(obj, struct interface, ubus); @@ -249,13 +310,30 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, 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); + 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 (iface->state == IFS_UP) { + a = blobmsg_open_array(&b, "address"); + interface_ip_dump_address_list(&iface->config_ip); + interface_ip_dump_address_list(&iface->proto_ip); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "route"); + interface_ip_dump_route_list(&iface->config_ip); + interface_ip_dump_route_list(&iface->proto_ip); + blobmsg_close_array(&b, a); + } + + a = blobmsg_open_table(&b, "data"); + avl_for_each_element(&iface->data, data, node) + blob_put(&b, blob_id(data->data), blob_data(data->data), blob_len(data->data)); + + blobmsg_close_table(&b, a); + if (!list_is_empty(&iface->errors)) netifd_add_interface_errors(&b, iface); @@ -269,11 +347,10 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { - struct interface *iface; - struct device *dev, *main_dev = NULL; struct blob_attr *tb[__DEV_MAX]; + struct interface *iface; + struct device *dev; bool add = !strncmp(method, "add", 3); - const char *devname; int ret; iface = container_of(obj, struct interface, ubus); @@ -283,57 +360,17 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, if (!tb[DEV_NAME]) return UBUS_STATUS_INVALID_ARGUMENT; - devname = blobmsg_data(tb[DEV_NAME]); - 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 ? 2 : 0); - if (!dev && (main_dev || add)) { - ret = UBUS_STATUS_NOT_FOUND; - goto out; - } + if (add && !dev) + return UBUS_STATUS_NOT_FOUND; - 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) - ret = main_dev->hotplug_ops->add(main_dev, dev); - else - ret = main_dev->hotplug_ops->del(main_dev, dev); - if (ret) - ret = UBUS_STATUS_UNKNOWN_ERROR; - } else { - ret = UBUS_STATUS_INVALID_ARGUMENT; - } + if (add) + return interface_add_link(iface, dev); + else + return interface_remove_link(iface, dev); -out: device_unlock(); return ret; @@ -380,14 +417,57 @@ netifd_iface_remove(struct ubus_context *ctx, struct ubus_object *obj, return 0; } +static int +netifd_handle_iface_prepare(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct interface *iface; + struct device *dev; + const struct device_hotplug_ops *ops; + + iface = container_of(obj, struct interface, ubus); + dev = iface->main_dev.dev; + if (!dev) + return 0; + + ops = dev->hotplug_ops; + if (!ops) + return 0; + + return ops->prepare(dev); +} + +static int +netifd_handle_set_data(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct interface *iface; + struct blob_attr *cur; + int rem, ret; + + iface = container_of(obj, struct interface, ubus); + + blob_for_each_attr(cur, msg, rem) { + ret = interface_add_data(iface, cur); + if (ret) + return ret; + } + + 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 = "prepare", .handler = netifd_handle_iface_prepare }, 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 } + { .name = "remove", .handler = netifd_iface_remove }, + { .name = "set_data", .handler = netifd_handle_set_data }, }; static struct ubus_object_type iface_object_type =