static struct ubus_context *ctx = NULL;
static struct blob_buf b;
-static struct netifd_fd ubus_fd;
+static const char *ubus_path;
/* global object */
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;
+}
+
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 },
};
static struct ubus_object_type main_object_type =
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("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 =
.n_methods = ARRAY_SIZE(dev_object_methods),
};
+static void
+netifd_ubus_add_fd(void)
+{
+ ubus_add_uloop(ctx);
+ system_fd_set_cloexec(ctx->sock.fd);
+}
+
+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(ctx, ubus_path) != 0) {
+ DPRINTF("failed to reconnect, trying again in %d seconds\n", t);
+ uloop_timeout_set(&retry, t * 1000);
+ return;
+ }
+
+ DPRINTF("reconnected to ubus, new id: %08x\n", ctx->local_id);
+ netifd_ubus_add_fd();
+}
+
+static void
+netifd_ubus_connection_lost(struct ubus_context *ctx)
+{
+ 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);
- uloop_init();
- ubus_add_uloop(ctx);
- ubus_fd.fd = ctx->sock.fd;
- netifd_fd_add(&ubus_fd);
+ ctx->connection_lost = netifd_ubus_connection_lost;
+ netifd_ubus_add_fd();
ret = ubus_add_object(ctx, &main_object);
if (ret)
}
static void
-interface_ip_dump_address_list(struct interface_ip_settings *ip)
+interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6,
+ bool enabled)
{
struct device_addr *addr;
char *buf;
int af;
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;
+ if (af != (v6 ? AF_INET6 : AF_INET))
+ continue;
+
a = blobmsg_open_table(&b, NULL);
buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
}
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;
- static char *buf;
int buflen = 128;
+ char *buf;
void *r;
int af;
vlist_for_each_element(&ip->route, route, node) {
+ if (route->enabled != enabled)
+ continue;
+
if ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
af = AF_INET;
else
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);
+
blobmsg_close_table(&b, r);
}
}
+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 int
netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct interface *iface;
struct interface_data *data;
struct device *dev;
- void *a;
+ void *a, *inactive;
iface = container_of(obj, struct interface, ubus);
blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
}
+ if (iface->proto_handler)
+ 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) {
- a = blobmsg_open_array(&b, "address");
- interface_ip_dump_address_list(&iface->config_ip);
- interface_ip_dump_address_list(&iface->proto_ip);
+ blobmsg_add_u32(&b, "metric", iface->metric);
+ 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, "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);
- interface_ip_dump_route_list(&iface->proto_ip);
+ 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");
device_lock();
dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
- if (add && !dev)
- return UBUS_STATUS_NOT_FOUND;
+ if (add && !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;
projects / project / netifd.git / blobdiff