static struct ubus_context *ctx = NULL;
static struct blob_buf b;
-static struct netifd_fd ubus_fd;
static const char *ubus_path;
/* global object */
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
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
int buflen = 128;
int af;
+ time_t now = system_get_rtime();
vlist_for_each_element(&ip->addr, addr, node) {
if (addr->enabled != enabled)
continue;
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);
}
}
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 & 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);
+
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;
+ 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)
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);
device_lock();
dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
- if (add && !dev) {
+ if (!dev) {
ret = UBUS_STATUS_NOT_FOUND;
goto out;
}
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)
{
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;
projects / project / netifd.git / blobdiff