isisd: Fix openfabric crash

`isis_srv6_area_init` should not use `yang_get_default_*` functions for fabricd. Fixes: FRRouting#14722 Signed-off-by: Carmine Scarpitta <[email protected]>
cscarpitta · Nov 3, 2023 · 8d371d2 · 8d371d2
1 parent ad44b54
commit 8d371d2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/isisd/isis_srv6.c b/isisd/isis_srv6.c
@@ -777,6 +777,7 @@ void isis_srv6_area_init(struct isis_area *area)
 	srv6db->srv6_endx_sids = list_new();
 
 	/* Pull defaults from the YANG module */
+#ifndef FABRICD
 	srv6db->config.enabled = yang_get_default_bool("%s/enabled", ISIS_SRV6);
 	srv6db->config.max_seg_left_msd =
 		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 =
 		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);
+#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;
+	strncpy(srv6db->config.srv6_ifname, ISIS_DEFAULT_SRV6_IFNAME, IF_NAMESIZE - 1);
+#endif
 
 	/* Initialize SRv6 Locator chunks list */
 	srv6db->srv6_locator_chunks = list_new();

diff --git a/isisd/isis_srv6.h b/isisd/isis_srv6.h
@@ -13,6 +13,12 @@
 #include "lib/srv6.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 */
 struct isis_srv6_sid_structure {
 	uint8_t loc_block_len;