Merge pull request FRRouting#20053 from k-akashi/isis_srv6_mt

cscarpitta · web-flow · commit 67660e09077c · 2025-11-21T17:30:43.000+01:00
isisd: use IPv6 MTID for SRv6 locator TLVs when IPv6 MT is enabled
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
@@ -1236,7 +1236,7 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area)
 			listnode_add(locator.srv6_sid, sid);
 		}
 
-		isis_tlvs_add_srv6_locator(lsp->tlvs, 0, &locator);
+		isis_tlvs_add_srv6_locator(lsp->tlvs, isis_area_ipv6_topology(area), &locator);
 		lsp_debug("ISIS (%s): Adding SRv6 Locator information",
 			  area->area_tag);
 

Original file line number	Diff line number	Diff line change
`@@ -1236,7 +1236,7 @@ static void lsp_build(struct isis_lsp lsp, struct isis_area area)`
`1236`	`1236`	`listnode_add(locator.srv6_sid, sid);`
`1237`	`1237`	`}`
`1238`	`1238`
`1239`		`- isis_tlvs_add_srv6_locator(lsp->tlvs, 0, &locator);`
	`1239`	`+ isis_tlvs_add_srv6_locator(lsp->tlvs, isis_area_ipv6_topology(area), &locator);`
`1240`	`1240`	`lsp_debug("ISIS (%s): Adding SRv6 Locator information",`
`1241`	`1241`	`area->area_tag);`
`1242`	`1242`