X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto.c;h=6047735daec00d4a595110fd1b3fb687d8b13c2e;hp=1850e540b02fedc91278a8ac0d1a5ed0dca80aea;hb=HEAD;hpb=da279866a33682e590428b740b4564a4b2e6f780 diff --git a/proto.c b/proto.c index 1850e54..6047735 100644 --- a/proto.c +++ b/proto.c @@ -33,9 +33,11 @@ enum { OPT_IP6ADDR, OPT_NETMASK, OPT_BROADCAST, + OPT_PTPADDR, OPT_GATEWAY, OPT_IP6GW, OPT_IP6PREFIX, + OPT_IP6DEPRECATED, __OPT_MAX, }; @@ -44,20 +46,34 @@ static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = { [OPT_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY }, [OPT_NETMASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING }, [OPT_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING }, + [OPT_PTPADDR] = { .name = "ptpaddr", .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_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_PTPADDR] = "ip4addr", + [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, }; @@ -69,6 +85,7 @@ enum { ADDR_PREFERRED, ADDR_VALID, ADDR_OFFLINK, + ADDR_CLASS, __ADDR_MAX }; @@ -80,6 +97,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 * @@ -88,6 +106,9 @@ alloc_device_addr(bool v6, bool ext) 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; @@ -97,7 +118,7 @@ alloc_device_addr(bool v6, bool ext) static bool parse_addr(struct interface *iface, const char *str, bool v6, int mask, - bool ext, uint32_t broadcast) + bool ext, uint32_t broadcast, uint32_t ptp, bool deprecated) { struct device_addr *addr; int af = v6 ? AF_INET6 : AF_INET; @@ -107,22 +128,39 @@ parse_addr(struct interface *iface, const char *str, bool v6, int mask, 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 (ptp) + addr->point_to_point = ptp; + + 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, + uint32_t ptp, bool deprecated) { struct blob_attr *cur; int n_addr = 0; @@ -134,7 +172,7 @@ parse_static_address_option(struct interface *iface, struct blob_attr *attr, n_addr++; if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext, - broadcast)) + broadcast, ptp, deprecated)) return -1; } @@ -208,6 +246,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; @@ -246,6 +287,9 @@ parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6) 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); @@ -254,6 +298,7 @@ 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) { @@ -270,7 +315,7 @@ static bool 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); @@ -367,8 +412,9 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr) struct blob_attr *cur; const char *error; unsigned int netmask = 32; + bool ip6deprecated; int n_v4 = 0, n_v6 = 0; - struct in_addr bcast = {}; + struct in_addr bcast = {}, ptp = {}; blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr)); @@ -387,13 +433,22 @@ proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr) } } + if ((cur = tb[OPT_PTPADDR])) { + if (!inet_pton(AF_INET, blobmsg_data(cur), &ptp)) { + error = "INVALID_PTPADDR"; + goto error; + } + } + + 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, ptp.s_addr, false); if ((cur = tb[OPT_IP6ADDR])) n_v6 = parse_static_address_option(iface, cur, true, - 128, false, 0); + 128, false, 0, 0, ip6deprecated); if ((cur = tb[OPT_IP6PREFIX])) if (parse_prefix_list(iface, cur) < 0) @@ -497,6 +552,9 @@ default_proto_attach(const struct proto_handler *h, struct interface_proto_state *proto; proto = calloc(1, sizeof(*proto)); + if (!proto) + return NULL; + proto->free = default_proto_free; proto->cb = no_proto_handler; @@ -530,8 +588,25 @@ 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 && 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); } } @@ -559,16 +634,20 @@ void 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 @@ -589,6 +668,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; }