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
struct blob_attr *msg)
{
struct blob_attr *tb[__HR_MAX];
- struct interface *iface;
+ struct interface *iface = NULL;
union if_addr a;
bool v6 = false;
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 = interface_ip_add_target_route(&a, v6, iface);
if (!iface)
return UBUS_STATUS_NOT_FOUND;
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 =
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);
+
+ 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);
}
}
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);
blobmsg_add_u32(&b, "mask", prefix->length);
- time_t now = system_get_rtime();
if (prefix->preferred_until) {
int preferred = prefix->preferred_until - now;
if (preferred < 0)
blobmsg_add_u32(&b, "preferred", preferred);
}
- if (prefix->valid_until) {
- int valid = prefix->valid_until - now;
- if (valid < 0)
- valid = 0;
- blobmsg_add_u32(&b, "valid", valid);
- }
+ 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;
- vlist_for_each_element(prefix->assignments, assign, node) {
+ 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, &assign->addr, buf, buflen);
+ inet_ntop(AF_INET6, &addr, buf, buflen);
blobmsg_add_string_buffer(&b);
blobmsg_add_u32(&b, "mask", assign->length);
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)
{
}
}
-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
+netifd_dump_status(struct interface *iface)
{
- struct interface *iface;
struct interface_data *data;
struct device *dev;
void *a, *inactive;
- iface = container_of(obj, struct interface, ubus);
-
- 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);
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);
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;
{
struct blob_attr *tb[__DEV_MAX];
struct interface *iface;
- struct device *dev;
bool add = !strncmp(method, "add", 3);
- int ret;
iface = container_of(obj, struct interface, ubus);
if (!tb[DEV_NAME])
return UBUS_STATUS_INVALID_ARGUMENT;
- device_lock();
-
- dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
- if (!dev) {
- ret = UBUS_STATUS_NOT_FOUND;
- goto out;
- }
-
- 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;
+ return interface_handle_link(iface, blobmsg_data(tb[DEV_NAME]), add);
}
{ .name = "down", .handler = netifd_handle_down },
{ .name = "status", .handler = netifd_handle_status },
{ .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 },
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;
}
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(ctx, &iface_object, event, b.head, -1);
+ ubus_notify(ctx, &iface->ubus, event, b.head, -1);
+}
+
+void
netifd_ubus_add_interface(struct interface *iface)
{
struct ubus_object *obj = &iface->ubus;
projects / project / netifd.git / blobdiff