X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=7ae9e27c92f16d96776f1af2bcd2f94452d3acdf;hp=c4d89be1e5060192fdd0e9f76f4a68fbc9fc2667;hb=5a4eb870afc69e9fa93fdccb8a42f75e8e357f4e;hpb=b965453c9df60f1c2681c3bfb7e8cff671c4b223 diff --git a/system-linux.c b/system-linux.c index c4d89be..7ae9e27 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; @@ -310,7 +322,8 @@ static int cb_rtnl_event(struct nl_msg *msg, void *arg) goto out; device_set_ifindex(dev, ifi->ifi_index); - device_set_link(dev, ifi->ifi_flags & IFF_LOWER_UP ? true : false); + if (!dev->type->keep_link_status) + device_set_link(dev, ifi->ifi_flags & IFF_LOWER_UP ? true : false); out: return 0; @@ -1665,14 +1678,16 @@ static int tunnel_ioctl(const char *name, int cmd, void *p) } #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) { struct nl_msg *nlm; struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC, }; struct blob_attr *cur; - uint32_t ikey = 0, okey = 0; + 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); @@ -1703,6 +1718,28 @@ static int system_add_gre_tunnel(const char *name, const char *kind, 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", @@ -1748,6 +1785,12 @@ static int system_add_gre_tunnel(const char *name, const char *kind, 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; @@ -1783,7 +1826,15 @@ 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; + } + nla_put_u8(nlm, IFLA_GRE_PMTUDISC, set_df ? 1 : 0); + + nla_put_u8(nlm, IFLA_GRE_TOS, tos); } if (oflags) @@ -1809,6 +1860,64 @@ failure: } #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; @@ -1866,7 +1975,6 @@ 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; blobmsg_parse(tunnel_attr_list.params, __TUNNEL_ATTR_MAX, tb, @@ -1878,13 +1986,10 @@ int system_add_ip_tunnel(const char *name, struct blob_attr *attr) 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; } @@ -1899,27 +2004,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 @@ -2059,6 +2144,8 @@ failure: } 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;