pimd: Cleanup use of VRF_DEFAULT to pimg->vrf_id

Use the appropriate vrf_id instead of always defaulting
to VRF_DEFAULT

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

1 files changed, 27 insertions, 28 deletions

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 1c9fe40c29..e32643f66f 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -533,7 +533,7 @@ static void igmp_show_interfaces(struct vty *vty, u_char uj)
 		vty_out(vty,
 			"Interface  State          Address  V  Querier  Query Timer    Uptime\n");
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		struct pim_interface *pim_ifp;
 		struct listnode *sock_node;
 		struct igmp_sock *igmp;
@@ -623,7 +623,7 @@ static void igmp_show_interfaces_single(struct vty *vty, const char *ifname,
 
 	now = pim_time_monotonic_sec();
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		pim_ifp = ifp->info;
 
 		if (!pim_ifp)
@@ -804,7 +804,7 @@ static void igmp_show_interface_join(struct vty *vty)
 	vty_out(vty,
 		"Interface Address         Source          Group           Socket Uptime  \n");
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		struct pim_interface *pim_ifp;
 		struct listnode *join_node;
 		struct igmp_join *ij;
@@ -884,7 +884,7 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname,
 	if (uj)
 		json = json_object_new_object();
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		pim_ifp = ifp->info;
 
 		if (!pim_ifp)
@@ -1165,9 +1165,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname,
 			print_header = 1;
 			for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode,
 						  up)) {
-				if (strcmp(ifp->name,
-					   up->rpf.source_nexthop
-						   .interface->name)
+				if (strcmp(ifp->name, up->rpf.source_nexthop
+							      .interface->name)
 				    == 0) {
 					if (up->flags
 					    & PIM_UPSTREAM_FLAG_MASK_FHR) {
@@ -1279,7 +1278,7 @@ static void pim_show_interfaces(struct vty *vty, u_char uj)
 
 	json = json_object_new_object();
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		pim_ifp = ifp->info;
 
 		if (!pim_ifp)
@@ -1381,7 +1380,7 @@ static void pim_show_interface_traffic(struct vty *vty, u_char uj)
 			"---------------------------------------------------------------------------------------------------------------\n");
 	}
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		pim_ifp = ifp->info;
 
 		if (!pim_ifp)
@@ -1462,7 +1461,7 @@ static void pim_show_interface_traffic_single(struct vty *vty,
 			"---------------------------------------------------------------------------------------------------------------\n");
 	}
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		if (strcmp(ifname, ifp->name))
 			continue;
 
@@ -1657,7 +1656,7 @@ static void pim_show_neighbors_single(struct vty *vty, const char *neighbor,
 	if (uj)
 		json = json_object_new_object();
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		pim_ifp = ifp->info;
 
 		if (!pim_ifp)
@@ -2063,7 +2062,7 @@ static void pim_show_neighbors(struct vty *vty, u_char uj)
 			"Interface         Neighbor    Uptime  Holdtime  DR Pri\n");
 	}
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		pim_ifp = ifp->info;
 
 		if (!pim_ifp)
@@ -2129,7 +2128,7 @@ static void pim_show_neighbors_secondary(struct vty *vty)
 	vty_out(vty,
 		"Interface Address         Neighbor        Secondary      \n");
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		struct pim_interface *pim_ifp;
 		struct in_addr ifaddr;
 		struct listnode *neighnode;
