X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=f2421cc3f66b23afa892ea1fca7ba79e093ea692;hp=b936b9a4326315daf9fb099a45066aeab05812ac;hb=f73f11865e8601a0cb3983a6f2b2beb5ebabd14d;hpb=19048f79a49b1f242f03e2d81cec6b6e11f18a9e diff --git a/ubus.c b/ubus.c index b936b9a..f2421cc 100644 --- a/ubus.c +++ b/ubus.c @@ -25,7 +25,6 @@ static struct ubus_context *ctx = NULL; static struct blob_buf b; -static struct netifd_fd ubus_fd; static const char *ubus_path; /* global object */ @@ -258,8 +257,7 @@ static void netifd_ubus_add_fd(void) { ubus_add_uloop(ctx); - ubus_fd.fd = ctx->sock.fd; - netifd_fd_add(&ubus_fd); + system_fd_set_cloexec(ctx->sock.fd); } static void @@ -283,45 +281,9 @@ netifd_ubus_reconnect_timer(struct uloop_timeout *timeout) static void netifd_ubus_connection_lost(struct ubus_context *ctx) { - netifd_fd_delete(&ubus_fd); netifd_ubus_reconnect_timer(NULL); } -int -netifd_ubus_init(const char *path) -{ - int ret; - - uloop_init(); - ubus_path = path; - - ctx = ubus_connect(path); - if (!ctx) - return -EIO; - - DPRINTF("connected as %08x\n", ctx->local_id); - ctx->connection_lost = netifd_ubus_connection_lost; - netifd_ubus_add_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 ret; -} - -void -netifd_ubus_done(void) -{ - ubus_free(ctx); -} - - /* per-interface object */ static int @@ -376,7 +338,8 @@ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface) } static void -interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6) +interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6, + bool enabled) { struct device_addr *addr; char *buf; @@ -384,7 +347,11 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6) 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 @@ -401,12 +368,22 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6) 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); + blobmsg_close_table(&b, a); } } static void -interface_ip_dump_route_list(struct interface_ip_settings *ip) +interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled) { struct device_route *route; int buflen = 128; @@ -414,7 +391,11 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip) 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 @@ -432,20 +413,119 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip) inet_ntop(af, &route->nexthop, buf, buflen); blobmsg_add_string_buffer(&b); - blobmsg_add_u8(&b, "enabled", route->enabled); + 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->valid_until) + blobmsg_add_u32(&b, "valid", route->valid_until - now); 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); + + c = blobmsg_open_table(&b, "assigned"); + struct device_prefix_assignment *assign; + vlist_for_each_element(prefix->assignments, assign, node) { + void *d = blobmsg_open_table(&b, assign->name); + + buf = blobmsg_alloc_string_buffer(&b, "address", buflen); + inet_ntop(AF_INET6, &assign->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; + vlist_for_each_element(prefix->assignments, assign, node) { + if (strcmp(assign->name, iface->name)) + continue; + + a = blobmsg_open_table(&b, NULL); + + buf = blobmsg_alloc_string_buffer(&b, "address", buflen); + inet_ntop(AF_INET6, &assign->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) +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); @@ -453,11 +533,15 @@ interface_ip_dump_dns_server_list(struct interface_ip_settings *ip) } static void -interface_ip_dump_dns_search_list(struct interface_ip_settings *ip) +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); } } @@ -470,7 +554,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, struct interface *iface; struct interface_data *data; struct device *dev; - void *a; + void *a, *inactive; iface = container_of(obj, struct interface, ubus); @@ -490,30 +574,62 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_string(&b, "proto", iface->proto_handler->name); dev = iface->main_dev.dev; - if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) + if (dev && !dev->hidden && + !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) blobmsg_add_string(&b, "device", dev->ifname); if (iface->state == IFS_UP) { + blobmsg_add_u32(&b, "metric", iface->metric); a = blobmsg_open_array(&b, "ipv4-address"); - interface_ip_dump_address_list(&iface->config_ip, false); - interface_ip_dump_address_list(&iface->proto_ip, false); + 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); - interface_ip_dump_address_list(&iface->proto_ip, true); + 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); - interface_ip_dump_route_list(&iface->proto_ip); + 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); - interface_ip_dump_dns_server_list(&iface->proto_ip); + 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); - interface_ip_dump_dns_search_list(&iface->proto_ip); + 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"); @@ -551,14 +667,23 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, device_lock(); dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0); - if (add && !dev) - return UBUS_STATUS_NOT_FOUND; + if (!dev) { + ret = UBUS_STATUS_NOT_FOUND; + goto out; + } - if (add) - return interface_add_link(iface, dev); - else - return interface_remove_link(iface, dev); + if (add) { + device_set_present(dev, true); + if (iface->device_config) + device_set_config(dev, &simple_device_type, iface->config); + + system_if_apply_settings(dev, &dev->settings); + ret = interface_add_link(iface, dev); + } else { + ret = interface_remove_link(iface, dev); + } +out: device_unlock(); return ret; @@ -662,6 +787,99 @@ 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(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++) { + methods[i].handler = netifd_handle_iface; + methods[i].policy = &iface_policy; + methods[i].n_policy = 1; + } + netifd_add_object(&iface_object); +} + +int +netifd_ubus_init(const char *path) +{ + uloop_init(); + ubus_path = path; + + ctx = ubus_connect(path); + if (!ctx) + return -EIO; + + DPRINTF("connected as %08x\n", ctx->local_id); + ctx->connection_lost = netifd_ubus_connection_lost; + netifd_ubus_add_fd(); + + netifd_add_object(&main_object); + netifd_add_object(&dev_object); + netifd_add_iface_object(); + + return 0; +} + +void +netifd_ubus_done(void) +{ + ubus_free(ctx); +} + void netifd_ubus_interface_event(struct interface *iface, bool up) { @@ -677,8 +895,7 @@ 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;