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;
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);
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);
struct device_prefix *prefix;
list_for_each_entry(prefix, &prefixes, head) {
struct device_prefix_assignment *assign;
- vlist_for_each_element(prefix->assignments, assign, node) {
+ 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, &assign->addr, buf, buflen);
+ inet_ntop(AF_INET6, &addr, buf, buflen);
blobmsg_add_string_buffer(&b);
blobmsg_add_u32(&b, "mask", assign->length);