git.proxmox.com Git - mirror

]> git.proxmox.com Git - mirror_frr.git/commit

author	Renato Westphal <renato@opensourcerouting.org>
	Fri, 25 Sep 2020 05:45:19 +0000 (02:45 -0300)
committer	Renato Westphal <renato@opensourcerouting.org>
	Fri, 23 Oct 2020 13:31:39 +0000 (10:31 -0300)
commit	4c75f7c7730220bf4c86f62bb6ca86d527eabf60
tree	79bc61efb6ee930b2a88b7a6b018a01823dad30c	tree
parent	d47d6089e06c2c6b9f0f5ae4518f0e07abdca1af	commit \| diff

isisd: fix the TI-LFA repair paths to preserve the original Prefix-SID

When computing backup nexthops for routes that contain a Prefix-SID,
the original Prefix-SID label should be present at the end of
backup label stacks (after the repair labels). This commit fixes
that oversight in the original TI-LFA code. The SPF unit tests and
TI-LFA topotes were also updated accordingly.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

111 files changed:

isisd/isis_lfa.c		diff \| blob \| blame \| history
isisd/isis_lfa.h		diff \| blob \| blame \| history
tests/isisd/test_isis_spf.refout		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step4/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step4/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step4/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step5/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step5/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step5/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step7/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step7/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step7/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step8/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step8/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step8/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step9/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step9/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt1/step9/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step1/show_ip_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step1/show_ipv6_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step1/show_mpls_table.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step2/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step2/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step2/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step3/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step3/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step3/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step4/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step4/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step4/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step5/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step5/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step5/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step7/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step7/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step7/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step8/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step8/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step8/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step9/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step9/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt2/step9/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step1/show_ip_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step1/show_ipv6_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step1/show_mpls_table.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step4/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step4/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step4/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step5/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step5/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step5/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step6/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step6/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step6/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step7/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step7/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step7/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step8/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step8/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step8/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step9/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step9/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt3/step9/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step1/show_ip_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step1/show_ipv6_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step1/show_mpls_table.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step4/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step4/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step4/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step5/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step5/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step5/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step6/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step6/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step6/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step7/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step7/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step7/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step8/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step8/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step8/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt4/step9/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step1/show_ip_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step1/show_ipv6_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step1/show_mpls_table.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step4/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step4/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step4/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step5/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step5/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step5/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt5/step6/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step1/show_ip_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step1/show_ipv6_route.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step1/show_mpls_table.ref		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step4/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step4/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step4/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step5/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step5/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step5/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step6/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step6/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step6/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step7/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step7/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step7/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step8/show_ip_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step8/show_ipv6_route.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step8/show_mpls_table.ref.diff		diff \| blob \| blame \| history
tests/topotests/isis-tilfa-topo1/rt6/step9/show_mpls_table.ref.diff		diff \| blob \| blame \| history

FRRouting mirror

RSS Atom