OPT_GATEWAY,
OPT_IP6GW,
OPT_IP6PREFIX,
+ OPT_IP6DEPRECATED,
__OPT_MAX,
};
[OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
[OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
[OPT_IP6PREFIX] = { .name = "ip6prefix", .type = BLOBMSG_TYPE_ARRAY },
+ [OPT_IP6DEPRECATED] = { .name = "ip6deprecated", .type = BLOBMSG_TYPE_BOOL },
};
-static const union config_param_info proto_ip_attr_info[__OPT_MAX] = {
+static const struct uci_blob_param_info proto_ip_attr_info[__OPT_MAX] = {
[OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
[OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
[OPT_IP6PREFIX] = { .type = BLOBMSG_TYPE_STRING },
};
-const struct config_param_list proto_ip_attr = {
+static const char * const proto_ip_validate[__OPT_MAX] = {
+ [OPT_IPADDR] = "ip4addr",
+ [OPT_IP6ADDR] = "ip6addr",
+ [OPT_NETMASK] = "netmask",
+ [OPT_BROADCAST] = "ipaddr",
+ [OPT_GATEWAY] = "ip4addr",
+ [OPT_IP6GW] = "ip6addr",
+ [OPT_IP6PREFIX] = "ip6addr",
+};
+
+const struct uci_blob_param_list proto_ip_attr = {
.n_params = __OPT_MAX,
.params = proto_ip_attributes,
+ .validate = proto_ip_validate,
.info = proto_ip_attr_info,
};
ADDR_PREFERRED,
ADDR_VALID,
ADDR_OFFLINK,
+ ADDR_CLASS,
__ADDR_MAX
};
[ADDR_PREFERRED] = { .name = "preferred", .type = BLOBMSG_TYPE_INT32 },
[ADDR_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 },
[ADDR_OFFLINK] = { .name = "offlink", .type = BLOBMSG_TYPE_BOOL },
+ [ADDR_CLASS] = { .name = "class", .type = BLOBMSG_TYPE_STRING },
};
static struct device_addr *
struct device_addr *addr;
addr = calloc(1, sizeof(*addr));
+ if (!addr)
+ return NULL;
+
addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
if (ext)
addr->flags |= DEVADDR_EXTERNAL;
static bool
parse_addr(struct interface *iface, const char *str, bool v6, int mask,
- bool ext, uint32_t broadcast)
+ bool ext, uint32_t broadcast, bool deprecated)
{
struct device_addr *addr;
int af = v6 ? AF_INET6 : AF_INET;
return false;
addr->mask = mask;
- if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
- interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
- free(addr);
- return false;
- }
+ if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask))
+ goto error;
+
+ if (!v6) {
+ if (IN_EXPERIMENTAL(ntohl(addr->addr.in.s_addr)))
+ goto error;
+
+ } else if (IN6_IS_ADDR_MULTICAST(&addr->addr.in6))
+ goto error;
if (broadcast)
addr->broadcast = broadcast;
+ if (deprecated)
+ addr->preferred_until = system_get_rtime();
+
vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
return true;
+
+error:
+ interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
+ free(addr);
+
+ return false;
}
static int
parse_static_address_option(struct interface *iface, struct blob_attr *attr,
- bool v6, int netmask, bool ext, uint32_t broadcast)
+ bool v6, int netmask, bool ext, uint32_t broadcast,
+ bool deprecated)
{
struct blob_attr *cur;
int n_addr = 0;
n_addr++;
if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext,
- broadcast))
+ broadcast, deprecated))
return -1;
}
else if (addr->preferred_until > addr->valid_until)
goto error;
}
+
+ if ((cur = tb[ADDR_CLASS]))
+ addr->pclass = strdup(blobmsg_get_string(cur));
}
return addr;
int af = v6 ? AF_INET6 : AF_INET;
route = calloc(1, sizeof(*route));
+ if (!route)
+ return NULL;
+
if (!inet_pton(af, str, &route->nexthop)) {
interface_add_error(iface, "proto", "INVALID_GATEWAY", &str, 1);
free(route);
route->mask = 0;
route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+ route->metric = iface->metric;
unsigned int table = (v6) ? iface->ip6table : iface->ip4table;
if (table) {
parse_prefix_option(struct interface *iface, const char *str, size_t len)
{
char buf[128] = {0}, *saveptr;
- if (len > sizeof(buf))
+ if (len >= sizeof(buf))
return false;
memcpy(buf, str, len);
char *prefstr = strtok_r(NULL, ",", &saveptr);
char *validstr = (!prefstr) ? NULL : strtok_r(NULL, ",", &saveptr);
char *addstr = (!validstr) ? NULL : strtok_r(NULL, ",", &saveptr);
+ const char *pclass = NULL;
int64_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10);
int64_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10);
return false;
excludedp = &excluded;
+ } else if (!strcmp(key, "class")) {
+ pclass = val;
}
}
interface_ip_add_device_prefix(iface, &addr, length,
valid_until, preferred_until,
- excludedp, excl_length);
+ excludedp, excl_length, pclass);
return true;
}
struct blob_attr *cur;
const char *error;
unsigned int netmask = 32;
+ bool ip6deprecated;
int n_v4 = 0, n_v6 = 0;
struct in_addr bcast = {};
}
}
+ ip6deprecated = blobmsg_get_bool_default(tb[OPT_IP6DEPRECATED], false);
+
if ((cur = tb[OPT_IPADDR]))
n_v4 = parse_static_address_option(iface, cur, false,
- netmask, false, bcast.s_addr);
+ netmask, false, bcast.s_addr, false);
if ((cur = tb[OPT_IP6ADDR]))
n_v6 = parse_static_address_option(iface, cur, true,
- 128, false, 0);
+ 128, false, 0, ip6deprecated);
if ((cur = tb[OPT_IP6PREFIX]))
if (parse_prefix_list(iface, cur) < 0)
struct interface_proto_state *proto;
proto = calloc(1, sizeof(*proto));
+ if (!proto)
+ return NULL;
+
proto->free = default_proto_free;
proto->cb = no_proto_handler;
void *c;
avl_for_each_element(&handlers, p, avl) {
+ void *v;
+
c = blobmsg_open_table(b, p->name);
+ if (p->config_params->validate) {
+ int i;
+
+ v = blobmsg_open_table(b, "validate");
+ for (i = 0; i < p->config_params->n_params; i++)
+ blobmsg_add_string(b, p->config_params->params[i].name, uci_get_validate_string(p->config_params, i));
+ blobmsg_close_table(b, v);
+ }
+ blobmsg_add_u8(b, "immediate", !!(p->flags & PROTO_FLAG_IMMEDIATE));
blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV));
+ blobmsg_add_u8(b, "init_available", !!(p->flags & PROTO_FLAG_INIT_AVAILABLE));
+ blobmsg_add_u8(b, "renew_available", !!(p->flags & PROTO_FLAG_RENEW_AVAILABLE));
+ blobmsg_add_u8(b, "force_link_default", !!(p->flags & PROTO_FLAG_FORCE_LINK_DEFAULT));
+ blobmsg_add_u8(b, "last_error", !!(p->flags & PROTO_FLAG_LASTERROR));
+ blobmsg_add_u8(b, "teardown_on_l3_link_down", !!(p->flags & PROTO_FLAG_TEARDOWN_ON_L3_LINK_DOWN));
+ blobmsg_add_u8(b, "no_task", !!(p->flags & PROTO_FLAG_NO_TASK));
blobmsg_close_table(b, c);
}
}
proto_attach_interface(struct interface *iface, const char *proto_name)
{
const struct proto_handler *proto = &no_proto;
+ const char *error = NULL;
if (proto_name) {
proto = get_proto_handler(proto_name);
if (!proto) {
- interface_add_error(iface, "proto", "INVALID_PROTO", NULL, 0);
+ error = "INVALID_PROTO";
proto = &no_proto;
}
}
iface->proto_handler = proto;
+
+ if (error)
+ interface_add_error(iface, "proto", error, NULL, 0);
}
int
case PROTO_CMD_TEARDOWN:
ev = IFPEV_DOWN;
break;
+ case PROTO_CMD_RENEW:
+ ev = IFPEV_RENEW;
+ break;
default:
return -EINVAL;
}
projects / project / netifd.git / blobdiff