X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=0ba2fbe908486516c237e6999168938c1f1f7141;hp=83c63451c139c265b8c160a58814789dc8331706;hb=9d8dd091f8f336b111364ed211165b5ec9842a24;hpb=19e05a68ba2c5d11480ddd23d9b0d5756cbc8183 diff --git a/proto.c b/proto.c index 83c6345..0ba2fbe 100644 --- a/proto.c +++ b/proto.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -48,15 +49,26 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = { [OPT_IP6PREFIX] = { .name = "ip6prefix", .type = BLOBMSG_TYPE_ARRAY }, }; -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, }; @@ -68,6 +80,7 @@ enum { ADDR_PREFERRED, ADDR_VALID, ADDR_OFFLINK, + ADDR_CLASS, __ADDR_MAX }; @@ -79,6 +92,7 @@ static const struct blobmsg_policy proto_ip_addr[__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 * @@ -187,15 +201,17 @@ parse_address_item(struct blob_attr *attr, bool v6, bool ext) } else { time_t now = system_get_rtime(); if ((cur = tb[ADDR_PREFERRED])) { - uint32_t preferred = blobmsg_get_u32(cur); - if (preferred < UINT32_MAX) - addr->preferred_until = now + preferred; + int64_t preferred = blobmsg_get_u32(cur); + int64_t preferred_until = preferred + (int64_t)now; + if (preferred_until <= LONG_MAX && preferred != 0xffffffffLL) + addr->preferred_until = preferred_until; } if ((cur = tb[ADDR_VALID])) { - uint32_t valid = blobmsg_get_u32(cur); - if (valid < UINT32_MAX) - addr->valid_until = now + valid; + int64_t valid = blobmsg_get_u32(cur); + int64_t valid_until = valid + (int64_t)now; + if (valid_until <= LONG_MAX && valid != 0xffffffffLL) + addr->valid_until = valid_until; } @@ -205,6 +221,9 @@ parse_address_item(struct blob_attr *attr, bool v6, bool ext) else if (addr->preferred_until > addr->valid_until) goto error; } + + if ((cur = tb[ADDR_CLASS])) + addr->pclass = strdup(blobmsg_get_string(cur)); } return addr; @@ -251,6 +270,14 @@ parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6) route->mask = 0; route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4); + route->metric = iface->metric; + + unsigned int table = (v6) ? iface->ip6table : iface->ip4table; + if (table) { + route->table = table; + route->flags |= DEVROUTE_SRCTABLE; + } + vlist_add(&iface->proto_ip.route, &route->node, route); return true; @@ -275,9 +302,10 @@ parse_prefix_option(struct interface *iface, const char *str, size_t 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; - uint32_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10); - uint32_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10); + int64_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10); + int64_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10); uint8_t length = strtoul(lengthstr, NULL, 10), excl_length = 0; if (length < 1 || length > 64) @@ -305,6 +333,8 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len) return false; excludedp = &excluded; + } else if (!strcmp(key, "class")) { + pclass = val; } } @@ -312,18 +342,18 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len) - time_t now = system_get_rtime(); + int64_t now = system_get_rtime(); time_t preferred_until = 0; - if (prefstr && pref != 0xffffffffU) + if (prefstr && pref != 0xffffffffLL && pref + now <= LONG_MAX) preferred_until = pref + now; time_t valid_until = 0; - if (validstr && valid != 0xffffffffU) + if (validstr && valid != 0xffffffffLL && valid + now <= LONG_MAX) valid_until = valid + now; interface_ip_add_device_prefix(iface, &addr, length, valid_until, preferred_until, - excludedp, excl_length); + excludedp, excl_length, pclass); return true; } @@ -517,7 +547,17 @@ proto_dump_handlers(struct blob_buf *b) 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, "no_device", !!(p->flags & PROTO_FLAG_NODEV)); blobmsg_close_table(b, c); } @@ -576,6 +616,9 @@ interface_proto_event(struct interface_proto_state *proto, case PROTO_CMD_TEARDOWN: ev = IFPEV_DOWN; break; + case PROTO_CMD_RENEW: + ev = IFPEV_RENEW; + break; default: return -EINVAL; }