@@ -2661,7 +2660,7 @@ static int pim_print_pnc_cache_walkcb(struct hash_backet *backet, void *arg)
 
 	for (nh_node = pnc->nexthop; nh_node; nh_node = nh_node->next) {
 		first_ifindex = nh_node->ifindex;
-		ifp = if_lookup_by_index(first_ifindex, VRF_DEFAULT);
+		ifp = if_lookup_by_index(first_ifindex, pimg->vrf_id);
 
 		vty_out(vty, "%-15s ", inet_ntoa(pnc->rpf.rpf_addr.u.prefix4));
 		vty_out(vty, "%-14s ", ifp ? ifp->name : "NULL");
@@ -2705,7 +2704,7 @@ static void igmp_show_groups(struct vty *vty, u_char uj)
 			"Interface Address         Group           Mode Timer    Srcs V Uptime  \n");
 
 	/* scan interfaces */
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), ifnode, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), ifnode, ifp)) {
 		struct pim_interface *pim_ifp = ifp->info;
 		struct listnode *sock_node;
 		struct igmp_sock *igmp;
@@ -2817,7 +2816,7 @@ static void igmp_show_group_retransmission(struct vty *vty)
 		"Interface Address         Group           RetTimer Counter RetSrcs\n");
 
 	/* scan interfaces */
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), ifnode, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), ifnode, ifp)) {
 		struct pim_interface *pim_ifp = ifp->info;
 		struct listnode *sock_node;
 		struct igmp_sock *igmp;
@@ -2885,7 +2884,7 @@ static void igmp_show_sources(struct vty *vty)
 		"Interface Address         Group           Source          Timer Fwd Uptime  \n");
 
 	/* scan interfaces */
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), ifnode, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), ifnode, ifp)) {
 		struct pim_interface *pim_ifp = ifp->info;
 		struct listnode *sock_node;
 		struct igmp_sock *igmp;
@@ -2958,7 +2957,7 @@ static void igmp_show_source_retransmission(struct vty *vty)
 		"Interface Address         Group           Source          Counter\n");
 
 	/* scan interfaces */
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), ifnode, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), ifnode, ifp)) {
 		struct pim_interface *pim_ifp = ifp->info;
 		struct listnode *sock_node;
 		struct igmp_sock *igmp;
@@ -3014,12 +3013,12 @@ static void clear_igmp_interfaces()
 	struct listnode *ifnextnode;
 	struct interface *ifp;
 
-	for (ALL_LIST_ELEMENTS(vrf_iflist(VRF_DEFAULT), ifnode, ifnextnode,
+	for (ALL_LIST_ELEMENTS(vrf_iflist(pimg->vrf_id), ifnode, ifnextnode,
 			       ifp)) {
 		pim_if_addr_del_all_igmp(ifp);
 	}
 
-	for (ALL_LIST_ELEMENTS(vrf_iflist(VRF_DEFAULT), ifnode, ifnextnode,
+	for (ALL_LIST_ELEMENTS(vrf_iflist(pimg->vrf_id), ifnode, ifnextnode,
 			       ifp)) {
 		pim_if_addr_add_all(ifp);
 	}
@@ -3031,7 +3030,7 @@ static void clear_pim_interfaces()
 	struct listnode *ifnextnode;
 	struct interface *ifp;
 
-	for (ALL_LIST_ELEMENTS(vrf_iflist(VRF_DEFAULT), ifnode, ifnextnode,
+	for (ALL_LIST_ELEMENTS(vrf_iflist(pimg->vrf_id), ifnode, ifnextnode,
 			       ifp)) {
 		if (ifp->info) {
 			pim_neighbor_delete_all(ifp, "interface cleared");
@@ -3152,7 +3151,7 @@ DEFUN (clear_ip_pim_interface_traffic,
 	struct interface *ifp = NULL;
 	struct pim_interface *pim_ifp = NULL;
 
-	for (ALL_LIST_ELEMENTS(vrf_iflist(VRF_DEFAULT), ifnode, ifnextnode,
+	for (ALL_LIST_ELEMENTS(vrf_iflist(pimg->vrf_id), ifnode, ifnextnode,
 			       ifp)) {
 		pim_ifp = ifp->info;
 
@@ -3647,7 +3646,7 @@ static void show_multicast_interfaces(struct vty *vty)
 	vty_out(vty,
 		"Interface Address         ifi Vif  PktsIn PktsOut    BytesIn   BytesOut\n");
 
-	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
 		struct pim_interface *pim_ifp;
 		struct in_addr ifaddr;
 		struct sioc_vif_req vreq;
@@ -4560,7 +4559,7 @@ DEFUN (no_ip_pim_rp_prefix_list,
 
 static int pim_ssm_cmd_worker(struct vty *vty, const char *plist)
 {
-	int result = pim_ssm_range_set(VRF_DEFAULT, plist);
+	int result = pim_ssm_range_set(pimg->vrf_id, plist);
 
 	if (result == PIM_SSM_ERR_NONE)
 		return CMD_SUCCESS;
@@ -5585,7 +5584,7 @@ DEFUN (interface_ip_mroute,
 	int result;
 
 	oifname = argv[idx_interface]->arg;
-	oif = if_lookup_by_name(oifname, VRF_DEFAULT);
+	oif = if_lookup_by_name(oifname, pimg->vrf_id);
 	if (!oif) {
 		vty_out(vty, "No such interface name %s\n", oifname);
 		return CMD_WARNING_CONFIG_FAILED;
@@ -5631,7 +5630,7 @@ DEFUN (interface_ip_mroute_source,
 	int result;
 
 	oifname = argv[idx_interface]->arg;
-	oif = if_lookup_by_name(oifname, VRF_DEFAULT);
+	oif = if_lookup_by_name(oifname, pimg->vrf_id);
 	if (!oif) {
 		vty_out(vty, "No such interface name %s\n", oifname);
 		return CMD_WARNING_CONFIG_FAILED;
@@ -5681,7 +5680,7 @@ DEFUN (interface_no_ip_mroute,
 	int result;
 
 	oifname = argv[idx_interface]->arg;
-	oif = if_lookup_by_name(oifname, VRF_DEFAULT);
+	oif = if_lookup_by_name(oifname, pimg->vrf_id);
 	if (!oif) {
 		vty_out(vty, "No such interface name %s\n", oifname);
 		return CMD_WARNING_CONFIG_FAILED;
@@ -5728,7 +5727,7 @@ DEFUN (interface_no_ip_mroute_source,
 	int result;
 
 	oifname = argv[idx_interface]->arg;
-	oif = if_lookup_by_name(oifname, VRF_DEFAULT);
+	oif = if_lookup_by_name(oifname, pimg->vrf_id);
 	if (!oif) {
 		vty_out(vty, "No such interface name %s\n", oifname);
 		return CMD_WARNING_CONFIG_FAILED;