pimd: Move pim_ifchannel_list and vif array into 'struct pim_instance *'

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

1 files changed, 24 insertions, 21 deletions

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index d497f99672..86dda43e9c 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -158,7 +158,7 @@ static void pim_if_membership_refresh(struct interface *ifp)
 	pim_ifchannel_delete_on_noinfo(ifp);
 }
 
-static void pim_show_assert(struct vty *vty)
+static void pim_show_assert(struct pim_instance *pim, struct vty *vty)
 {
 	struct pim_interface *pim_ifp;
 	struct pim_ifchannel *ch;
@@ -171,7 +171,7 @@ static void pim_show_assert(struct vty *vty)
 	vty_out(vty,
 		"Interface Address         Source          Group           State  Winner          Uptime   Timer\n");
 
-	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+	for (ALL_LIST_ELEMENTS_RO(pim->ifchannel_list, ch_node, ch)) {
 		char ch_src_str[INET_ADDRSTRLEN];
 		char ch_grp_str[INET_ADDRSTRLEN];
 		char winner_str[INET_ADDRSTRLEN];
@@ -205,7 +205,7 @@ static void pim_show_assert(struct vty *vty)
 	} /* scan interface channels */
 }
 
-static void pim_show_assert_internal(struct vty *vty)
+static void pim_show_assert_internal(struct pim_instance *pim, struct vty *vty)
 {
 	struct pim_interface *pim_ifp;
 	struct listnode *ch_node;
@@ -221,7 +221,7 @@ static void pim_show_assert_internal(struct vty *vty)
 	vty_out(vty,
 		"Interface Address         Source          Group           CA  eCA ATD eATD\n");
 
-	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+	for (ALL_LIST_ELEMENTS_RO(pim->ifchannel_list, ch_node, ch)) {
 		pim_ifp = ch->interface->info;
 
 		if (!pim_ifp)
@@ -249,7 +249,7 @@ static void pim_show_assert_internal(struct vty *vty)
 	} /* scan interface channels */
 }
 
-static void pim_show_assert_metric(struct vty *vty)
+static void pim_show_assert_metric(struct pim_instance *pim, struct vty *vty)
 {
 	struct pim_interface *pim_ifp;
 	struct listnode *ch_node;
@@ -259,7 +259,7 @@ static void pim_show_assert_metric(struct vty *vty)
 	vty_out(vty,
 		"Interface Address         Source          Group           RPT Pref Metric Address        \n");
 
-	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+	for (ALL_LIST_ELEMENTS_RO(pim->ifchannel_list, ch_node, ch)) {
 		pim_ifp = ch->interface->info;
 
 		if (!pim_ifp)
@@ -289,7 +289,8 @@ static void pim_show_assert_metric(struct vty *vty)
 	} /* scan interface channels */
 }
 
