X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=system-linux.c;h=fcd1b2e5594f034dbeccfe06f55d2848938d531e;hb=650758b16e5185505a3fbc1307949340af70b611;hp=944245cc00122af5fdf3becba92874dd2752ab55;hpb=1488a64acb77f721fc10d90b0453d95b488460e1;p=project%2Fnetifd.git diff --git a/system-linux.c b/system-linux.c index 944245c..fcd1b2e 100644 --- a/system-linux.c +++ b/system-linux.c @@ -44,10 +44,6 @@ #define RTN_FAILED_POLICY 12 #endif -#ifndef RT_TABLE_PRELOCAL -#define RT_TABLE_PRELOCAL 128 -#endif - #ifndef IFA_F_NOPREFIXROUTE #define IFA_F_NOPREFIXROUTE 0x200 #endif @@ -56,7 +52,6 @@ #define IFA_FLAGS (IFA_MULTICAST + 1) #endif - #include #include #include @@ -310,6 +305,16 @@ static void system_set_neigh6reachabletime(struct device *dev, const char *val) system_set_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/base_reachable_time_ms", dev->ifname, val); } +static void system_set_neigh4gcstaletime(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/gc_stale_time", dev->ifname, val); +} + +static void system_set_neigh6gcstaletime(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/gc_stale_time", dev->ifname, val); +} + static void system_set_dadtransmits(struct device *dev, const char *val) { system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits", dev->ifname, val); @@ -320,11 +325,82 @@ static void system_bridge_set_multicast_to_unicast(struct device *dev, const cha system_set_dev_sysctl("/sys/class/net/%s/brport/multicast_to_unicast", dev->ifname, val); } +static void system_bridge_set_multicast_fast_leave(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/class/net/%s/brport/multicast_fast_leave", dev->ifname, val); +} + static void system_bridge_set_hairpin_mode(struct device *dev, const char *val) { system_set_dev_sysctl("/sys/class/net/%s/brport/hairpin_mode", dev->ifname, val); } +static void system_bridge_set_multicast_router(struct device *dev, const char *val, bool bridge) +{ + system_set_dev_sysctl(bridge ? "/sys/class/net/%s/bridge/multicast_router" : + "/sys/class/net/%s/brport/multicast_router", + dev->ifname, val); +} + +static void system_bridge_set_robustness(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_startup_query_count", + dev->ifname, val); + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_last_member_count", + dev->ifname, val); +} + +static void system_bridge_set_query_interval(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_query_interval", + dev->ifname, val); +} + +static void system_bridge_set_query_response_interval(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_query_response_interval", + dev->ifname, val); +} + +static void system_bridge_set_last_member_interval(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_last_member_interval", + dev->ifname, val); +} + +static void system_bridge_set_membership_interval(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_membership_interval", + dev->ifname, val); +} + +static void system_bridge_set_other_querier_timeout(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_querier_interval", + dev->ifname, val); +} + +static void system_bridge_set_startup_query_interval(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_startup_query_interval", + dev->ifname, val); +} + +static void system_bridge_set_learning(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/class/net/%s/brport/learning", dev->ifname, val); +} + +static void system_bridge_set_unicast_flood(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/sys/class/net/%s/brport/unicast_flood", dev->ifname, val); +} + +static void system_set_sendredirects(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/send_redirects", dev->ifname, val); +} + static int system_get_sysctl(const char *path, char *buf, const size_t buf_sz) { int fd = -1, ret = -1; @@ -395,12 +471,30 @@ static int system_get_neigh6reachabletime(struct device *dev, char *buf, const s dev->ifname, buf, buf_sz); } +static int system_get_neigh4gcstaletime(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv4/neigh/%s/gc_stale_time", + dev->ifname, buf, buf_sz); +} + +static int system_get_neigh6gcstaletime(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv6/neigh/%s/gc_stale_time", + dev->ifname, buf, buf_sz); +} + static int system_get_dadtransmits(struct device *dev, char *buf, const size_t buf_sz) { return system_get_dev_sysctl("/proc/sys/net/ipv6/conf/%s/dad_transmits", dev->ifname, buf, buf_sz); } +static int system_get_sendredirects(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/send_redirects", + dev->ifname, buf, buf_sz); +} + // Evaluate netlink messages static int cb_rtnl_event(struct nl_msg *msg, void *arg) { @@ -416,8 +510,8 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg) if (!nla[IFLA_IFNAME]) goto out; - struct device *dev = device_get(nla_data(nla[IFLA_IFNAME]), false); - if (!dev || dev->type->keep_link_status) + struct device *dev = device_find(nla_data(nla[IFLA_IFNAME])); + if (!dev) goto out; if (!system_get_dev_sysctl("/sys/class/net/%s/carrier", dev->ifname, buf, sizeof(buf))) @@ -469,7 +563,7 @@ handle_hotplug_msg(char *data, int size) return; found: - dev = device_get(interface, false); + dev = device_find(interface); if (!dev) return; @@ -569,7 +663,7 @@ static char *system_get_bridge(const char *name, char *buf, int buflen) static void system_bridge_set_wireless(struct device *bridge, struct device *dev) { - bool mcast_to_ucast = true; + bool mcast_to_ucast = dev->wireless_ap; bool hairpin = true; if (bridge->settings.flags & DEV_OPT_MULTICAST_TO_UNICAST && @@ -585,6 +679,7 @@ system_bridge_set_wireless(struct device *bridge, struct device *dev) int system_bridge_addif(struct device *bridge, struct device *dev) { + char buf[64]; char *oldbr; int ret = 0; @@ -595,6 +690,23 @@ int system_bridge_addif(struct device *bridge, struct device *dev) if (dev->wireless) system_bridge_set_wireless(bridge, dev); + if (dev->settings.flags & DEV_OPT_MULTICAST_ROUTER) { + snprintf(buf, sizeof(buf), "%i", dev->settings.multicast_router); + system_bridge_set_multicast_router(dev, buf, false); + } + + if (dev->settings.flags & DEV_OPT_MULTICAST_FAST_LEAVE && + dev->settings.multicast_fast_leave) + system_bridge_set_multicast_fast_leave(dev, "1"); + + if (dev->settings.flags & DEV_OPT_LEARNING && + !dev->settings.learning) + system_bridge_set_learning(dev, "0"); + + if (dev->settings.flags & DEV_OPT_UNICAST_FLOOD && + !dev->settings.unicast_flood) + system_bridge_set_unicast_flood(dev, "0"); + return ret; } @@ -819,6 +931,80 @@ sec_to_jiffies(int val) return (unsigned long) val * 100; } +static void system_bridge_conf_multicast_deps(struct device *bridge, + struct bridge_config *cfg, + char *buf, + int buf_len) +{ + int val; + + if (cfg->flags & BRIDGE_OPT_ROBUSTNESS || + cfg->flags & BRIDGE_OPT_QUERY_INTERVAL || + cfg->flags & BRIDGE_OPT_QUERY_RESPONSE_INTERVAL) { + val = cfg->robustness * cfg->query_interval + + cfg->query_response_interval; + + snprintf(buf, buf_len, "%i", val); + system_bridge_set_membership_interval(bridge, buf); + + val = cfg->robustness * cfg->query_interval + + cfg->query_response_interval / 2; + + snprintf(buf, buf_len, "%i", val); + system_bridge_set_other_querier_timeout(bridge, buf); + } + + if (cfg->flags & BRIDGE_OPT_QUERY_INTERVAL) { + val = cfg->query_interval / 4; + + snprintf(buf, buf_len, "%i", val); + system_bridge_set_startup_query_interval(bridge, buf); + } +} + +static void system_bridge_conf_multicast(struct device *bridge, + struct bridge_config *cfg, + char *buf, + int buf_len) +{ + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_snooping", + bridge->ifname, cfg->igmp_snoop ? "1" : "0"); + + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_querier", + bridge->ifname, cfg->multicast_querier ? "1" : "0"); + + snprintf(buf, buf_len, "%i", cfg->hash_max); + system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/hash_max", + bridge->ifname, buf); + + if (bridge->settings.flags & DEV_OPT_MULTICAST_ROUTER) { + snprintf(buf, buf_len, "%i", bridge->settings.multicast_router); + system_bridge_set_multicast_router(bridge, buf, true); + } + + if (cfg->flags & BRIDGE_OPT_ROBUSTNESS) { + snprintf(buf, buf_len, "%i", cfg->robustness); + system_bridge_set_robustness(bridge, buf); + } + + if (cfg->flags & BRIDGE_OPT_QUERY_INTERVAL) { + snprintf(buf, buf_len, "%i", cfg->query_interval); + system_bridge_set_query_interval(bridge, buf); + } + + if (cfg->flags & BRIDGE_OPT_QUERY_RESPONSE_INTERVAL) { + snprintf(buf, buf_len, "%i", cfg->query_response_interval); + system_bridge_set_query_response_interval(bridge, buf); + } + + if (cfg->flags & BRIDGE_OPT_LAST_MEMBER_INTERVAL) { + snprintf(buf, buf_len, "%i", cfg->last_member_interval); + system_bridge_set_last_member_interval(bridge, buf); + } + + system_bridge_conf_multicast_deps(bridge, cfg, buf, buf_len); +} + int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg) { char buf[64]; @@ -835,15 +1021,7 @@ int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg) args[1] = sec_to_jiffies(cfg->forward_delay); system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args); - system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_snooping", - bridge->ifname, cfg->igmp_snoop ? "1" : "0"); - - system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/multicast_querier", - bridge->ifname, cfg->multicast_querier ? "1" : "0"); - - snprintf(buf, sizeof(buf), "%i", cfg->hash_max); - system_set_dev_sysctl("/sys/devices/virtual/net/%s/bridge/hash_max", - bridge->ifname, buf); + system_bridge_conf_multicast(bridge, cfg, buf, sizeof(buf)); args[0] = BRCTL_SET_BRIDGE_PRIORITY; args[1] = cfg->priority; @@ -1035,7 +1213,7 @@ int system_vlandev_del(struct device *vlandev) return system_link_del(vlandev->ifname); } -static void +void system_if_get_settings(struct device *dev, struct device_settings *s) { struct ifreq ifr; @@ -1071,6 +1249,9 @@ system_if_get_settings(struct device *dev, struct device_settings *s) if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) == 0) { s->promisc = ifr.ifr_flags & IFF_PROMISC; s->flags |= DEV_OPT_PROMISC; + + s->multicast = ifr.ifr_flags & IFF_MULTICAST; + s->flags |= DEV_OPT_MULTICAST; } if (!system_get_rpfilter(dev, buf, sizeof(buf))) { @@ -1103,10 +1284,25 @@ system_if_get_settings(struct device *dev, struct device_settings *s) s->flags |= DEV_OPT_NEIGHREACHABLETIME; } + if (!system_get_neigh4gcstaletime(dev, buf, sizeof(buf))) { + s->neigh4gcstaletime = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_NEIGHGCSTALETIME; + } + + if (!system_get_neigh6gcstaletime(dev, buf, sizeof(buf))) { + s->neigh6gcstaletime = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_NEIGHGCSTALETIME; + } + if (!system_get_dadtransmits(dev, buf, sizeof(buf))) { s->dadtransmits = strtoul(buf, NULL, 0); s->flags |= DEV_OPT_DADTRANSMITS; } + + if (!system_get_sendredirects(dev, buf, sizeof(buf))) { + s->sendredirects = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_SENDREDIRECTS; + } } static void @@ -1122,6 +1318,8 @@ system_if_set_rps_xps_val(const char *path, int val) snprintf(val_buf, sizeof(val_buf), "%x", val); for (i = 0; i < gl.gl_pathc; i++) system_set_sysctl(gl.gl_pathv[i], val_buf); + + globfree(&gl); } static void @@ -1195,10 +1393,23 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned snprintf(buf, sizeof(buf), "%d", s->neigh6reachabletime); system_set_neigh6reachabletime(dev, buf); } + if (s->flags & DEV_OPT_NEIGHGCSTALETIME & apply_mask) { + snprintf(buf, sizeof(buf), "%d", s->neigh4gcstaletime); + system_set_neigh4gcstaletime(dev, buf); + snprintf(buf, sizeof(buf), "%d", s->neigh6gcstaletime); + system_set_neigh6gcstaletime(dev, buf); + } if (s->flags & DEV_OPT_DADTRANSMITS & apply_mask) { snprintf(buf, sizeof(buf), "%d", s->dadtransmits); system_set_dadtransmits(dev, buf); } + if (s->flags & DEV_OPT_MULTICAST & apply_mask) { + if (system_if_flags(dev->ifname, s->multicast ? IFF_MULTICAST : 0, + !s->multicast ? IFF_MULTICAST : 0) < 0) + s->flags &= ~DEV_OPT_MULTICAST; + } + if (s->flags & DEV_OPT_SENDREDIRECTS & apply_mask) + system_set_sendredirects(dev, s->sendredirects ? "1" : "0"); system_if_apply_rps_xps(dev, s); } @@ -1207,6 +1418,7 @@ int system_if_up(struct device *dev) { system_if_get_settings(dev, &dev->orig_settings); /* Only keep orig settings based on what needs to be set */ + dev->orig_settings.valid_flags = dev->orig_settings.flags; dev->orig_settings.flags &= dev->settings.flags; system_if_apply_settings(dev, &dev->settings, dev->settings.flags); return system_if_flags(dev->ifname, IFF_UP, 0); @@ -1277,10 +1489,13 @@ int system_if_check(struct device *dev) int ret = 1; msg = nlmsg_alloc_simple(RTM_GETLINK, 0); - if (!msg || nlmsg_append(msg, &ifi, sizeof(ifi), 0) || - nla_put_string(msg, IFLA_IFNAME, dev->ifname)) + if (!msg) goto out; + if (nlmsg_append(msg, &ifi, sizeof(ifi), 0) || + nla_put_string(msg, IFLA_IFNAME, dev->ifname)) + goto free; + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, cb_if_check_valid, &chk); nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, cb_if_check_ack, &chk); nl_cb_err(cb, NL_CB_CUSTOM, cb_if_check_error, &chk); @@ -1289,9 +1504,10 @@ int system_if_check(struct device *dev) while (chk.pending > 0) nl_recvmsgs(sock_rtnl, cb); - nlmsg_free(msg); ret = chk.pending; +free: + nlmsg_free(msg); out: nl_cb_put(cb); return ret; @@ -1514,8 +1730,10 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd) if (addr->valid_until) { int64_t valid = addr->valid_until - now; - if (valid <= 0) + if (valid <= 0) { + nlmsg_free(msg); return -1; + } else if (valid > UINT32_MAX) valid = UINT32_MAX; @@ -1563,7 +1781,7 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd) .rtm_dst_len = route->mask, .rtm_src_len = route->sourcemask, .rtm_table = (table < 256) ? table : RT_TABLE_UNSPEC, - .rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_STATIC, + .rtm_protocol = (route->flags & DEVROUTE_PROTO) ? route->proto : RTPROT_STATIC, .rtm_scope = RT_SCOPE_NOWHERE, .rtm_type = (cmd == RTM_DELROUTE) ? 0: RTN_UNICAST, .rtm_flags = (route->flags & DEVROUTE_ONLINK) ? RTNH_F_ONLINK : 0, @@ -1681,6 +1899,45 @@ bool system_resolve_rt_type(const char *type, unsigned int *id) return system_rtn_aton(type, id); } +bool system_resolve_rt_proto(const char *type, unsigned int *id) +{ + FILE *f; + char *e, buf[128]; + unsigned int n, proto = 256; + + if ((n = strtoul(type, &e, 0)) >= 0 && !*e && e != type) + proto = n; + else if (!strcmp(type, "unspec")) + proto = RTPROT_UNSPEC; + else if (!strcmp(type, "kernel")) + proto = RTPROT_KERNEL; + else if (!strcmp(type, "boot")) + proto = RTPROT_BOOT; + else if (!strcmp(type, "static")) + proto = RTPROT_STATIC; + else if ((f = fopen("/etc/iproute2/rt_protos", "r")) != NULL) { + while (fgets(buf, sizeof(buf) - 1, f) != NULL) { + if ((e = strtok(buf, " \t\n")) == NULL || *e == '#') + continue; + + n = strtoul(e, NULL, 10); + e = strtok(NULL, " \t\n"); + + if (e && !strcmp(e, type)) { + proto = n; + break; + } + } + fclose(f); + } + + if (proto > 255) + return false; + + *id = proto; + return true; +} + bool system_resolve_rt_table(const char *name, unsigned int *id) { FILE *f; @@ -1698,8 +1955,6 @@ bool system_resolve_rt_table(const char *name, unsigned int *id) table = RT_TABLE_MAIN; else if (!strcmp(name, "local")) table = RT_TABLE_LOCAL; - else if (!strcmp(name, "prelocal")) - table = RT_TABLE_PRELOCAL; /* try to look up name in /etc/iproute2/rt_tables */ else if ((f = fopen("/etc/iproute2/rt_tables", "r")) != NULL) @@ -1767,10 +2022,8 @@ static int system_iprule(struct iprule *rule, int cmd) .rtm_flags = 0, }; - if (cmd == RTM_NEWRULE) { + if (cmd == RTM_NEWRULE) rtm.rtm_type = RTN_UNICAST; - rtm.rtm_flags |= NLM_F_REPLACE | NLM_F_EXCL; - } if (rule->invert) rtm.rtm_flags |= FIB_RULE_INVERT; @@ -1861,10 +2114,6 @@ int system_flush_iprules(void) rule.flags = IPRULE_INET4 | IPRULE_PRIORITY | IPRULE_LOOKUP; rule.priority = 0; - rule.lookup = RT_TABLE_PRELOCAL; - rv |= system_iprule(&rule, RTM_NEWRULE); - - rule.priority = 1; rule.lookup = RT_TABLE_LOCAL; rv |= system_iprule(&rule, RTM_NEWRULE); @@ -1880,10 +2129,6 @@ int system_flush_iprules(void) rule.flags = IPRULE_INET6 | IPRULE_PRIORITY | IPRULE_LOOKUP; rule.priority = 0; - rule.lookup = RT_TABLE_PRELOCAL; - rv |= system_iprule(&rule, RTM_NEWRULE); - - rule.priority = 1; rule.lookup = RT_TABLE_LOCAL; rv |= system_iprule(&rule, RTM_NEWRULE); @@ -1938,7 +2183,7 @@ static int system_add_gre_tunnel(const char *name, const char *kind, uint32_t ikey = 0, okey = 0, flags = 0, flowinfo = 0; uint16_t iflags = 0, oflags = 0; uint8_t tos = 0; - int ret = 0, ttl = 64; + int ret = 0, ttl = 0; nlm = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE); if (!nlm) @@ -1966,8 +2211,6 @@ static int system_add_gre_tunnel(const char *name, const char *kind, if ((cur = tb[TUNNEL_ATTR_TTL])) ttl = blobmsg_get_u32(cur); - nla_put_u8(nlm, IFLA_GRE_TTL, ttl); - if ((cur = tb[TUNNEL_ATTR_TOS])) { char *str = blobmsg_get_string(cur); if (strcmp(str, "inherit")) { @@ -2041,6 +2284,9 @@ static int system_add_gre_tunnel(const char *name, const char *kind, if (flags) nla_put_u32(nlm, IFLA_GRE_FLAGS, flags); + + if (!ttl) + ttl = 64; } else { struct in_addr inbuf; bool set_df = true; @@ -2076,17 +2322,23 @@ static int system_add_gre_tunnel(const char *name, const char *kind, if ((cur = tb[TUNNEL_ATTR_DF])) set_df = blobmsg_get_bool(cur); - /* ttl !=0 and nopmtudisc are incompatible */ - if (ttl && !set_df) { - ret = -EINVAL; - goto failure; - } + if (!set_df) { + /* ttl != 0 and nopmtudisc are incompatible */ + if (ttl) { + ret = -EINVAL; + goto failure; + } + } else if (!ttl) + ttl = 64; nla_put_u8(nlm, IFLA_GRE_PMTUDISC, set_df ? 1 : 0); nla_put_u8(nlm, IFLA_GRE_TOS, tos); } + if (ttl) + nla_put_u8(nlm, IFLA_GRE_TTL, ttl); + if (oflags) nla_put_u16(nlm, IFLA_GRE_OFLAGS, oflags); @@ -2110,6 +2362,103 @@ failure: } #endif +#ifdef IFLA_VTI_MAX +static int system_add_vti_tunnel(const char *name, const char *kind, + const unsigned int link, struct blob_attr **tb, bool v6) +{ + struct nl_msg *nlm; + struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC, }; + struct blob_attr *cur; + uint32_t ikey = 0, okey = 0; + int ret = 0; + + nlm = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE); + if (!nlm) + return -1; + + nlmsg_append(nlm, &ifi, sizeof(ifi), 0); + nla_put_string(nlm, IFLA_IFNAME, name); + + struct nlattr *linkinfo = nla_nest_start(nlm, IFLA_LINKINFO); + if (!linkinfo) { + ret = -ENOMEM; + goto failure; + } + + nla_put_string(nlm, IFLA_INFO_KIND, kind); + struct nlattr *infodata = nla_nest_start(nlm, IFLA_INFO_DATA); + if (!infodata) { + ret = -ENOMEM; + goto failure; + } + + if (link) + nla_put_u32(nlm, IFLA_VTI_LINK, link); + + if ((cur = tb[TUNNEL_ATTR_INFO]) && (blobmsg_type(cur) == BLOBMSG_TYPE_STRING)) { + if (sscanf(blobmsg_get_string(cur), "%u,%u", + &ikey, &okey) < 2) { + ret = -EINVAL; + goto failure; + } + } + + if (v6) { + struct in6_addr in6buf; + if ((cur = tb[TUNNEL_ATTR_LOCAL])) { + if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1) { + ret = -EINVAL; + goto failure; + } + nla_put(nlm, IFLA_VTI_LOCAL, sizeof(in6buf), &in6buf); + } + + if ((cur = tb[TUNNEL_ATTR_REMOTE])) { + if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1) { + ret = -EINVAL; + goto failure; + } + nla_put(nlm, IFLA_VTI_REMOTE, sizeof(in6buf), &in6buf); + } + + } else { + struct in_addr inbuf; + + if ((cur = tb[TUNNEL_ATTR_LOCAL])) { + if (inet_pton(AF_INET, blobmsg_data(cur), &inbuf) < 1) { + ret = -EINVAL; + goto failure; + } + nla_put(nlm, IFLA_VTI_LOCAL, sizeof(inbuf), &inbuf); + } + + if ((cur = tb[TUNNEL_ATTR_REMOTE])) { + if (inet_pton(AF_INET, blobmsg_data(cur), &inbuf) < 1) { + ret = -EINVAL; + goto failure; + } + nla_put(nlm, IFLA_VTI_REMOTE, sizeof(inbuf), &inbuf); + } + + } + + if (okey) + nla_put_u32(nlm, IFLA_VTI_OKEY, htonl(okey)); + + if (ikey) + nla_put_u32(nlm, IFLA_VTI_IKEY, htonl(ikey)); + + nla_nest_end(nlm, infodata); + nla_nest_end(nlm, linkinfo); + + return system_rtnl_call(nlm); + +failure: + nlmsg_free(nlm); + return ret; +} +#endif + static int system_add_proto_tunnel(const char *name, const uint8_t proto, const unsigned int link, struct blob_attr **tb) { struct blob_attr *cur; @@ -2178,7 +2527,8 @@ static int __system_del_ip_tunnel(const char *name, struct blob_attr **tb) str = blobmsg_data(cur); if (!strcmp(str, "greip") || !strcmp(str, "gretapip") || - !strcmp(str, "greip6") || !strcmp(str, "gretapip6")) + !strcmp(str, "greip6") || !strcmp(str, "gretapip6") || + !strcmp(str, "vtiip") || !strcmp(str, "vtiip6")) return system_link_del(name); else return tunnel_ioctl(name, SIOCDELTUNNEL, NULL); @@ -2198,10 +2548,14 @@ int system_update_ipv6_mtu(struct device *dev, int mtu) { int ret = -1; char buf[64]; + int fd; + snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/conf/%s/mtu", dev->ifname); - int fd = open(buf, O_RDWR); + fd = open(buf, O_RDWR); + if (fd < 0) + return ret; if (!mtu) { ssize_t len = read(fd, buf, sizeof(buf) - 1); @@ -2392,6 +2746,12 @@ failure: return system_add_gre_tunnel(name, "ip6gre", link, tb, true); } else if (!strcmp(str, "gretapip6")) { return system_add_gre_tunnel(name, "ip6gretap", link, tb, true); +#ifdef IFLA_VTI_MAX + } else if (!strcmp(str, "vtiip")) { + return system_add_vti_tunnel(name, "vti", link, tb, false); + } else if (!strcmp(str, "vtiip6")) { + return system_add_vti_tunnel(name, "vti6", link, tb, true); +#endif #endif } else if (!strcmp(str, "ipip")) { return system_add_proto_tunnel(name, IPPROTO_IPIP, link, tb);