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

isisd: Fix openfabric crash

Browse Source 
`isis_srv6_area_init` should not use `yang_get_default_*` functions for
fabricd.

Fixes: https://github.com/FRRouting/frr/issues/14722

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
This commit is contained in:
Carmine Scarpitta 2023-11-03 10:03:46 +01:00
parent ad44b541ef
commit 7e5f1a0bb4
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
isisd/isis_srv6.c
View File

@ -777,6 +777,7 @@ void isis_srv6_area_init(struct isis_area *area)
srv6db->srv6_endx_sids = list_new(); srv6db->srv6_endx_sids = list_new();
/* Pull defaults from the YANG module */ /* Pull defaults from the YANG module */
#ifndef FABRICD
srv6db->config.enabled = yang_get_default_bool("%s/enabled", ISIS_SRV6); srv6db->config.enabled = yang_get_default_bool("%s/enabled", ISIS_SRV6);
srv6db->config.max_seg_left_msd = srv6db->config.max_seg_left_msd =
yang_get_default_uint8("%s/msd/node-msd/max-segs-left", yang_get_default_uint8("%s/msd/node-msd/max-segs-left",
@ -789,6 +790,14 @@ void isis_srv6_area_init(struct isis_area *area)
srv6db->config.max_end_d_msd = srv6db->config.max_end_d_msd =
yang_get_default_uint8("%s/msd/node-msd/max-end-d", ISIS_SRV6); yang_get_default_uint8("%s/msd/node-msd/max-end-d", ISIS_SRV6);
strncpy(srv6db->config.srv6_ifname, yang_get_default_string("%s/interface", ISIS_SRV6), IF_NAMESIZE - 1); strncpy(srv6db->config.srv6_ifname, yang_get_default_string("%s/interface", ISIS_SRV6), IF_NAMESIZE - 1);
#else
srv6db->config.enabled = false;
srv6db->config.max_seg_left_msd = ISIS_DEFAULT_SRV6_MAX_SEG_LEFT_MSD;
srv6db->config.max_end_pop_msd = ISIS_DEFAULT_SRV6_MAX_END_POP_MSD;
srv6db->config.max_h_encaps_msd = ISIS_DEFAULT_SRV6_MAX_H_ENCAPS_MSD;
srv6db->config.max_end_d_msd = ISIS_DEFAULT_SRV6_MAX_END_D_MSD;
strlcpy(srv6db->config.srv6_ifname, ISIS_DEFAULT_SRV6_IFNAME, sizeof(srv6db->config.srv6_ifname));
#endif
/* Initialize SRv6 Locator chunks list */ /* Initialize SRv6 Locator chunks list */
srv6db->srv6_locator_chunks = list_new(); srv6db->srv6_locator_chunks = list_new();

6
isisd/isis_srv6.h
View File

@ -13,6 +13,12 @@
#include "lib/srv6.h" #include "lib/srv6.h"
#include "isisd/isis_tlvs.h" #include "isisd/isis_tlvs.h"
#define ISIS_DEFAULT_SRV6_MAX_SEG_LEFT_MSD 3
#define ISIS_DEFAULT_SRV6_MAX_END_POP_MSD 3
#define ISIS_DEFAULT_SRV6_MAX_H_ENCAPS_MSD 2
#define ISIS_DEFAULT_SRV6_MAX_END_D_MSD 5
#define ISIS_DEFAULT_SRV6_IFNAME "sr0"
/* SRv6 SID structure */ /* SRv6 SID structure */
struct isis_srv6_sid_structure { struct isis_srv6_sid_structure {
uint8_t loc_block_len; uint8_t loc_block_len;