-static void pim_show_assert_winner_metric(struct vty *vty)
+static void pim_show_assert_winner_metric(struct pim_instance *pim,
+					  struct vty *vty)
 {
 	struct pim_interface *pim_ifp;
 	struct listnode *ch_node;
@@ -299,7 +300,7 @@ static void pim_show_assert_winner_metric(struct vty *vty)
 	vty_out(vty,
 		"Interface Address         Source          Group           RPT Pref Metric Address        \n");
 
-	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+	for (ALL_LIST_ELEMENTS_RO(pim->ifchannel_list, ch_node, ch)) {
 		pim_ifp = ch->interface->info;
 
 		if (!pim_ifp)
@@ -373,7 +374,8 @@ static void json_object_pim_ifp_add(struct json_object *json,
 		json_object_boolean_true_add(json, "lanDelayEnabled");
 }
 
-static void pim_show_membership(struct vty *vty, u_char uj)
+static void pim_show_membership(struct pim_instance *pim, struct vty *vty,
+				u_char uj)
 {
 	struct pim_interface *pim_ifp;
 	struct listnode *ch_node;
@@ -386,7 +388,7 @@ static void pim_show_membership(struct vty *vty, u_char uj)
 
 	json = json_object_new_object();
 
-	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+	for (ALL_LIST_ELEMENTS_RO(pim->ifchannel_list, ch_node, ch)) {
 
 		pim_ifp = ch->interface->info;
 
@@ -1526,7 +1528,7 @@ static void pim_show_interface_traffic_single(struct vty *vty,
 	}
 }
 
-static void pim_show_join(struct vty *vty, u_char uj)
+static void pim_show_join(struct pim_instance *pim, struct vty *vty, u_char uj)
 {
 	struct pim_interface *pim_ifp;
 	struct in_addr ifaddr;
@@ -1546,7 +1548,7 @@ static void pim_show_join(struct vty *vty, u_char uj)
 		vty_out(vty,
 			"Interface Address         Source          Group           State  Uptime   Expire Prune\n");
 
-	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+	for (ALL_LIST_ELEMENTS_RO(pim->ifchannel_list, ch_node, ch)) {
 
 		pim_ifp = ch->interface->info;
 
@@ -2351,7 +2353,8 @@ static void pim_show_upstream(struct vty *vty, u_char uj)
 	}
 }
 
-static void pim_show_join_desired(struct vty *vty, u_char uj)
+static void pim_show_join_desired(struct pim_instance *pim, struct vty *vty,
+				  u_char uj)
 {
 	struct listnode *chnode;
 	struct pim_interface *pim_ifp;
@@ -2369,7 +2372,7 @@ static void pim_show_join_desired(struct vty *vty, u_char uj)
 			"Interface Source          Group           LostAssert Joins PimInclude JoinDesired EvalJD\n");
 
 	/* scan per-interface (S,G) state */
-	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, chnode, ch)) {
+	for (ALL_LIST_ELEMENTS_RO(pim->ifchannel_list, chnode, ch)) {
 		/* scan all interfaces */
 		pim_ifp = ch->interface->info;
 		if (!pim_ifp)
@@ -3289,7 +3292,7 @@ DEFUN (show_ip_pim_assert,
        PIM_STR
        "PIM interface assert\n")
 {
-	pim_show_assert(vty);
+	pim_show_assert(pimg, vty);
 
 	return CMD_SUCCESS;
 }
@@ -3302,7 +3305,7 @@ DEFUN (show_ip_pim_assert_internal,
        PIM_STR
        "PIM interface internal assert state\n")
 {
-	pim_show_assert_internal(vty);
+	pim_show_assert_internal(pimg, vty);
 
 	return CMD_SUCCESS;
 }
@@ -3315,7 +3318,7 @@ DEFUN (show_ip_pim_assert_metric,
        PIM_STR
        "PIM interface assert metric\n")
 {
-	pim_show_assert_metric(vty);
+	pim_show_assert_metric(pimg, vty);
 
 	return CMD_SUCCESS;
 }
@@ -3328,7 +3331,7 @@ DEFUN (show_ip_pim_assert_winner_metric,
        PIM_STR
        "PIM interface assert winner metric\n")
 {
-	pim_show_assert_winner_metric(vty);
+	pim_show_assert_winner_metric(pimg, vty);
 
 	return CMD_SUCCESS;
 }
@@ -3367,7 +3370,7 @@ DEFUN (show_ip_pim_join,
        JSON_STR)
 {
 	u_char uj = use_json(argc, argv);
-	pim_show_join(vty, uj);
+	pim_show_join(pimg, vty, uj);
 
 	return CMD_SUCCESS;
 }
@@ -3382,7 +3385,7 @@ DEFUN (show_ip_pim_local_membership,
        JSON_STR)
 {
 	u_char uj = use_json(argc, argv);
-	pim_show_membership(vty, uj);
+	pim_show_membership(pimg, vty, uj);
 
 	return CMD_SUCCESS;
 }
@@ -3476,7 +3479,7 @@ DEFUN (show_ip_pim_upstream_join_desired,
        "JavaScript Object Notation\n")
 {
 	u_char uj = use_json(argc, argv);
-	pim_show_join_desired(vty, uj);
+	pim_show_join_desired(pimg, vty, uj);
 
 	return CMD_SUCCESS;
 }