proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 18:04:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16603 from cscarpitta/fix/fix-compilation-warnings

Browse Source 
lib, zebra: Fix a couple compilation warnings
This commit is contained in:
Donald Sharp 2024-08-18 13:34:12 -04:00 committed by GitHub
commit 5dd2b67ff5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/srv6.h
View File

@ -335,24 +335,23 @@ static inline const char *srv6_sid_ctx2str(char *str, size_t size,
break; break;
case ZEBRA_SEG6_LOCAL_ACTION_END: case ZEBRA_SEG6_LOCAL_ACTION_END:
len += snprintf(str + len, size - len, " USP"); snprintf(str + len, size - len, " USP");
break; break;
case ZEBRA_SEG6_LOCAL_ACTION_END_X: case ZEBRA_SEG6_LOCAL_ACTION_END_X:
case ZEBRA_SEG6_LOCAL_ACTION_END_DX6: case ZEBRA_SEG6_LOCAL_ACTION_END_DX6:
len += snprintfrr(str + len, size - len, " nh6 %pI6", &ctx->nh6); snprintfrr(str + len, size - len, " nh6 %pI6", &ctx->nh6);
break; break;
case ZEBRA_SEG6_LOCAL_ACTION_END_DX4: case ZEBRA_SEG6_LOCAL_ACTION_END_DX4:
len += snprintfrr(str + len, size - len, " nh4 %pI4", &ctx->nh4); snprintfrr(str + len, size - len, " nh4 %pI4", &ctx->nh4);
break; break;
case ZEBRA_SEG6_LOCAL_ACTION_END_T: case ZEBRA_SEG6_LOCAL_ACTION_END_T:
case ZEBRA_SEG6_LOCAL_ACTION_END_DT6: case ZEBRA_SEG6_LOCAL_ACTION_END_DT6:
case ZEBRA_SEG6_LOCAL_ACTION_END_DT4: case ZEBRA_SEG6_LOCAL_ACTION_END_DT4:
case ZEBRA_SEG6_LOCAL_ACTION_END_DT46: case ZEBRA_SEG6_LOCAL_ACTION_END_DT46:
len += snprintf(str + len, size - len, " vrf_id %u", snprintf(str + len, size - len, " vrf_id %u", ctx->vrf_id);
ctx->vrf_id);
break; break;
case ZEBRA_SEG6_LOCAL_ACTION_END_DX2: case ZEBRA_SEG6_LOCAL_ACTION_END_DX2:
@ -364,7 +363,7 @@ static inline const char *srv6_sid_ctx2str(char *str, size_t size,
case ZEBRA_SEG6_LOCAL_ACTION_END_AM: case ZEBRA_SEG6_LOCAL_ACTION_END_AM:
case ZEBRA_SEG6_LOCAL_ACTION_END_BPF: case ZEBRA_SEG6_LOCAL_ACTION_END_BPF:
default: default:
len += snprintf(str + len, size - len, " unknown(%s)", __func__); snprintf(str + len, size - len, " unknown(%s)", __func__);
} }
return str; return str;

2
zebra/zebra_srv6_vty.c
View File

@ -969,7 +969,7 @@ static int zebra_sr_config(struct vty *vty)
&srv6->encap_src_addr); &srv6->encap_src_addr);
} }
} }
if (zebra_srv6_is_enable()) { if (srv6 && 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,