X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=4737fa6e2c7083185af760c0e5142afb0175ece1;hp=8f612c99638530fca734356efd750c7a8ab317d0;hb=fb2f843edf44c6f12b636cd82cdd1c71e953495f;hpb=65cab45660dd0b234b663a39a133c64271f667b7 diff --git a/system-linux.c b/system-linux.c index 8f612c9..4737fa6 100644 --- a/system-linux.c +++ b/system-linux.c @@ -204,6 +204,18 @@ system_rtn_aton(const char *src, unsigned int *dst) return true; } +static bool +system_tos_aton(const char *src, unsigned *dst) +{ + char *e; + + *dst = strtoul(src, &e, 16); + if (e == src || *e || *dst > 255) + return false; + + return true; +} + int system_init(void) { static struct event_socket rtnl_event; @@ -253,6 +265,26 @@ static void system_set_disable_ipv6(struct device *dev, const char *val) system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/disable_ipv6", dev->ifname, val); } +static void system_set_rpfilter(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/rp_filter", dev->ifname, val); +} + +static void system_set_acceptlocal(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/accept_local", dev->ifname, val); +} + +static void system_set_igmpversion(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv4/conf/%s/force_igmp_version", dev->ifname, val); +} + +static void system_set_mldversion(struct device *dev, const char *val) +{ + system_set_dev_sysctl("/proc/sys/net/ipv6/conf/%s/force_mld_version", dev->ifname, val); +} + static int system_get_sysctl(const char *path, char *buf, const size_t buf_sz) { int fd = -1, ret = -1; @@ -287,9 +319,29 @@ static int system_get_disable_ipv6(struct device *dev, char *buf, const size_t b dev->ifname, buf, buf_sz); } -#ifndef IFF_LOWER_UP -#define IFF_LOWER_UP 0x10000 -#endif +static int system_get_rpfilter(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/rp_filter", + dev->ifname, buf, buf_sz); +} + +static int system_get_acceptlocal(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/accept_local", + dev->ifname, buf, buf_sz); +} + +static int system_get_igmpversion(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv4/conf/%s/force_igmp_version", + dev->ifname, buf, buf_sz); +} + +static int system_get_mldversion(struct device *dev, char *buf, const size_t buf_sz) +{ + return system_get_dev_sysctl("/proc/sys/net/ipv6/conf/%s/force_mld_version", + dev->ifname, buf, buf_sz); +} // Evaluate netlink messages static int cb_rtnl_event(struct nl_msg *msg, void *arg) @@ -297,6 +349,8 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg) struct nlmsghdr *nh = nlmsg_hdr(msg); struct ifinfomsg *ifi = NLMSG_DATA(nh); struct nlattr *nla[__IFLA_MAX]; + int link_state = 0; + char buf[10]; if (nh->nlmsg_type != RTM_NEWLINK) goto out; @@ -306,11 +360,13 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg) goto out; struct device *dev = device_get(nla_data(nla[IFLA_IFNAME]), false); - if (!dev) + if (!dev || dev->type->keep_link_status) goto out; - device_set_ifindex(dev, ifi->ifi_index); - device_set_link(dev, ifi->ifi_flags & IFF_LOWER_UP ? true : false); + if (!system_get_dev_sysctl("/sys/class/net/%s/carrier", dev->ifname, buf, sizeof(buf))) + link_state = strtoul(buf, NULL, 0); + + device_set_link(dev, link_state ? true : false); out: return 0; @@ -430,17 +486,18 @@ static bool system_is_bridge(const char *name, char *buf, int buflen) static char *system_get_bridge(const char *name, char *buf, int buflen) { char *path; - ssize_t len; + ssize_t len = -1; glob_t gl; snprintf(buf, buflen, "/sys/devices/virtual/net/*/brif/%s/bridge", name); if (glob(buf, GLOB_NOSORT, NULL, &gl) < 0) return NULL; - if (gl.gl_pathc == 0) - return NULL; + if (gl.gl_pathc > 0) + len = readlink(gl.gl_pathv[0], buf, buflen); + + globfree(&gl); - len = readlink(gl.gl_pathv[0], buf, buflen); if (len < 0) return NULL; @@ -452,15 +509,27 @@ static char *system_get_bridge(const char *name, char *buf, int buflen) return path + 1; } +static void system_bridge_set_wireless(const char *bridge, const char *dev) +{ + snprintf(dev_buf, sizeof(dev_buf), + "/sys/devices/virtual/net/%s/brif/%s/multicast_to_unicast", + bridge, dev); + system_set_sysctl(dev_buf, "1"); +} + int system_bridge_addif(struct device *bridge, struct device *dev) { char *oldbr; + int ret = 0; oldbr = system_get_bridge(dev->ifname, dev_buf, sizeof(dev_buf)); - if (oldbr && !strcmp(oldbr, bridge->ifname)) - return 0; + if (!oldbr || strcmp(oldbr, bridge->ifname) != 0) + ret = system_bridge_if(bridge->ifname, dev, SIOCBRADDIF, NULL); + + if (dev->wireless) + system_bridge_set_wireless(bridge->ifname, dev->ifname); - return system_bridge_if(bridge->ifname, dev, SIOCBRADDIF, NULL); + return ret; } int system_bridge_delif(struct device *bridge, struct device *dev) @@ -468,7 +537,7 @@ int system_bridge_delif(struct device *bridge, struct device *dev) return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF, NULL); } -static int system_if_resolve(struct device *dev) +int system_if_resolve(struct device *dev) { struct ifreq ifr; strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name)); @@ -702,6 +771,9 @@ int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg) 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->igmp_snoop ? "1" : "0"); + args[0] = BRCTL_SET_BRIDGE_PRIORITY; args[1] = cfg->priority; system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args); @@ -732,7 +804,6 @@ int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvla struct nl_msg *msg; struct nlattr *linkinfo, *data; struct ifinfomsg iim = { .ifi_family = AF_UNSPEC, }; - int ifindex = system_if_resolve(dev); int i, rv; static const struct { const char *name; @@ -744,9 +815,6 @@ int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvla { "passthru", MACVLAN_MODE_PASSTHRU }, }; - if (ifindex == 0) - return -ENOENT; - msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); if (!msg) @@ -757,7 +825,7 @@ int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvla if (cfg->flags & MACVLAN_OPT_MACADDR) nla_put(msg, IFLA_ADDRESS, sizeof(cfg->macaddr), cfg->macaddr); nla_put_string(msg, IFLA_IFNAME, macvlan->ifname); - nla_put_u32(msg, IFLA_LINK, ifindex); + nla_put_u32(msg, IFLA_LINK, dev->ifindex); if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO))) goto nla_put_failure; @@ -791,7 +859,7 @@ nla_put_failure: return -ENOMEM; } -static int system_link_del(struct device *dev) +static int system_link_del(const char *ifname) { struct nl_msg *msg; struct ifinfomsg iim = { @@ -805,13 +873,13 @@ static int system_link_del(struct device *dev) return -1; nlmsg_append(msg, &iim, sizeof(iim), 0); - nla_put_string(msg, IFLA_IFNAME, dev->ifname); + nla_put_string(msg, IFLA_IFNAME, ifname); return system_rtnl_call(msg); } int system_macvlan_del(struct device *macvlan) { - return system_link_del(macvlan); + return system_link_del(macvlan->ifname); } static int system_vlan(struct device *dev, int id) @@ -849,12 +917,8 @@ int system_vlandev_add(struct device *vlandev, struct device *dev, struct vlande struct nl_msg *msg; struct nlattr *linkinfo, *data; struct ifinfomsg iim = { .ifi_family = AF_UNSPEC }; - int ifindex = system_if_resolve(dev); int rv; - if (ifindex == 0) - return -ENOENT; - msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); if (!msg) @@ -862,7 +926,7 @@ int system_vlandev_add(struct device *vlandev, struct device *dev, struct vlande nlmsg_append(msg, &iim, sizeof(iim), 0); nla_put_string(msg, IFLA_IFNAME, vlandev->ifname); - nla_put_u32(msg, IFLA_LINK, ifindex); + nla_put_u32(msg, IFLA_LINK, dev->ifindex); if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO))) goto nla_put_failure; @@ -897,7 +961,7 @@ nla_put_failure: int system_vlandev_del(struct device *vlandev) { - return system_link_del(vlandev); + return system_link_del(vlandev->ifname); } static void @@ -928,6 +992,31 @@ system_if_get_settings(struct device *dev, struct device_settings *s) s->ipv6 = !strtoul(buf, NULL, 0); s->flags |= DEV_OPT_IPV6; } + + if (ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr) == 0) { + s->promisc = ifr.ifr_flags & IFF_PROMISC; + s->flags |= DEV_OPT_PROMISC; + } + + if (!system_get_rpfilter(dev, buf, sizeof(buf))) { + s->rpfilter = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_RPFILTER; + } + + if (!system_get_acceptlocal(dev, buf, sizeof(buf))) { + s->acceptlocal = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_ACCEPTLOCAL; + } + + if (!system_get_igmpversion(dev, buf, sizeof(buf))) { + s->igmpversion = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_IGMPVERSION; + } + + if (!system_get_mldversion(dev, buf, sizeof(buf))) { + s->mldversion = strtoul(buf, NULL, 0); + s->flags |= DEV_OPT_MLDVERSION; + } } void @@ -958,20 +1047,45 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned } if (s->flags & DEV_OPT_IPV6 & apply_mask) system_set_disable_ipv6(dev, s->ipv6 ? "0" : "1"); + if (s->flags & DEV_OPT_PROMISC & apply_mask) { + if (system_if_flags(dev->ifname, s->promisc ? IFF_PROMISC : 0, + !s->promisc ? IFF_PROMISC : 0) < 0) + s->flags &= ~DEV_OPT_PROMISC; + } + if (s->flags & DEV_OPT_RPFILTER & apply_mask) { + char buf[2]; + + snprintf(buf, sizeof(buf), "%d", s->rpfilter); + system_set_rpfilter(dev, buf); + } + if (s->flags & DEV_OPT_ACCEPTLOCAL & apply_mask) + system_set_acceptlocal(dev, s->acceptlocal ? "1" : "0"); + if (s->flags & DEV_OPT_IGMPVERSION & apply_mask) { + char buf[2]; + + snprintf(buf, sizeof(buf), "%d", s->igmpversion); + system_set_igmpversion(dev, buf); + } + if (s->flags & DEV_OPT_MLDVERSION & apply_mask) { + char buf[2]; + + snprintf(buf, sizeof(buf), "%d", s->mldversion); + system_set_mldversion(dev, buf); + } } 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.flags &= dev->settings.flags; system_if_apply_settings(dev, &dev->settings, dev->settings.flags); - device_set_ifindex(dev, system_if_resolve(dev)); return system_if_flags(dev->ifname, IFF_UP, 0); } int system_if_down(struct device *dev) { int ret = system_if_flags(dev->ifname, 0, IFF_UP); - dev->orig_settings.flags &= dev->settings.flags; system_if_apply_settings(dev, &dev->orig_settings, dev->orig_settings.flags); return ret; } @@ -982,6 +1096,10 @@ struct if_check_data { int ret; }; +#ifndef IFF_LOWER_UP +#define IFF_LOWER_UP 0x10000 +#endif + static int cb_if_check_valid(struct nl_msg *msg, void *arg) { struct nlmsghdr *nh = nlmsg_hdr(msg); @@ -1339,11 +1457,16 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd) rtm.rtm_table = RT_TABLE_LOCAL; } - if (rtm.rtm_type == RTN_LOCAL || rtm.rtm_type == RTN_NAT) + if (rtm.rtm_type == RTN_LOCAL || rtm.rtm_type == RTN_NAT) { rtm.rtm_scope = RT_SCOPE_HOST; - else if (rtm.rtm_type == RTN_BROADCAST || rtm.rtm_type == RTN_MULTICAST || - rtm.rtm_type == RTN_ANYCAST) + } else if (rtm.rtm_type == RTN_BROADCAST || rtm.rtm_type == RTN_MULTICAST || + rtm.rtm_type == RTN_ANYCAST) { rtm.rtm_scope = RT_SCOPE_LINK; + } else if (rtm.rtm_type == RTN_BLACKHOLE || rtm.rtm_type == RTN_UNREACHABLE || + rtm.rtm_type == RTN_PROHIBIT || rtm.rtm_type == RTN_FAILED_POLICY) { + rtm.rtm_scope = RT_SCOPE_UNIVERSE; + dev = NULL; + } } msg = nlmsg_alloc_simple(cmd, flags); @@ -1355,8 +1478,12 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd) if (route->mask) nla_put(msg, RTA_DST, alen, &route->addr); - if (route->sourcemask) - nla_put(msg, RTA_SRC, alen, &route->source); + if (route->sourcemask) { + if (rtm.rtm_family == AF_INET) + nla_put(msg, RTA_PREFSRC, alen, &route->source); + else + nla_put(msg, RTA_SRC, alen, &route->source); + } if (route->metric > 0) nla_put_u32(msg, RTA_PRIORITY, route->metric); @@ -1464,14 +1591,34 @@ bool system_resolve_rt_table(const char *name, unsigned int *id) if (table == RT_TABLE_UNSPEC) return false; - /* do not consider main table special */ - if (table == RT_TABLE_MAIN) - table = RT_TABLE_UNSPEC; - *id = table; return true; } +bool system_is_default_rt_table(unsigned int id) +{ + return (id == RT_TABLE_MAIN); +} + +bool system_resolve_rpfilter(const char *filter, unsigned int *id) +{ + char *e; + unsigned int n; + + if (!strcmp(filter, "strict")) + n = 1; + else if (!strcmp(filter, "loose")) + n = 2; + else { + n = strtoul(filter, &e, 0); + if (*e || e == filter || n > 2) + return false; + } + + *id = n; + return true; +} + static int system_iprule(struct iprule *rule, int cmd) { int alen = ((rule->flags & IPRULE_FAMILY) == IPRULE_INET4) ? 4 : 16; @@ -1638,9 +1785,271 @@ static int tunnel_ioctl(const char *name, int cmd, void *p) return ioctl(sock_ioctl, cmd, &ifr); } -int system_del_ip_tunnel(const char *name) +#ifdef IFLA_IPTUN_MAX +#define IP6_FLOWINFO_TCLASS htonl(0x0FF00000) +static int system_add_gre_tunnel(const char *name, const char *kind, + const unsigned int link, struct blob_attr **tb, bool v6) { - return tunnel_ioctl(name, SIOCDELTUNNEL, NULL); + struct nl_msg *nlm; + struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC, }; + struct blob_attr *cur; + 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; + + 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_GRE_LINK, link); + + 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")) { + unsigned uval; + + if (!system_tos_aton(str, &uval)) { + ret = -EINVAL; + goto failure; + } + + if (v6) + flowinfo |= htonl(uval << 20) & IP6_FLOWINFO_TCLASS; + else + tos = uval; + } else { + if (v6) + flags |= IP6_TNL_F_USE_ORIG_TCLASS; + else + tos = 1; + } + } + + if ((cur = tb[TUNNEL_ATTR_INFO]) && (blobmsg_type(cur) == BLOBMSG_TYPE_STRING)) { + uint8_t icsum, ocsum, iseqno, oseqno; + if (sscanf(blobmsg_get_string(cur), "%u,%u,%hhu,%hhu,%hhu,%hhu", + &ikey, &okey, &icsum, &ocsum, &iseqno, &oseqno) < 6) { + ret = -EINVAL; + goto failure; + } + + if (ikey) + iflags |= GRE_KEY; + + if (okey) + oflags |= GRE_KEY; + + if (icsum) + iflags |= GRE_CSUM; + + if (ocsum) + oflags |= GRE_CSUM; + + if (iseqno) + iflags |= GRE_SEQ; + + if (oseqno) + oflags |= GRE_SEQ; + } + + 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_GRE_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_GRE_REMOTE, sizeof(in6buf), &in6buf); + } + nla_put_u8(nlm, IFLA_GRE_ENCAP_LIMIT, 4); + + if (flowinfo) + nla_put_u32(nlm, IFLA_GRE_FLOWINFO, flowinfo); + + if (flags) + nla_put_u32(nlm, IFLA_GRE_FLAGS, flags); + } else { + struct in_addr inbuf; + bool set_df = true; + + if ((cur = tb[TUNNEL_ATTR_LOCAL])) { + if (inet_pton(AF_INET, blobmsg_data(cur), &inbuf) < 1) { + ret = -EINVAL; + goto failure; + } + nla_put(nlm, IFLA_GRE_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_GRE_REMOTE, sizeof(inbuf), &inbuf); + + if (IN_MULTICAST(ntohl(inbuf.s_addr))) { + if (!okey) { + okey = inbuf.s_addr; + oflags |= GRE_KEY; + } + + if (!ikey) { + ikey = inbuf.s_addr; + iflags |= GRE_KEY; + } + } + } + + 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; + } + + nla_put_u8(nlm, IFLA_GRE_PMTUDISC, set_df ? 1 : 0); + + nla_put_u8(nlm, IFLA_GRE_TOS, tos); + } + + if (oflags) + nla_put_u16(nlm, IFLA_GRE_OFLAGS, oflags); + + if (iflags) + nla_put_u16(nlm, IFLA_GRE_IFLAGS, iflags); + + if (okey) + nla_put_u32(nlm, IFLA_GRE_OKEY, okey); + + if (ikey) + nla_put_u32(nlm, IFLA_GRE_IKEY, 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; + bool set_df = true; + struct ip_tunnel_parm p = { + .link = link, + .iph = { + .version = 4, + .ihl = 5, + .protocol = proto, + } + }; + + if ((cur = tb[TUNNEL_ATTR_LOCAL]) && + inet_pton(AF_INET, blobmsg_data(cur), &p.iph.saddr) < 1) + return -EINVAL; + + if ((cur = tb[TUNNEL_ATTR_REMOTE]) && + inet_pton(AF_INET, blobmsg_data(cur), &p.iph.daddr) < 1) + return -EINVAL; + + if ((cur = tb[TUNNEL_ATTR_DF])) + set_df = blobmsg_get_bool(cur); + + if ((cur = tb[TUNNEL_ATTR_TTL])) + p.iph.ttl = blobmsg_get_u32(cur); + + if ((cur = tb[TUNNEL_ATTR_TOS])) { + char *str = blobmsg_get_string(cur); + if (strcmp(str, "inherit")) { + unsigned uval; + + if (!system_tos_aton(str, &uval)) + return -EINVAL; + + p.iph.tos = uval; + } else + p.iph.tos = 1; + } + + p.iph.frag_off = set_df ? htons(IP_DF) : 0; + /* ttl !=0 and nopmtudisc are incompatible */ + if (p.iph.ttl && p.iph.frag_off == 0) + return -EINVAL; + + strncpy(p.name, name, sizeof(p.name)); + + switch (p.iph.protocol) { + case IPPROTO_IPIP: + return tunnel_ioctl("tunl0", SIOCADDTUNNEL, &p); + case IPPROTO_IPV6: + return tunnel_ioctl("sit0", SIOCADDTUNNEL, &p); + default: + break; + } + return -1; +} + +static int __system_del_ip_tunnel(const char *name, struct blob_attr **tb) +{ + struct blob_attr *cur; + const char *str; + + if (!(cur = tb[TUNNEL_ATTR_TYPE])) + return -EINVAL; + str = blobmsg_data(cur); + + if (!strcmp(str, "greip") || !strcmp(str, "gretapip") || + !strcmp(str, "greip6") || !strcmp(str, "gretapip6")) + return system_link_del(name); + else + return tunnel_ioctl(name, SIOCDELTUNNEL, NULL); +} + +int system_del_ip_tunnel(const char *name, struct blob_attr *attr) +{ + struct blob_attr *tb[__TUNNEL_ATTR_MAX]; + + blobmsg_parse(tunnel_attr_list.params, __TUNNEL_ATTR_MAX, tb, + blob_data(attr), blob_len(attr)); + + return __system_del_ip_tunnel(name, tb); } int system_update_ipv6_mtu(struct device *dev, int mtu) @@ -1674,25 +2083,21 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr) { struct blob_attr *tb[__TUNNEL_ATTR_MAX]; struct blob_attr *cur; - bool set_df = true; const char *str; - system_del_ip_tunnel(name); - blobmsg_parse(tunnel_attr_list.params, __TUNNEL_ATTR_MAX, tb, blob_data(attr), blob_len(attr)); + __system_del_ip_tunnel(name, tb); + if (!(cur = tb[TUNNEL_ATTR_TYPE])) return -EINVAL; str = blobmsg_data(cur); - if ((cur = tb[TUNNEL_ATTR_DF])) - set_df = blobmsg_get_bool(cur); - unsigned int ttl = 0; if ((cur = tb[TUNNEL_ATTR_TTL])) { ttl = blobmsg_get_u32(cur); - if (ttl > 255 || (!set_df && ttl)) + if (ttl > 255) return -EINVAL; } @@ -1707,27 +2112,7 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr) } if (!strcmp(str, "sit")) { - struct ip_tunnel_parm p = { - .link = link, - .iph = { - .version = 4, - .ihl = 5, - .frag_off = set_df ? htons(IP_DF) : 0, - .protocol = IPPROTO_IPV6, - .ttl = ttl - } - }; - - if ((cur = tb[TUNNEL_ATTR_LOCAL]) && - inet_pton(AF_INET, blobmsg_data(cur), &p.iph.saddr) < 1) - return -EINVAL; - - if ((cur = tb[TUNNEL_ATTR_REMOTE]) && - inet_pton(AF_INET, blobmsg_data(cur), &p.iph.daddr) < 1) - return -EINVAL; - - strncpy(p.name, name, sizeof(p.name)); - if (tunnel_ioctl("sit0", SIOCADDTUNNEL, &p) < 0) + if (system_add_proto_tunnel(name, IPPROTO_IPV6, link, tb) < 0) return -1; #ifdef SIOCADD6RD @@ -1750,11 +2135,12 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr) } if (tunnel_ioctl(name, SIOCADD6RD, &p6) < 0) { - system_del_ip_tunnel(name); + __system_del_ip_tunnel(name, tb); return -1; } } #endif +#ifdef IFLA_IPTUN_MAX } else if (!strcmp(str, "ipip6")) { struct nl_msg *nlm = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE); @@ -1857,6 +2243,17 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr) failure: nlmsg_free(nlm); return ret; + } else if (!strcmp(str, "greip")) { + return system_add_gre_tunnel(name, "gre", link, tb, false); + } else if (!strcmp(str, "gretapip")) { + return system_add_gre_tunnel(name, "gretap", link, tb, false); + } else if (!strcmp(str, "greip6")) { + 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); +#endif + } else if (!strcmp(str, "ipip")) { + return system_add_proto_tunnel(name, IPPROTO_IPIP, link, tb); } else return -EINVAL;