lib: fix affinity map duplicate

Fix duplicate definition of frr_affinity_map_cli_info in libfrr.so.0 and libmgmt_be_nb.so.0 > ================================================================= > ==3860488==ERROR: AddressSanitizer: odr-violation (0x7f12c98c4d20): > [1] size=296 'frr_affinity_map_cli_info' lib/affinitymap_cli.c:77:35 > [2] size=296 'frr_affinity_map_cli_info' lib/affinitymap_cli.c:77:35 > These globals were registered at these points: > [1]: > #0 0x7f12c9a36f40 in __asan_register_globals ../../../../src/libsanitizer/asan/asan_globals.cpp:341 > #1 0x7f12c9585b7d in _sub_I_00099_1 (/lib/libfrr.so.0+0x185b7d) > #2 0x7f12ca437fe1 in call_init elf/dl-init.c:72 > > [2]: > #0 0x7f12c9a36f40 in __asan_register_globals ../../../../src/libsanitizer/asan/asan_globals.cpp:341 > #1 0x7f12c93824ed in _sub_I_00099_1 (/lib/libmgmt_be_nb.so.0+0x6f4ed) > #2 0x7f12ca437fe1 in call_init elf/dl-init.c:72 > > ==3860488==HINT: if you don't care about these errors you may set ASAN_OPTIONS=detect_odr_violation=0 > SUMMARY: AddressSanitizer: odr-violation: global 'frr_affinity_map_cli_info' at lib/affinitymap_cli.c:77:35 > ==3860488==ABORTING Fixes: dc6ff4c ("lib: convert affinity-map to mgmtd") Signed-off-by: Louis Scalbert <[email protected]>
louis-6wind · Feb 7, 2024 · f188510 · f188510
1 parent 1bc2fa3
commit f188510
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/lib/affinitymap_cli.c b/lib/affinitymap_cli.c
@@ -66,28 +66,6 @@ DEFPY_YANG_NOSH(no_affinity_map, no_affinity_map_cmd,
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-static void cli_show_affinity_map(struct vty *vty, const struct lyd_node *dnode,
-			   bool show_defaults __attribute__((__unused__)))
-{
-	vty_out(vty, "affinity-map %s bit-position %u\n",
-		yang_dnode_get_string(dnode, "name"),
-		yang_dnode_get_uint16(dnode, "value"));
-}
-
-const struct frr_yang_module_info frr_affinity_map_cli_info = {
-	.name = "frr-affinity-map",
-	.ignore_cfg_cbs = true,
-	.nodes = {
-		{
-			.xpath = "/frr-affinity-map:lib/affinity-maps/affinity-map",
-			.cbs.cli_show = cli_show_affinity_map,
-		},
-		{
-			.xpath = NULL,
-		},
-	}
-};
-
 /* Initialization of affinity map vector. */
 void affinity_map_init(void)
 {

diff --git a/lib/affinitymap_northbound.c b/lib/affinitymap_northbound.c
@@ -107,3 +107,25 @@ const struct frr_yang_module_info frr_affinity_map_info = {
 		},
 	}
 };
+
+static void cli_show_affinity_map(struct vty *vty, const struct lyd_node *dnode,
+			   bool show_defaults __attribute__((__unused__)))
+{
+	vty_out(vty, "affinity-map %s bit-position %u\n",
+		yang_dnode_get_string(dnode, "name"),
+		yang_dnode_get_uint16(dnode, "value"));
+}
+
+const struct frr_yang_module_info frr_affinity_map_cli_info = {
+	.name = "frr-affinity-map",
+	.ignore_cfg_cbs = true,
+	.nodes = {
+		{
+			.xpath = "/frr-affinity-map:lib/affinity-maps/affinity-map",
+			.cbs.cli_show = cli_show_affinity_map,
+		},
+		{
+			.xpath = NULL,
+		},
+	}
+};