X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=794444e8102896173cb42b100d8f0dfe801ba926;hp=ba9fb9e3bd75c789340583c5ab0b4f6184577425;hb=e6e1fd184841552bd343ef2b92378c1d84cb79f4;hpb=c8fb7658d2317a81b41d5729ed17152d567f4619 diff --git a/ubus.c b/ubus.c index ba9fb9e..794444e 100644 --- a/ubus.c +++ b/ubus.c @@ -1,5 +1,19 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ #define _GNU_SOURCE +#include #include #include @@ -8,9 +22,11 @@ #include "proto.h" #include "ubus.h" #include "system.h" +#include "wireless.h" -static struct ubus_context *ctx = NULL; +struct ubus_context *ubus_ctx = NULL; static struct blob_buf b; +static const char *ubus_path; /* global object */ @@ -25,16 +41,137 @@ netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj, 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; +} + +enum { + HR_TARGET, + HR_V6, + HR_INTERFACE, + __HR_MAX +}; + +static const struct blobmsg_policy route_policy[__HR_MAX] = { + [HR_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING }, + [HR_V6] = { .name = "v6", .type = BLOBMSG_TYPE_BOOL }, + [HR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING }, +}; + +static int +netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { - netifd_reload(); + struct blob_attr *tb[__HR_MAX]; + struct interface *iface = NULL; + union if_addr a; + bool v6 = false; + + blobmsg_parse(route_policy, __HR_MAX, tb, blob_data(msg), blob_len(msg)); + if (!tb[HR_TARGET]) + return UBUS_STATUS_INVALID_ARGUMENT; + + if (tb[HR_V6]) + v6 = blobmsg_get_bool(tb[HR_V6]); + + if (tb[HR_INTERFACE]) + iface = vlist_find(&interfaces, blobmsg_data(tb[HR_INTERFACE]), iface, node); + + memset(&a, 0, sizeof(a)); + if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(tb[HR_TARGET]), &a)) + return UBUS_STATUS_INVALID_ARGUMENT; + + + iface = interface_ip_add_target_route(&a, v6, iface); + if (!iface) + return UBUS_STATUS_NOT_FOUND; + + blob_buf_init(&b, 0); + blobmsg_add_string(&b, "interface", iface->name); + ubus_send_reply(ctx, req, b.head); + + return 0; +} + +static int +netifd_get_proto_handlers(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + blob_buf_init(&b, 0); + proto_dump_handlers(&b); + ubus_send_reply(ctx, req, b.head); + return 0; } + +enum { + DI_NAME, + __DI_MAX +}; + +static const struct blobmsg_policy dynamic_policy[__DI_MAX] = { + [DI_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING }, +}; + +static int +netifd_add_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; + struct blob_attr *config; + struct device *dev; + + 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 = interface_alloc(name, msg); + if (!iface) + return UBUS_STATUS_UNKNOWN_ERROR; + + interface_set_dynamic(iface); + iface->device_config = true; + + config = blob_memdup(msg); + if (!config) + goto error; + + interface_add(iface, config); + + // need to look up the interface name again, in case of config update, + iface = vlist_find(&interfaces, name, iface, node); + if (!iface) + return UBUS_STATUS_UNKNOWN_ERROR; + + dev = iface->main_dev.dev; + if (!dev || !dev->default_config) + return UBUS_STATUS_UNKNOWN_ERROR; + + device_set_config(dev, dev->type, msg); + return UBUS_STATUS_OK; + +error: + free(iface); + return UBUS_STATUS_UNKNOWN_ERROR; +} + 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), }; static struct ubus_object_type main_object_type = @@ -79,8 +216,95 @@ netifd_dev_status(struct ubus_context *ctx, struct ubus_object *obj, 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; +} + +enum { + DEV_STATE_NAME, + DEV_STATE_DEFER, + __DEV_STATE_MAX, +}; + +static const struct blobmsg_policy dev_state_policy[__DEV_STATE_MAX] = { + [DEV_STATE_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING }, + [DEV_STATE_DEFER] = { .name = "defer", .type = BLOBMSG_TYPE_BOOL }, +}; + +static int +netifd_handle_set_state(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_STATE_MAX]; + struct blob_attr *cur; + + blobmsg_parse(dev_state_policy, __DEV_STATE_MAX, tb, blob_data(msg), blob_len(msg)); + + cur = tb[DEV_STATE_NAME]; + if (!cur) + return UBUS_STATUS_INVALID_ARGUMENT; + + dev = device_get(blobmsg_data(cur), false); + if (!dev) + return UBUS_STATUS_NOT_FOUND; + + cur = tb[DEV_STATE_DEFER]; + if (cur) + device_set_deferred(dev, !!blobmsg_get_u8(cur)); + + return 0; +} + static struct ubus_method dev_object_methods[] = { - UBUS_METHOD("status", netifd_dev_status, dev_policy) + UBUS_METHOD("status", netifd_dev_status, dev_policy), + UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs), + UBUS_METHOD("set_state", netifd_handle_set_state, dev_state_policy), }; static struct ubus_object_type dev_object_type = @@ -93,38 +317,37 @@ static struct ubus_object dev_object = { .n_methods = ARRAY_SIZE(dev_object_methods), }; -int -netifd_ubus_init(const char *path) +static void +netifd_ubus_add_fd(void) { - int ret; - - ctx = ubus_connect(path); - if (!ctx) - return -EIO; - - DPRINTF("connected as %08x\n", ctx->local_id); - uloop_init(); - ubus_add_uloop(ctx); - - ret = ubus_add_object(ctx, &main_object); - if (ret) - goto out; + ubus_add_uloop(ubus_ctx); + system_fd_set_cloexec(ubus_ctx->sock.fd); +} - ret = ubus_add_object(ctx, &dev_object); +static void +netifd_ubus_reconnect_timer(struct uloop_timeout *timeout) +{ + static struct uloop_timeout retry = { + .cb = netifd_ubus_reconnect_timer, + }; + int t = 2; + + if (ubus_reconnect(ubus_ctx, ubus_path) != 0) { + DPRINTF("failed to reconnect, trying again in %d seconds\n", t); + uloop_timeout_set(&retry, t * 1000); + return; + } -out: - if (ret != 0) - fprintf(stderr, "Failed to publish object: %s\n", ubus_strerror(ret)); - return ret; + DPRINTF("reconnected to ubus, new id: %08x\n", ubus_ctx->local_id); + netifd_ubus_add_fd(); } -void -netifd_ubus_done(void) +static void +netifd_ubus_connection_lost(struct ubus_context *ctx) { - ubus_free(ctx); + netifd_ubus_reconnect_timer(NULL); } - /* per-interface object */ static int @@ -178,16 +401,244 @@ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface) blobmsg_close_array(b, e); } -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) +static void +interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6, + bool enabled) { - struct interface *iface; + struct device_addr *addr; + char *buf; + void *a; + int buflen = 128; + int af; + + time_t now = system_get_rtime(); + vlist_for_each_element(&ip->addr, addr, node) { + if (addr->enabled != enabled) + continue; + + if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) + af = AF_INET; + else + af = AF_INET6; - iface = container_of(obj, struct interface, ubus); + if (af != (v6 ? AF_INET6 : AF_INET)) + continue; + + 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); + + if (addr->preferred_until) { + int preferred = addr->preferred_until - now; + if (preferred < 0) + preferred = 0; + blobmsg_add_u32(&b, "preferred", preferred); + } + + if (addr->valid_until) + blobmsg_add_u32(&b, "valid", addr->valid_until - now); + + if (addr->pclass) + blobmsg_add_string(&b, "class", addr->pclass); + + blobmsg_close_table(&b, a); + } +} + +static void +interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled) +{ + struct device_route *route; + int buflen = 128; + char *buf; + void *r; + int af; + + time_t now = system_get_rtime(); + vlist_for_each_element(&ip->route, route, node) { + if (route->enabled != enabled) + continue; + + 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); + + if (route->flags & DEVROUTE_MTU) + blobmsg_add_u32(&b, "mtu", route->mtu); + + if (route->flags & DEVROUTE_METRIC) + blobmsg_add_u32(&b, "metric", route->metric); + + if (route->flags & DEVROUTE_TABLE) + blobmsg_add_u32(&b, "table", route->table); + + if (route->valid_until) + blobmsg_add_u32(&b, "valid", route->valid_until - now); + + buf = blobmsg_alloc_string_buffer(&b, "source", buflen); + inet_ntop(af, &route->source, buf, buflen); + snprintf(buf + strlen(buf), 4, "/%u", route->sourcemask); + blobmsg_add_string_buffer(&b); + + blobmsg_close_table(&b, r); + } +} + + +static void +interface_ip_dump_prefix_list(struct interface_ip_settings *ip) +{ + struct device_prefix *prefix; + char *buf; + void *a, *c; + const int buflen = INET6_ADDRSTRLEN; + + time_t now = system_get_rtime(); + vlist_for_each_element(&ip->prefix, prefix, node) { + a = blobmsg_open_table(&b, NULL); + + buf = blobmsg_alloc_string_buffer(&b, "address", buflen); + inet_ntop(AF_INET6, &prefix->addr, buf, buflen); + blobmsg_add_string_buffer(&b); + + blobmsg_add_u32(&b, "mask", prefix->length); + + if (prefix->preferred_until) { + int preferred = prefix->preferred_until - now; + if (preferred < 0) + preferred = 0; + blobmsg_add_u32(&b, "preferred", preferred); + } + + if (prefix->valid_until) + blobmsg_add_u32(&b, "valid", prefix->valid_until - now); + + blobmsg_add_string(&b, "class", prefix->pclass); + + c = blobmsg_open_table(&b, "assigned"); + struct device_prefix_assignment *assign; + list_for_each_entry(assign, &prefix->assignments, head) { + if (!assign->name[0]) + continue; + + struct in6_addr addr = prefix->addr; + addr.s6_addr32[1] |= htonl(assign->assigned); + + void *d = blobmsg_open_table(&b, assign->name); + + buf = blobmsg_alloc_string_buffer(&b, "address", buflen); + inet_ntop(AF_INET6, &addr, buf, buflen); + blobmsg_add_string_buffer(&b); + + blobmsg_add_u32(&b, "mask", assign->length); + + blobmsg_close_table(&b, d); + } + blobmsg_close_table(&b, c); + + blobmsg_close_table(&b, a); + } +} + + +static void +interface_ip_dump_prefix_assignment_list(struct interface *iface) +{ + void *a; + char *buf; + const int buflen = INET6_ADDRSTRLEN; + time_t now = system_get_rtime(); + + struct device_prefix *prefix; + list_for_each_entry(prefix, &prefixes, head) { + struct device_prefix_assignment *assign; + list_for_each_entry(assign, &prefix->assignments, head) { + if (strcmp(assign->name, iface->name)) + continue; + + struct in6_addr addr = prefix->addr; + addr.s6_addr32[1] |= htonl(assign->assigned); + + a = blobmsg_open_table(&b, NULL); + + buf = blobmsg_alloc_string_buffer(&b, "address", buflen); + inet_ntop(AF_INET6, &addr, buf, buflen); + blobmsg_add_string_buffer(&b); + + blobmsg_add_u32(&b, "mask", assign->length); + + if (prefix->preferred_until) { + int preferred = prefix->preferred_until - now; + if (preferred < 0) + preferred = 0; + blobmsg_add_u32(&b, "preferred", preferred); + } + + if (prefix->valid_until) + blobmsg_add_u32(&b, "valid", prefix->valid_until - now); + + blobmsg_close_table(&b, a); + } + } +} + + +static void +interface_ip_dump_dns_server_list(struct interface_ip_settings *ip, + bool enabled) +{ + struct dns_server *dns; + int buflen = 128; + char *buf; + + vlist_simple_for_each_element(&ip->dns_servers, dns, node) { + if (ip->no_dns == enabled) + continue; + + buf = blobmsg_alloc_string_buffer(&b, NULL, buflen); + inet_ntop(dns->af, &dns->addr, buf, buflen); + blobmsg_add_string_buffer(&b); + } +} + +static void +interface_ip_dump_dns_search_list(struct interface_ip_settings *ip, + bool enabled) +{ + struct dns_search_domain *dns; + + vlist_simple_for_each_element(&ip->dns_search, dns, node) { + if (ip->no_dns == enabled) + continue; + + blobmsg_add_string(&b, NULL, dns->name); + } +} + +static void +netifd_dump_status(struct interface *iface) +{ + struct interface_data *data; + struct device *dev; + void *a, *inactive; - 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, "available", iface->available); @@ -196,28 +647,118 @@ 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); } - if (iface->main_dev.dev) { - struct device *dev = iface->main_dev.dev; - const char *field; - void *devinfo; + if (iface->proto_handler) + blobmsg_add_string(&b, "proto", iface->proto_handler->name); - /* 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); + dev = iface->main_dev.dev; + if (dev && !dev->hidden && + !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) + blobmsg_add_string(&b, "device", dev->ifname); - blobmsg_close_table(&b, devinfo); + if (iface->state == IFS_UP) { + if (iface->ip4table) + blobmsg_add_u32(&b, "ip4table", iface->ip4table); + if (iface->ip6table) + blobmsg_add_u32(&b, "ip6table", iface->ip6table); + blobmsg_add_u32(&b, "metric", iface->metric); + blobmsg_add_u8(&b, "delegation", !iface->proto_ip.no_delegation); + a = blobmsg_open_array(&b, "ipv4-address"); + interface_ip_dump_address_list(&iface->config_ip, false, true); + interface_ip_dump_address_list(&iface->proto_ip, false, true); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "ipv6-address"); + interface_ip_dump_address_list(&iface->config_ip, true, true); + interface_ip_dump_address_list(&iface->proto_ip, true, true); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "ipv6-prefix"); + interface_ip_dump_prefix_list(&iface->config_ip); + interface_ip_dump_prefix_list(&iface->proto_ip); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "ipv6-prefix-assignment"); + interface_ip_dump_prefix_assignment_list(iface); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "route"); + interface_ip_dump_route_list(&iface->config_ip, true); + interface_ip_dump_route_list(&iface->proto_ip, true); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "dns-server"); + interface_ip_dump_dns_server_list(&iface->config_ip, true); + interface_ip_dump_dns_server_list(&iface->proto_ip, true); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "dns-search"); + interface_ip_dump_dns_search_list(&iface->config_ip, true); + interface_ip_dump_dns_search_list(&iface->proto_ip, true); + blobmsg_close_array(&b, a); + + inactive = blobmsg_open_table(&b, "inactive"); + a = blobmsg_open_array(&b, "ipv4-address"); + interface_ip_dump_address_list(&iface->config_ip, false, false); + interface_ip_dump_address_list(&iface->proto_ip, false, false); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "ipv6-address"); + interface_ip_dump_address_list(&iface->config_ip, true, false); + interface_ip_dump_address_list(&iface->proto_ip, true, false); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "route"); + interface_ip_dump_route_list(&iface->config_ip, false); + interface_ip_dump_route_list(&iface->proto_ip, false); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "dns-server"); + interface_ip_dump_dns_server_list(&iface->config_ip, false); + interface_ip_dump_dns_server_list(&iface->proto_ip, false); + blobmsg_close_array(&b, a); + a = blobmsg_open_array(&b, "dns-search"); + interface_ip_dump_dns_search_list(&iface->config_ip, false); + interface_ip_dump_dns_search_list(&iface->proto_ip, false); + blobmsg_close_array(&b, a); + blobmsg_close_table(&b, inactive); } + 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); +} + +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 = container_of(obj, struct interface, ubus); + blob_buf_init(&b, 0); + netifd_dump_status(iface); + ubus_send_reply(ctx, req, b.head); + + return 0; +} + + +static int +netifd_handle_dump(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + blob_buf_init(&b, 0); + void *a = blobmsg_open_array(&b, "interface"); + + struct interface *iface; + vlist_for_each_element(&interfaces, iface, node) { + void *i = blobmsg_open_table(&b, NULL); + blobmsg_add_string(&b, "interface", iface->name); + netifd_dump_status(iface); + blobmsg_close_table(&b, i); + } + + blobmsg_close_array(&b, a); ubus_send_reply(ctx, req, b.head); return 0; @@ -228,11 +769,9 @@ 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; struct blob_attr *tb[__DEV_MAX]; + struct interface *iface; bool add = !strncmp(method, "add", 3); - int ret; iface = container_of(obj, struct interface, ubus); @@ -241,32 +780,7 @@ 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; - - if (!main_dev->hotplug_ops) - return UBUS_STATUS_NOT_SUPPORTED; - - dev = device_get(blobmsg_data(tb[DEV_NAME]), add); - if (!dev) - return UBUS_STATUS_NOT_FOUND; - - 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) - device_free_unused(dev); - - return ret; + return interface_handle_link(iface, blobmsg_data(tb[DEV_NAME]), add); } @@ -310,29 +824,306 @@ 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 = "add_device", .handler = netifd_iface_handle_device, - .policy = dev_policy, .n_policy = __DEV_MAX }, - { .name = "remove_device", .handler = netifd_iface_handle_device, - .policy = dev_policy, .n_policy = __DEV_MAX }, + { .name = "prepare", .handler = netifd_handle_iface_prepare }, + { .name = "dump", .handler = netifd_handle_dump }, + 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 = UBUS_OBJECT_TYPE("netifd_iface", iface_object_methods); +static struct ubus_object iface_object = { + .name = "network.interface", + .type = &iface_object_type, + .n_methods = ARRAY_SIZE(iface_object_methods), +}; + +static void netifd_add_object(struct ubus_object *obj) +{ + int ret = ubus_add_object(ubus_ctx, obj); + + if (ret != 0) + fprintf(stderr, "Failed to publish object '%s': %s\n", obj->name, ubus_strerror(ret)); +} + +static const struct blobmsg_policy iface_policy = { + .name = "interface", + .type = BLOBMSG_TYPE_STRING, +}; + +static int +netifd_handle_iface(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 *tb; + int i; + + blobmsg_parse(&iface_policy, 1, &tb, blob_data(msg), blob_len(msg)); + if (!tb) + return UBUS_STATUS_INVALID_ARGUMENT; + + iface = vlist_find(&interfaces, blobmsg_data(tb), iface, node); + if (!iface) + return UBUS_STATUS_NOT_FOUND; + + for (i = 0; i < ARRAY_SIZE(iface_object_methods); i++) { + ubus_handler_t cb; + + if (strcmp(method, iface_object_methods[i].name) != 0) + continue; + + cb = iface_object_methods[i].handler; + return cb(ctx, &iface->ubus, req, method, msg); + } + + return UBUS_STATUS_INVALID_ARGUMENT; +} + +static void netifd_add_iface_object(void) +{ + struct ubus_method *methods; + int i; + + methods = calloc(1, sizeof(iface_object_methods)); + memcpy(methods, iface_object_methods, sizeof(iface_object_methods)); + iface_object.methods = methods; + + for (i = 0; i < ARRAY_SIZE(iface_object_methods); i++) { + if (methods[i].handler == netifd_handle_dump) + continue; + + methods[i].handler = netifd_handle_iface; + methods[i].policy = &iface_policy; + methods[i].n_policy = 1; + } + netifd_add_object(&iface_object); +} + +static struct wireless_device * +get_wdev(struct blob_attr *msg, int *ret) +{ + struct blobmsg_policy wdev_policy = { + .name = "device", + .type = BLOBMSG_TYPE_STRING, + }; + struct blob_attr *dev_attr; + struct wireless_device *wdev = NULL; + + + blobmsg_parse(&wdev_policy, 1, &dev_attr, blob_data(msg), blob_len(msg)); + if (!dev_attr) { + *ret = UBUS_STATUS_INVALID_ARGUMENT; + return NULL; + } + + wdev = vlist_find(&wireless_devices, blobmsg_data(dev_attr), wdev, node); + if (!wdev) { + *ret = UBUS_STATUS_NOT_FOUND; + return NULL; + } + + *ret = 0; + return wdev; +} + +static int +netifd_handle_wdev_up(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct wireless_device *wdev; + int ret; + + wdev = get_wdev(msg, &ret); + if (ret == UBUS_STATUS_NOT_FOUND) + return ret; + + if (wdev) { + wireless_device_set_up(wdev); + } else { + vlist_for_each_element(&wireless_devices, wdev, node) + wireless_device_set_up(wdev); + } + + return 0; +} + +static int +netifd_handle_wdev_down(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct wireless_device *wdev; + int ret; + + wdev = get_wdev(msg, &ret); + if (ret == UBUS_STATUS_NOT_FOUND) + return ret; + + if (wdev) { + wireless_device_set_down(wdev); + } else { + vlist_for_each_element(&wireless_devices, wdev, node) + wireless_device_set_down(wdev); + } + + return 0; +} + +static int +netifd_handle_wdev_status(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct wireless_device *wdev; + int ret; + + wdev = get_wdev(msg, &ret); + if (ret == UBUS_STATUS_NOT_FOUND) + return ret; + + blob_buf_init(&b, 0); + if (wdev) { + wireless_device_status(wdev, &b); + } else { + vlist_for_each_element(&wireless_devices, wdev, node) + wireless_device_status(wdev, &b); + } + ubus_send_reply(ctx, req, b.head); + return 0; +} + +static int +netifd_handle_wdev_notify(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct wireless_device *wdev; + int ret; + + wdev = get_wdev(msg, &ret); + if (!wdev) + return ret; + + return wireless_device_notify(wdev, msg, req); +} + +static struct ubus_method wireless_object_methods[] = { + { .name = "up", .handler = netifd_handle_wdev_up }, + { .name = "down", .handler = netifd_handle_wdev_down }, + { .name = "status", .handler = netifd_handle_wdev_status }, + { .name = "notify", .handler = netifd_handle_wdev_notify }, +}; + +static struct ubus_object_type wireless_object_type = + UBUS_OBJECT_TYPE("netifd_iface", wireless_object_methods); + + +static struct ubus_object wireless_object = { + .name = "network.wireless", + .type = &wireless_object_type, + .methods = wireless_object_methods, + .n_methods = ARRAY_SIZE(wireless_object_methods), +}; + +int +netifd_ubus_init(const char *path) +{ + uloop_init(); + ubus_path = path; + + ubus_ctx = ubus_connect(path); + if (!ubus_ctx) + return -EIO; + + DPRINTF("connected as %08x\n", ubus_ctx->local_id); + ubus_ctx->connection_lost = netifd_ubus_connection_lost; + netifd_ubus_add_fd(); + + netifd_add_object(&main_object); + netifd_add_object(&dev_object); + netifd_add_object(&wireless_object); + netifd_add_iface_object(); + + return 0; +} + +void +netifd_ubus_done(void) +{ + ubus_free(ubus_ctx); +} + 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); + ubus_send_event(ubus_ctx, "network.interface", b.head); +} + +void +netifd_ubus_interface_notify(struct interface *iface, bool up) +{ + const char *event = (up) ? "update" : "down"; + blob_buf_init(&b, 0); + blobmsg_add_string(&b, "interface", iface->name); + netifd_dump_status(iface); + ubus_notify(ubus_ctx, &iface_object, event, b.head, -1); + ubus_notify(ubus_ctx, &iface->ubus, event, b.head, -1); } void @@ -341,15 +1132,14 @@ netifd_ubus_add_interface(struct interface *iface) struct ubus_object *obj = &iface->ubus; char *name = NULL; - asprintf(&name, "%s.interface.%s", main_object.name, iface->name); - if (!name) + if (asprintf(&name, "%s.interface.%s", main_object.name, iface->name) == -1) return; obj->name = name; obj->type = &iface_object_type; obj->methods = iface_object_methods; obj->n_methods = ARRAY_SIZE(iface_object_methods); - if (ubus_add_object(ctx, &iface->ubus)) { + if (ubus_add_object(ubus_ctx, &iface->ubus)) { DPRINTF("failed to publish ubus object for interface '%s'\n", iface->name); free(name); obj->name = NULL; @@ -362,6 +1152,6 @@ netifd_ubus_remove_interface(struct interface *iface) if (!iface->ubus.name) return; - ubus_remove_object(ctx, &iface->ubus); + ubus_remove_object(ubus_ctx, &iface->ubus); free((void *) iface->ubus.name); }