proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 15:23:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: display srv6 encapsulation source-address when configured

Browse Source 
The 'show running-config' does not display the ipv6 source address
when a locator is not configured. Fix this by systematically displaying
the ipv6 source address.

Fixes: 6a0956169b ("zebra: Add encap source address to SRv6 config write function")

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2024-06-03 09:53:34 +02:00
parent 41eb06801c
commit 890b67d7a9
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra/zebra_srv6_vty.c
View File

@ -475,16 +475,24 @@ static int zebra_sr_config(struct vty *vty)
struct listnode *node; struct listnode *node;
struct srv6_locator *locator; struct srv6_locator *locator;
char str[256]; char str[256];
bool display_source_srv6 = false;
if (srv6 && !IPV6_ADDR_SAME(&srv6->encap_src_addr, &in6addr_any))
display_source_srv6 = true;
vty_out(vty, "!\n"); vty_out(vty, "!\n");
if (zebra_srv6_is_enable()) { if (display_source_srv6 || zebra_srv6_is_enable()) {
vty_out(vty, "segment-routing\n"); vty_out(vty, "segment-routing\n");
vty_out(vty, " srv6\n"); vty_out(vty, " srv6\n");
}
if (display_source_srv6) {
if (!IPV6_ADDR_SAME(&srv6->encap_src_addr, &in6addr_any)) { if (!IPV6_ADDR_SAME(&srv6->encap_src_addr, &in6addr_any)) {
vty_out(vty, " encapsulation\n"); vty_out(vty, " encapsulation\n");
vty_out(vty, " source-address %pI6\n", vty_out(vty, " source-address %pI6\n",
&srv6->encap_src_addr); &srv6->encap_src_addr);
} }
}
if (zebra_srv6_is_enable()) {
vty_out(vty, " locators\n"); vty_out(vty, " locators\n");
for (ALL_LIST_ELEMENTS_RO(srv6->locators, node, locator)) { for (ALL_LIST_ELEMENTS_RO(srv6->locators, node, locator)) {
inet_ntop(AF_INET6, &locator->prefix.prefix, inet_ntop(AF_INET6, &locator->prefix.prefix,
@ -514,6 +522,8 @@ static int zebra_sr_config(struct vty *vty)
vty_out(vty, " !\n"); vty_out(vty, " !\n");
vty_out(vty, " exit\n"); vty_out(vty, " exit\n");
vty_out(vty, " !\n"); vty_out(vty, " !\n");
}
if (display_source_srv6 || zebra_srv6_is_enable()) {
vty_out(vty, "exit\n"); vty_out(vty, "exit\n");
vty_out(vty, "!\n"); vty_out(vty, "!\n");
} }