zebra: Move v6_rr_semantics to be part of zrouter structure

Move global variable v6_rr_semantics from a global data structure into the zrouter data structure. Signed-off-by: Donald Sharp <[email protected]>
donaldsharp · Nov 3, 2023 · f2443d3 · f2443d3
1 parent 4bfd054
commit f2443d3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/zebra/main.c b/zebra/main.c
@@ -59,8 +59,6 @@ int retain_mode = 0;
 
 int graceful_restart;
 
-bool v6_rr_semantics = false;
-
 /* Receive buffer size for kernel control sockets */
 #define RCVBUFSIZE_MIN 4194304
 #ifdef HAVE_NETLINK
@@ -385,7 +383,7 @@ int main(int argc, char **argv)
 			vrf_configure_backend(VRF_BACKEND_NETNS);
 			break;
 		case OPTION_V6_RR_SEMANTICS:
-			v6_rr_semantics = true;
+			zrouter.v6_rr_semantics = true;
 			break;
 		case OPTION_ASIC_OFFLOAD:
 			if (!strcmp(optarg, "notify_on_offload"))

diff --git a/zebra/rib.h b/zebra/rib.h
@@ -627,8 +627,6 @@ extern void zebra_vty_init(void);
 
 extern pid_t pid;
 
-extern bool v6_rr_semantics;
-
 extern uint32_t rt_table_main_id;
 
 /* Name of hook calls */

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
@@ -2209,7 +2209,7 @@ ssize_t netlink_route_multipath_msg_encode(int cmd, struct zebra_dplane_ctx *ctx
 	req->n.nlmsg_flags = NLM_F_CREATE | NLM_F_REQUEST;
 
 	if (((cmd == RTM_NEWROUTE) &&
-	     ((p->family == AF_INET) || v6_rr_semantics)) ||
+	     ((p->family == AF_INET) || zrouter.v6_rr_semantics)) ||
 	    force_rr)
 		req->n.nlmsg_flags |= NLM_F_REPLACE;
 
@@ -3095,8 +3095,7 @@ netlink_put_route_update_msg(struct nl_batch *bth, struct zebra_dplane_ctx *ctx)
 	} else if (dplane_ctx_get_op(ctx) == DPLANE_OP_ROUTE_INSTALL) {
 		cmd = RTM_NEWROUTE;
 	} else if (dplane_ctx_get_op(ctx) == DPLANE_OP_ROUTE_UPDATE) {
-
-		if (p->family == AF_INET || v6_rr_semantics) {
+		if (p->family == AF_INET || zrouter.v6_rr_semantics) {
 			/* Single 'replace' operation */
 
 			/*

diff --git a/zebra/zebra_router.h b/zebra/zebra_router.h
@@ -209,6 +209,8 @@ struct zebra_router {
 	bool notify_on_ack;
 	bool v6_with_v4_nexthop;
 
+	bool v6_rr_semantics;
+
 	/*
 	 * If the asic is notifying us about successful nexthop
 	 * allocation/control.  Some developers have made their

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
@@ -4048,7 +4048,7 @@ DEFUN (show_zebra,
 	ttable_add_row(table, "EVPN|%s", is_evpn_enabled() ? "On" : "Off");
 	ttable_add_row(table, "Kernel socket buffer size|%d", rcvbufsize);
 	ttable_add_row(table, "v6 Route Replace Semantics|%s",
-		       v6_rr_semantics ? "Replace" : "Delete than Add");
+		       zrouter.v6_rr_semantics ? "Replace" : "Delete than Add");
 
 #ifdef GNU_LINUX
 	if (!vrf_is_backend_netns())