diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2014-09-29 15:36:04 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-09-29 19:58:10 +0200 |
| commit | 8e15f409e000ffdd87d1022390e54f14da839b3f (patch) | |
| tree | 3e01ac0abb6a98d386298ef125dfd312ea0e8bcf /system-linux.c | |
| parent | b965453c9df60f1c2681c3bfb7e8cff671c4b223 (diff) | |
netifd: GRE Tos support
Tos support is added as a generic gre parameter which can have the following values :
-inherit (outer header inherits the tos value of the inner header)
-hex value
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'system-linux.c')
| -rw-r--r-- | system-linux.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/system-linux.c b/system-linux.c index c4d89be..aca30ca 100644 --- a/system-linux.c +++ b/system-linux.c @@ -1665,14 +1665,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 +1705,29 @@ 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; + char *e; + + uval = strtoul(str, &e, 16); + if (e == str || *e || uval > 255) { + 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 +1773,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; @@ -1784,6 +1815,8 @@ static int system_add_gre_tunnel(const char *name, const char *kind, set_df = blobmsg_get_bool(cur); nla_put_u8(nlm, IFLA_GRE_PMTUDISC, set_df ? 1 : 0); + + nla_put_u8(nlm, IFLA_GRE_TOS, tos); } if (oflags) |