From b24c686f3e5bb0acbebf40c3e7f5a16f0582fd64 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 13 Sep 2018 20:55:45 +0200 Subject: [PATCH] tc/act_tunnel_key: Enable setup of tos and ttl Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1615915 Upstream Status: iproute2.git commit 9f89b0cc0eda2 Conflicts: Context change due to missing Geneve support. commit 9f89b0cc0eda2ef52d8850b0610f3e2e09fd7c1c Author: Or Gerlitz Date: Thu Jul 19 14:02:14 2018 +0300 tc/act_tunnel_key: Enable setup of tos and ttl Allow to set tos and ttl for the tunnel. For example, here's encap rule that sets tos to the tunnel: tc filter add dev eth0_0 protocol ip parent ffff: prio 10 flower \ src_mac e4:11:22:33:44:50 dst_mac e4:11:22:33:44:70 \ action tunnel_key set src_ip 192.168.10.1 dst_ip 192.168.10.2 id 100 dst_port 4789 tos 0x30 \ action mirred egress redirect dev vxlan_sys_4789 Signed-off-by: Or Gerlitz Reviewed-by: Roi Dayan Acked-by: Jiri Pirko Signed-off-by: David Ahern --- man/man8/tc-tunnel_key.8 | 8 ++++++++ tc/m_tunnel_key.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/man/man8/tc-tunnel_key.8 b/man/man8/tc-tunnel_key.8 index e979a74..71cee5b 100644 --- a/man/man8/tc-tunnel_key.8 +++ b/man/man8/tc-tunnel_key.8 @@ -16,6 +16,8 @@ tunnel_key - Tunnel metadata manipulation .IR ADDRESS .BI id " KEY_ID" .BI dst_port " UDP_PORT" +.BI tos " TOS" +.BI ttl " TTL" .RB "[ " csum " | " nocsum " ]" .SH DESCRIPTION @@ -79,6 +81,12 @@ Outer header destination IP address (IPv4 or IPv6) .B dst_port Outer header destination UDP port .TP +.B tos +Outer header TOS +.TP +.B ttl +Outer header TTL +.TP .RB [ no ] csum Controlls outer UDP checksum. When set to .B csum diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c index 0fa4615..8d0a8d1 100644 --- a/tc/m_tunnel_key.c +++ b/tc/m_tunnel_key.c @@ -81,6 +81,22 @@ static int tunnel_key_parse_dst_port(char *str, int type, struct nlmsghdr *n) return 0; } +static int tunnel_key_parse_tos_ttl(char *str, int type, struct nlmsghdr *n) +{ + int ret; + __u8 val; + + ret = get_u8(&val, str, 10); + if (ret) + ret = get_u8(&val, str, 16); + if (ret) + return -1; + + addattr8(n, MAX_MSG, type, val); + + return 0; +} + static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct nlmsghdr *n) { @@ -157,6 +173,22 @@ static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p, fprintf(stderr, "Illegal \"dst port\"\n"); return -1; } + } else if (matches(*argv, "tos") == 0) { + NEXT_ARG(); + ret = tunnel_key_parse_tos_ttl(*argv, + TCA_TUNNEL_KEY_ENC_TOS, n); + if (ret < 0) { + fprintf(stderr, "Illegal \"tos\"\n"); + return -1; + } + } else if (matches(*argv, "ttl") == 0) { + NEXT_ARG(); + ret = tunnel_key_parse_tos_ttl(*argv, + TCA_TUNNEL_KEY_ENC_TTL, n); + if (ret < 0) { + fprintf(stderr, "Illegal \"ttl\"\n"); + return -1; + } } else if (matches(*argv, "csum") == 0) { csum = 1; } else if (matches(*argv, "nocsum") == 0) { @@ -260,6 +292,23 @@ static void tunnel_key_print_flag(FILE *f, const char *name_on, rta_getattr_u8(attr) ? name_on : name_off); } +static void tunnel_key_print_tos_ttl(FILE *f, char *name, + struct rtattr *attr) +{ + if (!attr) + return; + + if (matches(name, "tos") == 0 && rta_getattr_u8(attr) != 0) { + print_string(PRINT_FP, NULL, "%s", _SL_); + print_uint(PRINT_ANY, "tos", "\ttos 0x%x", + rta_getattr_u8(attr)); + } else if (matches(name, "ttl") == 0 && rta_getattr_u8(attr) != 0) { + print_string(PRINT_FP, NULL, "%s", _SL_); + print_uint(PRINT_ANY, "ttl", "\tttl %u", + rta_getattr_u8(attr)); + } +} + static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg) { struct rtattr *tb[TCA_TUNNEL_KEY_MAX + 1]; @@ -299,6 +348,10 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg) tb[TCA_TUNNEL_KEY_ENC_DST_PORT]); tunnel_key_print_flag(f, "nocsum", "csum", tb[TCA_TUNNEL_KEY_NO_CSUM]); + tunnel_key_print_tos_ttl(f, "tos", + tb[TCA_TUNNEL_KEY_ENC_TOS]); + tunnel_key_print_tos_ttl(f, "ttl", + tb[TCA_TUNNEL_KEY_ENC_TTL]); break; } print_action_control(f, " ", parm->action, ""); -- 1.8.3.1