lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 6 Dec 2019 19:11:54 +0100 From: Paolo Lungaroni <paolo.lungaroni@...t.it> To: netdev@...r.kernel.org Cc: Paolo Lungaroni <paolo.lungaroni@...t.it> Subject: [PATCH iproute2 net-next] add support for table name in SRv6 End.DT* behaviors it allows to specify also the table name in addition to the table number in SRv6 End.DT* behaviors. To add an End.DT6 behavior route specifying the table by name: $ ip -6 route add 2001:db8::1 encap seg6local action End.DT6 table main dev eth0 The ip route show to print output this route: $ ip -6 route show 2001:db8::1 2001:db8::1 encap seg6local action End.DT6 table main dev eth0 metric 1024 pref medium The JSON output: $ ip -6 -j -p route show 2001:db8::1 [ { "dst": "2001:db8::1", "encap": "seg6local", "action": "End.DT6", "table": "main", "dev": "eth0", "metric": 1024, "flags": [ ], "pref": "medium" } ] Signed-off-by: Paolo Lungaroni <paolo.lungaroni@...t.it> --- ip/iproute_lwtunnel.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c index 03217b8f..cc60a022 100644 --- a/ip/iproute_lwtunnel.c +++ b/ip/iproute_lwtunnel.c @@ -229,6 +229,8 @@ static void print_encap_seg6local(FILE *fp, struct rtattr *encap) struct rtattr *tb[SEG6_LOCAL_MAX + 1]; int action; + SPRINT_BUF(b1); + parse_rtattr_nested(tb, SEG6_LOCAL_MAX, encap); if (!tb[SEG6_LOCAL_ACTION]) @@ -246,8 +248,9 @@ static void print_encap_seg6local(FILE *fp, struct rtattr *encap) } if (tb[SEG6_LOCAL_TABLE]) - print_uint(PRINT_ANY, "table", - "table %u ", rta_getattr_u32(tb[SEG6_LOCAL_TABLE])); + print_string(PRINT_ANY, "table", "table %s ", + rtnl_rttable_n2a(rta_getattr_u32(tb[SEG6_LOCAL_TABLE]), + b1, sizeof(b1))); if (tb[SEG6_LOCAL_NH4]) { print_string(PRINT_ANY, "nh4", @@ -654,7 +657,7 @@ static int parse_encap_seg6local(struct rtattr *rta, size_t len, int *argcp, NEXT_ARG(); if (table_ok++) duparg2("table", *argv); - get_u32(&table, *argv, 0); + rtnl_rttable_a2n(&table, *argv); ret = rta_addattr32(rta, len, SEG6_LOCAL_TABLE, table); } else if (strcmp(*argv, "nh4") == 0) { NEXT_ARG(); -- 2.20.1
Powered by blists - more mailing lists