proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-14 15:10:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add support for table name in SRv6 End.DT* behaviors

Browse Source 
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@cnit.it>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Paolo Lungaroni 2019-12-06 19:11:54 +01:00 committed by David Ahern
parent 7b0d424abe
commit 0486388a87
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ip/iproute_lwtunnel.c
View File

@ -229,6 +229,8 @@ static void print_encap_seg6local(FILE *fp, struct rtattr *encap)
struct rtattr *tb[SEG6_LOCAL_MAX + 1]; struct rtattr *tb[SEG6_LOCAL_MAX + 1];
int action; int action;
SPRINT_BUF(b1);
parse_rtattr_nested(tb, SEG6_LOCAL_MAX, encap); parse_rtattr_nested(tb, SEG6_LOCAL_MAX, encap);
if (!tb[SEG6_LOCAL_ACTION]) if (!tb[SEG6_LOCAL_ACTION])
@ -246,8 +248,9 @@ static void print_encap_seg6local(FILE *fp, struct rtattr *encap)
} }
if (tb[SEG6_LOCAL_TABLE]) if (tb[SEG6_LOCAL_TABLE])
print_uint(PRINT_ANY, "table", print_string(PRINT_ANY, "table", "table %s ",
"table %u ", rta_getattr_u32(tb[SEG6_LOCAL_TABLE])); rtnl_rttable_n2a(rta_getattr_u32(tb[SEG6_LOCAL_TABLE]),
b1, sizeof(b1)));
if (tb[SEG6_LOCAL_NH4]) { if (tb[SEG6_LOCAL_NH4]) {
print_string(PRINT_ANY, "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(); NEXT_ARG();
if (table_ok++) if (table_ok++)
duparg2("table", *argv); duparg2("table", *argv);
get_u32(&table, *argv, 0); rtnl_rttable_a2n(&table, *argv);
ret = rta_addattr32(rta, len, SEG6_LOCAL_TABLE, table); ret = rta_addattr32(rta, len, SEG6_LOCAL_TABLE, table);
} else if (strcmp(*argv, "nh4") == 0) { } else if (strcmp(*argv, "nh4") == 0) {
NEXT_ARG(); NEXT_ARG();