X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=b45a2d586cb094f37d2e7c06bec9cd15d391eb71;hp=c3bd19de8e4af478c5a7e47b20d163cd913de34e;hb=f04430a371c2628193ced7dd1ff1a0f0dd01e70d;hpb=b0b11b2295fbb8399949139d82156e123e005902 diff --git a/proto.c b/proto.c index c3bd19d..b45a2d5 100644 --- a/proto.c +++ b/proto.c @@ -19,6 +19,7 @@ #include #include "netifd.h" +#include "system.h" #include "interface.h" #include "interface-ip.h" #include "proto.h" @@ -32,6 +33,8 @@ enum { OPT_BROADCAST, OPT_GATEWAY, OPT_IP6GW, + OPT_IP6PREFIX, + OPT_IP6ASSIGN, __OPT_MAX, }; @@ -42,11 +45,14 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = { [OPT_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING }, [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_IP6ASSIGN] = { .name = "ip6assign", .type = BLOBMSG_TYPE_INT32 }, }; static const union config_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 = { @@ -70,66 +76,6 @@ static const struct blobmsg_policy proto_ip_addr[__ADDR_MAX] = { [ADDR_PTP] = { .name = "ptp", .type = BLOBMSG_TYPE_STRING }, }; -unsigned int -parse_netmask_string(const char *str, bool v6) -{ - struct in_addr addr; - unsigned int ret; - char *err = NULL; - - if (!strchr(str, '.')) { - ret = strtoul(str, &err, 0); - if (err && *err) - goto error; - - return ret; - } - - if (v6) - goto error; - - if (inet_aton(str, &addr) != 1) - goto error; - - return 32 - fls(~(ntohl(addr.s_addr))); - -error: - return ~0; -} - -static bool -split_netmask(char *str, unsigned int *netmask, bool v6) -{ - char *delim = strchr(str, '/'); - - if (delim) { - *(delim++) = 0; - - *netmask = parse_netmask_string(delim, v6); - } - return true; -} - -static int -parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask) -{ - char *astr = alloca(strlen(str) + 1); - - strcpy(astr, str); - if (!split_netmask(astr, netmask, af == AF_INET6)) - return 0; - - if (af == AF_INET6) { - if (*netmask > 128) - return 0; - } else { - if (*netmask > 32) - return 0; - } - - return inet_pton(af, astr, addr); -} - static struct device_addr * alloc_device_addr(bool v6, bool ext) { @@ -281,6 +227,89 @@ parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6) return true; } +static bool +parse_ip6assign_option(struct interface *iface, struct blob_attr *attr) +{ + uint8_t oldval = iface->proto_ip.assignment_length; + uint8_t newval = blobmsg_get_u32(attr); + + struct device_prefix *prefix; + list_for_each_entry(prefix, &prefixes, head) { + if (oldval && oldval != newval) + interface_ip_set_prefix_assignment(prefix, iface, 0); + + if (newval && newval <= 64) + interface_ip_set_prefix_assignment(prefix, iface, newval); + } + + iface->proto_ip.assignment_length = newval; + return true; +} + +static bool +parse_prefix_option(struct interface *iface, const char *str, size_t len) +{ + char buf[128] = {0}, *saveptr; + if (len > sizeof(buf)) + return false; + + memcpy(buf, str, len); + char *addrstr = strtok_r(buf, "/", &saveptr); + if (!addrstr) + return false; + + char *lengthstr = strtok_r(NULL, ",", &saveptr); + if (!lengthstr) + return false; + + char *prefstr = strtok_r(NULL, ",", &saveptr); + char *validstr = (!prefstr) ? NULL : strtok_r(NULL, ",", &saveptr); + + uint32_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10); + uint32_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10); + + uint8_t length = strtoul(lengthstr, NULL, 10); + if (length < 1 || length > 64) + return false; + + struct in6_addr addr; + if (inet_pton(AF_INET6, addrstr, &addr) < 1) + return false; + + time_t now = system_get_rtime(); + time_t preferred_until = 0; + if (prefstr && pref != 0xffffffffU) + preferred_until = pref + now; + + time_t valid_until = 0; + if (validstr && valid != 0xffffffffU) + valid_until = valid + now; + + interface_ip_add_device_prefix(iface, &addr, length, + valid_until, preferred_until); + return true; +} + +static int +parse_prefix_list(struct interface *iface, struct blob_attr *attr) +{ + struct blob_attr *cur; + int n_addr = 0; + int rem; + + blobmsg_for_each_attr(cur, attr, rem) { + if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) + return -1; + + n_addr++; + if (!parse_prefix_option(iface, blobmsg_data(cur), + blobmsg_data_len(cur))) + return -1; + } + + return n_addr; +} + int proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr) { @@ -316,10 +345,9 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr) n_v6 = parse_static_address_option(iface, cur, true, netmask, false, 0); - if (!n_v4 && !n_v6) { - error = "NO_ADDRESS"; - goto error; - } + if ((cur = tb[OPT_IP6PREFIX])) + if (parse_prefix_list(iface, cur) < 0) + goto out; if (n_v4 < 0 || n_v6 < 0) goto out; @@ -334,6 +362,10 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr) goto out; } + if ((cur = tb[OPT_IP6ASSIGN])) + if (!parse_ip6assign_option(iface, cur)) + goto out; + return 0; error: @@ -347,7 +379,6 @@ proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ex { struct blob_attr *tb[__OPT_MAX]; struct blob_attr *cur; - const char *error; int n_v4 = 0, n_v6 = 0; blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr)); @@ -358,10 +389,9 @@ proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ex if ((cur = tb[OPT_IP6ADDR])) n_v6 = parse_address_list(iface, cur, true, ext); - if (!n_v4 && !n_v6) { - error = "NO_ADDRESS"; - goto error; - } + if ((cur = tb[OPT_IP6PREFIX])) + if (parse_prefix_list(iface, cur) < 0) + goto out; if (n_v4 < 0 || n_v6 < 0) goto out; @@ -376,10 +406,12 @@ proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ex goto out; } + if ((cur = tb[OPT_IP6ASSIGN])) + if (!parse_ip6assign_option(iface, cur)) + goto out; + return 0; -error: - interface_add_error(iface, "proto", error, NULL, 0); out: return -1; } @@ -450,6 +482,19 @@ get_proto_handler(const char *name) } void +proto_dump_handlers(struct blob_buf *b) +{ + struct proto_handler *p; + void *c; + + avl_for_each_element(&handlers, p, avl) { + c = blobmsg_open_table(b, p->name); + blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV)); + blobmsg_close_table(b, c); + } +} + +void proto_init_interface(struct interface *iface, struct blob_attr *attr) { const struct proto_handler *proto = iface->proto_handler;