ripd: Cleanup ripd.c indentation levels and comments

The entirety of this file is heavily indented.  Work some coding
structure to make it easier to read and understand and not be
so heavily indented.

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

1 files changed, 510 insertions, 540 deletions

diff --git a/ripd/ripd.c b/ripd/ripd.c
index 346c11ad3..5e5be159f 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -224,13 +224,15 @@ struct rip_info *rip_ecmp_replace(struct rip *rip, struct rip_info *rinfo_new)
 			rip_zebra_ipv4_delete(rip, rp);
 
 	/* Re-use the first entry, and delete the others. */
-	for (ALL_LIST_ELEMENTS(list, node, nextnode, tmp_rinfo))
-		if (tmp_rinfo != rinfo) {
-			RIP_TIMER_OFF(tmp_rinfo->t_timeout);
-			RIP_TIMER_OFF(tmp_rinfo->t_garbage_collect);
-			list_delete_node(list, node);
-			rip_info_free(tmp_rinfo);
-		}
+	for (ALL_LIST_ELEMENTS(list, node, nextnode, tmp_rinfo)) {
+		if (tmp_rinfo == rinfo)
+			continue;
+
+		RIP_TIMER_OFF(tmp_rinfo->t_timeout);
+		RIP_TIMER_OFF(tmp_rinfo->t_garbage_collect);
+		list_delete_node(list, node);
+		rip_info_free(tmp_rinfo);
+	}
 
 	RIP_TIMER_OFF(rinfo->t_timeout);
 	RIP_TIMER_OFF(rinfo->t_garbage_collect);
@@ -332,61 +334,56 @@ static int rip_filter(int rip_distribute, struct prefix_ipv4 *p,
 	const char *inout = rip_distribute == RIP_FILTER_OUT ? "out" : "in";
 
 	/* Input distribute-list filtering. */
-	if (ri->list[rip_distribute]) {
-		if (access_list_apply(ri->list[rip_distribute],
-				      (struct prefix *)p)
-		    == FILTER_DENY) {
-			if (IS_RIP_DEBUG_PACKET)
-				zlog_debug("%pFX filtered by distribute %s", p,
-					   inout);
-			return -1;
-		}
+	if (ri->list[rip_distribute] &&
+	    access_list_apply(ri->list[rip_distribute], (struct prefix *)p) ==
+		    FILTER_DENY) {
+		if (IS_RIP_DEBUG_PACKET)
+			zlog_debug("%pFX filtered by distribute %s", p, inout);
+		return -1;
 	}
-	if (ri->prefix[rip_distribute]) {
-		if (prefix_list_apply(ri->prefix[rip_distribute],
-				      (struct prefix *)p)
-		    == PREFIX_DENY) {
-			if (IS_RIP_DEBUG_PACKET)
-				zlog_debug("%pFX filtered by prefix-list %s", p,
-					   inout);
-			return -1;
-		}
+
+	if (ri->prefix[rip_distribute] &&
+	    prefix_list_apply(ri->prefix[rip_distribute], (struct prefix *)p) ==
+		    PREFIX_DENY) {
+		if (IS_RIP_DEBUG_PACKET)
+			zlog_debug("%pFX filtered by prefix-list %s", p, inout);
+		return -1;
 	}
 
 	/* All interface filter check. */
 	dist = distribute_lookup(ri->rip->distribute_ctx, NULL);
-	if (dist) {
-		if (dist->list[distribute]) {
-			alist = access_list_lookup(AFI_IP,
-						   dist->list[distribute]);
+	if (!dist)
+		return 0;
 
-			if (alist) {
-				if (access_list_apply(alist, (struct prefix *)p)
-				    == FILTER_DENY) {
-					if (IS_RIP_DEBUG_PACKET)
-						zlog_debug(
-							"%pFX filtered by distribute %s",
-							p, inout);
-					return -1;
-				}
+	if (dist->list[distribute]) {
+		alist = access_list_lookup(AFI_IP, dist->list[distribute]);
+
+		if (alist) {
+			if (access_list_apply(alist, (struct prefix *)p) ==
+			    FILTER_DENY) {
+				if (IS_RIP_DEBUG_PACKET)
+					zlog_debug(
+						"%pFX filtered by distribute %s",
+						p, inout);
+				return -1;
 			}
 		}
-		if (dist->prefix[distribute]) {
-			plist = prefix_list_lookup(AFI_IP,
-						   dist->prefix[distribute]);
-
-			if (plist) {
-				if (prefix_list_apply(plist, (struct prefix *)p)
-				    == PREFIX_DENY) {
-					if (IS_RIP_DEBUG_PACKET)
-						zlog_debug(
-							"%pFX filtered by prefix-list %s",
-							p, inout);
-					return -1;
-				}
+	}
+	if (dist->prefix[distribute]) {
+		plist = prefix_list_lookup(AFI_IP, dist->prefix[distribute]);
+
+		if (plist) {
+			if (prefix_list_apply(plist, (struct prefix *)p) ==
+			    PREFIX_DENY) {
+				if (IS_RIP_DEBUG_PACKET)
+					zlog_debug(
+						"%pFX filtered by prefix-list %s",
+						p, inout);
+				return -1;
 			}
 		}
 	}
+
 	return 0;
 }
 
@@ -532,46 +529,46 @@ static void rip_rte_process(struct rte *rte, struct sockaddr_in *from,
 			    && IPV4_ADDR_SAME(&rinfo->nh.gate.ipv4, nexthop))
 				break;
 
-			if (!listnextnode(node)) {
-				/* Not found in the list */
+			if (listnextnode(node))
+				continue;
 
-				if (rte->metric > rinfo->metric) {
-					/* New route has a greater metric.
-					 * Discard it. */
-					route_unlock_node(rp);
-					return;
-				}
+			/* Not found in the list */
 
-				if (rte->metric < rinfo->metric)
-					/* New route has a smaller metric.
-					 * Replace the ECMP list
-					 * with the new one in below. */
-					break;
+			if (rte->metric > rinfo->metric) {
+				/* New route has a greater metric.
+				 * Discard it. */
+				route_unlock_node(rp);
+				return;
+			}
 
-				/* Metrics are same. We compare the distances.
-				 */
-				old_dist = rinfo->distance
-						   ? rinfo->distance
+			if (rte->metric < rinfo->metric)
+				/* New route has a smaller metric.
+				 * Replace the ECMP list
+				 * with the new one in below. */
+				break;
+
+			/* Metrics are same. We compare the distances.
+			 */
+			old_dist = rinfo->distance ? rinfo->distance
 						   : ZEBRA_RIP_DISTANCE_DEFAULT;
 
-				if (new_dist > old_dist) {
-					/* New route has a greater distance.
-					 * Discard it. */
-					route_unlock_node(rp);
-					return;
-				}
+			if (new_dist > old_dist) {
+				/* New route has a greater distance.
+				 * Discard it. */
+				route_unlock_node(rp);
+				return;
+			}
 
-				if (new_dist < old_dist)
-					/* New route has a smaller distance.
-					 * Replace the ECMP list
-					 * with the new one in below. */
-					break;
+			if (new_dist < old_dist)
+				/* New route has a smaller distance.
+				 * Replace the ECMP list
+				 * with the new one in below. */
+				break;
 
-				/* Metrics and distances are both same. Keep
-				 * "rinfo" null and
-				 * the new route is added in the ECMP list in
-				 * below. */
-			}
+			/* Metrics and distances are both same. Keep
+			 * "rinfo" null and
+			 * the new route is added in the ECMP list in
+			 * below. */
 		}
 
 	if (rinfo) {
@@ -1278,15 +1275,14 @@ static void rip_response_process(struct rip_packet *packet, int size,
 		}
 
 		/* For RIPv1, there won't be a valid netmask.
-
-		   This is a best guess at the masks.  If everyone was using old
-		   Ciscos before the 'ip subnet zero' option, it would be almost
-		   right too :-)
-
-		   Cisco summarize ripv1 advertisements to the classful boundary
-		   (/16 for class B's) except when the RIP packet does to inside
-		   the classful network in question.  */
-
+		 * This is a best guess at the masks.  If everyone was using old
+		 * Ciscos before the 'ip subnet zero' option, it would be almost
+		 * right too :-)
+		 *
+		 * Cisco summarize ripv1 advertisements to the classful boundary
+		 * (/16 for class B's) except when the RIP packet does to inside
+		 * the classful network in question.
+		 */
 		if ((packet->version == RIPv1
 		     && rte->prefix.s_addr != INADDR_ANY)
 		    || (packet->version == RIPv2
@@ -1467,19 +1463,16 @@ static int rip_send_packet(uint8_t *buf, int size, struct sockaddr_in *to,
 	if (CHECK_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY)) {
 		/*
 		 * ZEBRA_IFA_SECONDARY is set on linux when an interface is
-		 * configured
-		 * with multiple addresses on the same subnet: the first address
-		 * on the subnet is configured "primary", and all subsequent
-		 * addresses
-		 * on that subnet are treated as "secondary" addresses.
-		 * In order to avoid routing-table bloat on other rip listeners,
-		 * we do not send out RIP packets with ZEBRA_IFA_SECONDARY
-		 * source addrs.
+		 * configured with multiple addresses on the same
+		 * subnet: the first address on the subnet is configured
+		 * "primary", and all subsequent addresses on that subnet
+		 * are treated as "secondary" addresses.  In order to avoid
+		 * routing-table bloat on other rip listeners, we do not send
+		 * out RIP packets with ZEBRA_IFA_SECONDARY source addrs.
 		 * XXX Since Linux is the only system for which the
-		 * ZEBRA_IFA_SECONDARY
-		 * flag is set, we would end up sending a packet for a
-		 * "secondary"
-		 * source address on non-linux systems.
+		 * ZEBRA_IFA_SECONDARY flag is set, we would end up
+		 * sending a packet for a "secondary" source address on
+		 * non-linux systems.
 		 */
 		if (IS_RIP_DEBUG_PACKET)
 			zlog_debug("duplicate dropped");
@@ -2122,270 +2115,240 @@ void rip_output_process(struct connected *ifc, struct sockaddr_in *to,
 			subnetted = 1;
 	}
 
-	for (rp = route_top(rip->table); rp; rp = route_next(rp))
-		if ((list = rp->info) != NULL && listcount(list) != 0) {
-			rinfo = listgetdata(listhead(list));
-			/* For RIPv1, if we are subnetted, output subnets in our
-			 * network    */
-			/* that have the same mask as the output "interface".
-			 * For other     */
-			/* networks, only the classfull version is output. */
+	for (rp = route_top(rip->table); rp; rp = route_next(rp)) {
+		list = rp->info;
 
-			if (version == RIPv1) {
-				p = (struct prefix_ipv4 *)&rp->p;
+		if (list == NULL)
+			continue;
 
-				if (IS_RIP_DEBUG_PACKET)
-					zlog_debug(
-						"RIPv1 mask check, %pFX considered for output",
-						&rp->p);
-
-				if (subnetted
-				    && prefix_match(
-					       (struct prefix *)&ifaddrclass,
-					       &rp->p)) {
-					if ((ifc->address->prefixlen
-					     != rp->p.prefixlen)
-					    && (rp->p.prefixlen
-						!= IPV4_MAX_BITLEN))
-						continue;
-				} else {
-					memcpy(&classfull, &rp->p,
-					       sizeof(struct prefix_ipv4));
-					apply_classful_mask_ipv4(&classfull);
-					if (rp->p.u.prefix4.s_addr != INADDR_ANY
-					    && classfull.prefixlen
-						       != rp->p.prefixlen)
-						continue;
-				}
-				if (IS_RIP_DEBUG_PACKET)
-					zlog_debug(
-						"RIPv1 mask check, %pFX made it through",
-						&rp->p);
-			} else
-				p = (struct prefix_ipv4 *)&rp->p;
+		if (listcount(list) == 0)
+			continue;
 
-			/* Apply output filters. */
-			ret = rip_filter(RIP_FILTER_OUT, p, ri);
-			if (ret < 0)
-				continue;
+		rinfo = listgetdata(listhead(list));
+		/*
+		 * For RIPv1, if we are subnetted, output subnets in our
+		 * network that have the same mask as the output "interface".
+		 * For other networks, only the classfull version is output.
+		 */
+		if (version == RIPv1) {
+			p = (struct prefix_ipv4 *)&rp->p;
 
-			/* Changed route only output. */
-			if (route_type == rip_changed_route
-			    && (!(rinfo->flags & RIP_RTF_CHANGED)))
-				continue;
+			if (IS_RIP_DEBUG_PACKET)
+				zlog_debug(
+					"RIPv1 mask check, %pFX considered for output",
+					&rp->p);
+
+			if (subnetted &&
+			    prefix_match((struct prefix *)&ifaddrclass,
+					 &rp->p)) {
+				if ((ifc->address->prefixlen !=
+				     rp->p.prefixlen) &&
+				    (rp->p.prefixlen != IPV4_MAX_BITLEN))
+					continue;
+			} else {
+				memcpy(&classfull, &rp->p,
+				       sizeof(struct prefix_ipv4));
+				apply_classful_mask_ipv4(&classfull);
+				if (rp->p.u.prefix4.s_addr != INADDR_ANY &&
+				    classfull.prefixlen != rp->p.prefixlen)
+					continue;
+			}
+			if (IS_RIP_DEBUG_PACKET)
+				zlog_debug(
+					"RIPv1 mask check, %pFX made it through",
+					&rp->p);
+		} else
+			p = (struct prefix_ipv4 *)&rp->p;
 
-			/* Split horizon. */
-			/* if (split_horizon == rip_split_horizon) */
-			if (ri->split_horizon == RIP_SPLIT_HORIZON) {
-				/*
-				 * We perform split horizon for RIP and
-				 * connected route.
-				 * For rip routes, we want to suppress the route
-				 * if we would
-				 * end up sending the route back on the
-				 * interface that we
-				 * learned it from, with a higher metric. For
-				 * connected routes,
-				 * we suppress the route if the prefix is a
-				 * subset of the
-				 * source address that we are going to use for
-				 * the packet
-				 * (in order to handle the case when multiple
-				 * subnets are
-				 * configured on the same interface).
-				 */
-				int suppress = 0;
-				struct rip_info *tmp_rinfo = NULL;
-				struct connected *tmp_ifc = NULL;
-
-				for (ALL_LIST_ELEMENTS_RO(list, listnode,
-							  tmp_rinfo))
-					if (tmp_rinfo->type == ZEBRA_ROUTE_RIP
-					    && tmp_rinfo->nh.ifindex
-						       == ifc->ifp->ifindex) {
-						suppress = 1;
-						break;
-					}
+		/* Apply output filters. */
+		ret = rip_filter(RIP_FILTER_OUT, p, ri);
+		if (ret < 0)
+			continue;
+
+		/* Changed route only output. */
+		if (route_type == rip_changed_route &&
+		    (!(rinfo->flags & RIP_RTF_CHANGED)))
+			continue;
 
-				if (!suppress
-				    && rinfo->type == ZEBRA_ROUTE_CONNECT) {
-					for (ALL_LIST_ELEMENTS_RO(
-						     ifc->ifp->connected,
-						     listnode, tmp_ifc))
-						if (prefix_match(
-							    (struct prefix *)p,
-							    tmp_ifc->address)) {
-							suppress = 1;
-							break;
-						}
+		/* Split horizon. */
+		if (ri->split_horizon == RIP_SPLIT_HORIZON) {
+			/*
+			 * We perform split horizon for RIP and connected
+			 * route.  For rip routes, we want to suppress the
+			 * route if we would end up sending the route back on
+			 * the interface that we learned it from, with a
+			 * higher metric. For connected routes, we suppress
+			 * the route if the prefix is a subset of the source
+			 * address that we are going to use for the packet
+			 * (in order to handle the case when multiple subnets
+			 * are configured on the same interface).
+			 */
+			int suppress = 0;
+			struct rip_info *tmp_rinfo = NULL;
+			struct connected *tmp_ifc = NULL;
+
+			for (ALL_LIST_ELEMENTS_RO(list, listnode, tmp_rinfo))
+				if (tmp_rinfo->type == ZEBRA_ROUTE_RIP &&
+				    tmp_rinfo->nh.ifindex ==
+					    ifc->ifp->ifindex) {
+					suppress = 1;
+					break;
 				}
 
-				if (suppress)
-					continue;
+			if (!suppress && rinfo->type == ZEBRA_ROUTE_CONNECT) {
+				for (ALL_LIST_ELEMENTS_RO(ifc->ifp->connected,
+							  listnode, tmp_ifc))
+					if (prefix_match((struct prefix *)p,
+							 tmp_ifc->address)) {
+						suppress = 1;
+						break;
+					}
 			}
 
-			/* Preparation for route-map. */
-			rinfo->metric_set = 0;
-			rinfo->nexthop_out.s_addr = 0;
-			rinfo->metric_out = rinfo->metric;
-			rinfo->tag_out = rinfo->tag;
-			rinfo->ifindex_out = ifc->ifp->ifindex;
-
-			/* In order to avoid some local loops,
-			 * if the RIP route has a nexthop via this interface,
-			 * keep the nexthop,
-			 * otherwise set it to 0. The nexthop should not be
-			 * propagated
-			 * beyond the local broadcast/multicast area in order
-			 * to avoid an IGP multi-level recursive look-up.
-			 * see (4.4)
-			 */
-			if (rinfo->nh.ifindex == ifc->ifp->ifindex)
-				rinfo->nexthop_out = rinfo->nh.gate.ipv4;
+			if (suppress)
+				continue;
+		}
+
+		/* Preparation for route-map. */
+		rinfo->metric_set = 0;
+		rinfo->nexthop_out.s_addr = 0;
+		rinfo->metric_out = rinfo->metric;
+		rinfo->tag_out = rinfo->tag;
+		rinfo->ifindex_out = ifc->ifp->ifindex;
+
+		/* In order to avoid some local loops, if the RIP route has
+		 * a nexthop via this interface, keep the nexthop, otherwise
+		 * set it to 0. The nexthop should not be propagated beyond
+		 * the local broadcast/multicast area in order to avoid an
+		 * IGP multi-level recursive look-up. see (4.4)
+		 */
+		if (rinfo->nh.ifindex == ifc->ifp->ifindex)
+			rinfo->nexthop_out = rinfo->nh.gate.ipv4;
 
-			/* Interface route-map */
-			if (ri->routemap[RIP_FILTER_OUT]) {
-				ret = route_map_apply(
-					ri->routemap[RIP_FILTER_OUT],
-					(struct prefix *)p, rinfo);
+		/* Interface route-map */
+		if (ri->routemap[RIP_FILTER_OUT]) {
+			ret = route_map_apply(ri->routemap[RIP_FILTER_OUT],
+					      (struct prefix *)p, rinfo);
 
-				if (ret == RMAP_DENYMATCH) {
-					if (IS_RIP_DEBUG_PACKET)
-						zlog_debug(
-							"RIP %pFX is filtered by route-map out",
-							p);
-					continue;
-				}
+			if (ret == RMAP_DENYMATCH) {
+				if (IS_RIP_DEBUG_PACKET)
+					zlog_debug(
+						"RIP %pFX is filtered by route-map out",
+						p);
+				continue;
 			}
+		}
 
-			/* Apply redistribute route map - continue, if deny */
-			if (rip->redist[rinfo->type].route_map.name
-			    && rinfo->sub_type != RIP_ROUTE_INTERFACE) {
-				ret = route_map_apply(
-					rip->redist[rinfo->type].route_map.map,
-					(struct prefix *)p, rinfo);
+		/* Apply redistribute route map - continue, if deny */
+		if (rip->redist[rinfo->type].route_map.name &&
+		    rinfo->sub_type != RIP_ROUTE_INTERFACE) {
+			ret = route_map_apply(
+				rip->redist[rinfo->type].route_map.map,
+				(struct prefix *)p, rinfo);
 
-				if (ret == RMAP_DENYMATCH) {
-					if (IS_RIP_DEBUG_PACKET)
-						zlog_debug(
-							"%pFX is filtered by route-map",
-							p);
-					continue;
-				}
+			if (ret == RMAP_DENYMATCH) {
+				if (IS_RIP_DEBUG_PACKET)
+					zlog_debug(
+						"%pFX is filtered by route-map",
+						p);
+				continue;
 			}
+		}
 
-			/* When route-map does not set metric. */
-			if (!rinfo->metric_set) {
-				/* If redistribute metric is set. */
-				if (rip->redist[rinfo->type].metric_config
-				    && rinfo->metric != RIP_METRIC_INFINITY) {
-					rinfo->metric_out =
-						rip->redist[rinfo->type].metric;
-				} else {
-					/* If the route is not connected or
-					   localy generated
-					   one, use default-metric value*/
-					if (rinfo->type != ZEBRA_ROUTE_RIP
-					    && rinfo->type
-						       != ZEBRA_ROUTE_CONNECT
-					    && rinfo->metric
-						       != RIP_METRIC_INFINITY)
-						rinfo->metric_out =
-							rip->default_metric;
-				}
+		/* When route-map does not set metric. */
+		if (!rinfo->metric_set) {
+			/* If redistribute metric is set. */
+			if (rip->redist[rinfo->type].metric_config &&
+			    rinfo->metric != RIP_METRIC_INFINITY) {
+				rinfo->metric_out =
+					rip->redist[rinfo->type].metric;
+			} else {
+				/* If the route is not connected or localy
+				 * generated one, use default-metric value
+				 */
+				if (rinfo->type != ZEBRA_ROUTE_RIP &&
+				    rinfo->type != ZEBRA_ROUTE_CONNECT &&
+				    rinfo->metric != RIP_METRIC_INFINITY)
+					rinfo->metric_out = rip->default_metric;
 			}
+		}
 
-			/* Apply offset-list */
-			if (rinfo->metric != RIP_METRIC_INFINITY)
-				rip_offset_list_apply_out(p, ifc->ifp,
-							  &rinfo->metric_out);
-
-			if (rinfo->metric_out > RIP_METRIC_INFINITY)
-				rinfo->metric_out = RIP_METRIC_INFINITY;
-
-			/* Perform split-horizon with poisoned reverse
-			 * for RIP and connected routes.
-			 **/
-			if (ri->split_horizon
-			    == RIP_SPLIT_HORIZON_POISONED_REVERSE) {
-				/*
-				 * We perform split horizon for RIP and
-				 * connected route.
-				 * For rip routes, we want to suppress the route
-				 * if we would
-				 * end up sending the route back on the
-				 * interface that we
-				 * learned it from, with a higher metric. For
-				 * connected routes,
-				 * we suppress the route if the prefix is a
-				 * subset of the
-				 * source address that we are going to use for
-				 * the packet
-				 * (in order to handle the case when multiple
-				 * subnets are
-				 * configured on the same interface).
-				 */
-				struct rip_info *tmp_rinfo = NULL;
-				struct connected *tmp_ifc = NULL;
-
-				for (ALL_LIST_ELEMENTS_RO(list, listnode,
-							  tmp_rinfo))
-					if (tmp_rinfo->type == ZEBRA_ROUTE_RIP
-					    && tmp_rinfo->nh.ifindex
-						       == ifc->ifp->ifindex)
+		/* Apply offset-list */
+		if (rinfo->metric != RIP_METRIC_INFINITY)
+			rip_offset_list_apply_out(p, ifc->ifp,
+						  &rinfo->metric_out);
+
+		if (rinfo->metric_out > RIP_METRIC_INFINITY)
+			rinfo->metric_out = RIP_METRIC_INFINITY;
+
+		/* Perform split-horizon with poisoned reverse
+		 * for RIP and connected routes.
+		 **/
+		if (ri->split_horizon == RIP_SPLIT_HORIZON_POISONED_REVERSE) {
+			/*
+			 * We perform split horizon for RIP and connected
+			 * route.  For rip routes, we want to suppress the
+			 * route if we would end up sending the route back
+			 * on the interface that we learned it from, with a
+			 * higher metric. For connected routes, we suppress
+			 * the route if the prefix is a subset of the source
+			 * address that we are going to use for the packet
+			 * (in order to handle the case when multiple
+			 * subnets are configured on the same interface).
+			 */
+			struct rip_info *tmp_rinfo = NULL;
+			struct connected *tmp_ifc = NULL;
+
+			for (ALL_LIST_ELEMENTS_RO(list, listnode, tmp_rinfo))
+				if (tmp_rinfo->type == ZEBRA_ROUTE_RIP &&
+				    tmp_rinfo->nh.ifindex == ifc->ifp->ifindex)
+					rinfo->metric_out = RIP_METRIC_INFINITY;
+
+			if (rinfo->metric_out != RIP_METRIC_INFINITY &&
+			    rinfo->type == ZEBRA_ROUTE_CONNECT) {
+				for (ALL_LIST_ELEMENTS_RO(ifc->ifp->connected,
+							  listnode, tmp_ifc))
+					if (prefix_match((struct prefix *)p,
+							 tmp_ifc->address)) {
 						rinfo->metric_out =
 							RIP_METRIC_INFINITY;
-
-				if (rinfo->metric_out != RIP_METRIC_INFINITY
-				    && rinfo->type == ZEBRA_ROUTE_CONNECT) {
-					for (ALL_LIST_ELEMENTS_RO(
-						     ifc->ifp->connected,
-						     listnode, tmp_ifc))
-						if (prefix_match(
-							    (struct prefix *)p,
-							    tmp_ifc->address)) {
-							rinfo->metric_out =
-								RIP_METRIC_INFINITY;
-							break;
-						}
-				}
+						break;
+					}
 			}
+		}
 
-			/* Prepare preamble, auth headers, if needs be */
-			if (num == 0) {
-				stream_putc(s, RIP_RESPONSE);
-				stream_putc(s, version);
-				stream_putw(s, 0);
-
-				/* auth header for !v1 && !no_auth */
-				if ((ri->auth_type != RIP_NO_AUTH)
-				    && (version != RIPv1))
-					doff = rip_auth_header_write(
-						s, ri, key, auth_str,
-						RIP_AUTH_SIMPLE_SIZE);
-			}
+		/* Prepare preamble, auth headers, if needs be */
+		if (num == 0) {
+			stream_putc(s, RIP_RESPONSE);
+			stream_putc(s, version);
+			stream_putw(s, 0);
+
+			/* auth header for !v1 && !no_auth */
+			if ((ri->auth_type != RIP_NO_AUTH) &&
+			    (version != RIPv1))
+				doff = rip_auth_header_write(
+					s, ri, key, auth_str,
+					RIP_AUTH_SIMPLE_SIZE);
+		}
 
-			/* Write RTE to the stream. */
-			num = rip_write_rte(num, s, p, version, rinfo);
-			if (num == rtemax) {
-				if (version == RIPv2
-				    && ri->auth_type == RIP_AUTH_MD5)
-					rip_auth_md5_set(s, ri, doff, auth_str,
-							 RIP_AUTH_SIMPLE_SIZE);
-
-				ret = rip_send_packet(STREAM_DATA(s),
-						      stream_get_endp(s), to,
-						      ifc);
-
-				if (ret >= 0 && IS_RIP_DEBUG_SEND)
-					rip_packet_dump((struct rip_packet *)
-								STREAM_DATA(s),
-							stream_get_endp(s),
-							"SEND");
-				num = 0;
-				stream_reset(s);
-			}
+		/* Write RTE to the stream. */
+		num = rip_write_rte(num, s, p, version, rinfo);
+		if (num == rtemax) {
+			if (version == RIPv2 && ri->auth_type == RIP_AUTH_MD5)
+				rip_auth_md5_set(s, ri, doff, auth_str,
+						 RIP_AUTH_SIMPLE_SIZE);
+
+			ret = rip_send_packet(STREAM_DATA(s),
+					      stream_get_endp(s), to, ifc);
+
+			if (ret >= 0 && IS_RIP_DEBUG_SEND)
+				rip_packet_dump(
+					(struct rip_packet *)STREAM_DATA(s),
+					stream_get_endp(s), "SEND");
+			num = 0;
+			stream_reset(s);
 		}
+	}
 
 	/* Flush unwritten RTE. */
 	if (num != 0) {
@@ -2481,61 +2444,59 @@ static void rip_update_process(struct rip *rip, int route_type)
 		if (ri->passive)
 			continue;
 
-		if (ri->running) {
-			/*
-			 * If there is no version configuration in the
-			 * interface,
-			 * use rip's version setting.
-			 */
-			int vsend = ((ri->ri_send == RI_RIP_UNSPEC)
-					     ? rip->version_send
-					     : ri->ri_send);
+		if (!ri->running)
+			continue;
 
-			if (IS_RIP_DEBUG_EVENT)
-				zlog_debug("SEND UPDATE to %s ifindex %d",
-					   ifp->name, ifp->ifindex);
-
-			/* send update on each connected network */
-			for (ALL_LIST_ELEMENTS(ifp->connected, ifnode, ifnnode,
-					       connected)) {
-				if (connected->address->family == AF_INET) {
-					if (vsend & RIPv1)
-						rip_update_interface(
-							connected, RIPv1,
-							route_type);
-					if ((vsend & RIPv2)
-					    && if_is_multicast(ifp))
-						rip_update_interface(
-							connected, RIPv2,
-							route_type);
-				}
+		/*
+		 * If there is no version configuration in the
+		 * interface, use rip's version setting.
+		 */
+		int vsend = ((ri->ri_send == RI_RIP_UNSPEC) ? rip->version_send
+							    : ri->ri_send);
+
+		if (IS_RIP_DEBUG_EVENT)
+			zlog_debug("SEND UPDATE to %s ifindex %d", ifp->name,
+				   ifp->ifindex);
+
+		/* send update on each connected network */
+		for (ALL_LIST_ELEMENTS(ifp->connected, ifnode, ifnnode,
+				       connected)) {
+			if (connected->address->family == AF_INET) {
+				if (vsend & RIPv1)
+					rip_update_interface(connected, RIPv1,
+							     route_type);
+				if ((vsend & RIPv2) && if_is_multicast(ifp))
+					rip_update_interface(connected, RIPv2,
+							     route_type);
 			}
 		}
 	}
 
 	/* RIP send updates to each neighbor. */
-	for (rp = route_top(rip->neighbor); rp; rp = route_next(rp))
-		if (rp->info != NULL) {
-			p = &rp->p;
-
-			connected = if_lookup_address(&p->u.prefix4, AF_INET,
-						      rip->vrf->vrf_id);
-			if (!connected) {
-				zlog_warn(
-					"Neighbor %pI4 doesn't have connected interface!",
-					&p->u.prefix4);
-				continue;
-			}
+	for (rp = route_top(rip->neighbor); rp; rp = route_next(rp)) {
+		if (rp->info == NULL)
+			continue;
 
-			/* Set destination address and port */
-			memset(&to, 0, sizeof(struct sockaddr_in));
-			to.sin_addr = p->u.prefix4;
-			to.sin_port = htons(RIP_PORT_DEFAULT);
+		p = &rp->p;
 
-			/* RIP version is rip's configuration. */
-			rip_output_process(connected, &to, route_type,
-					   rip->version_send);
+		connected = if_lookup_address(&p->u.prefix4, AF_INET,
+					      rip->vrf->vrf_id);
+		if (!connected) {
+			zlog_warn(
+				"Neighbor %pI4 doesn't have connected interface!",
+				&p->u.prefix4);
+			continue;
 		}
+
+		/* Set destination address and port */
+		memset(&to, 0, sizeof(struct sockaddr_in));
+		to.sin_addr = p->u.prefix4;
+		to.sin_port = htons(RIP_PORT_DEFAULT);
+
+		/* RIP version is rip's configuration. */
+		rip_output_process(connected, &to, route_type,
+				   rip->version_send);
+	}
 }
 
 /* RIP's periodical timer. */
@@ -2568,14 +2529,18 @@ static void rip_clear_changed_flag(struct rip *rip)
 	struct list *list = NULL;
 	struct listnode *listnode = NULL;
 
-	for (rp = route_top(rip->table); rp; rp = route_next(rp))
-		if ((list = rp->info) != NULL)
-			for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) {
-				UNSET_FLAG(rinfo->flags, RIP_RTF_CHANGED);
-				/* This flag can be set only on the first entry.
-				 */
-				break;
-			}
+	for (rp = route_top(rip->table); rp; rp = route_next(rp)) {
+		list = rp->info;
+
+		if (list == NULL)
+			continue;
+
+		for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) {
+			UNSET_FLAG(rinfo->flags, RIP_RTF_CHANGED);
+			/* This flag can be set only on the first entry. */
+			break;
+		}
+	}
 }
 
 /* Triggered update interval timer. */
@@ -2631,34 +2596,39 @@ void rip_redistribute_withdraw(struct rip *rip, int type)
 	struct rip_info *rinfo = NULL;
 	struct list *list = NULL;
 
-	for (rp = route_top(rip->table); rp; rp = route_next(rp))
-		if ((list = rp->info) != NULL) {
-			rinfo = listgetdata(listhead(list));
-			if (rinfo->type == type
-			    && rinfo->sub_type != RIP_ROUTE_INTERFACE) {
-				/* Perform poisoned reverse. */
-				rinfo->metric = RIP_METRIC_INFINITY;
-				RIP_TIMER_ON(rinfo->t_garbage_collect,
-					     rip_garbage_collect,
-					     rip->garbage_time);
-				RIP_TIMER_OFF(rinfo->t_timeout);
-				rinfo->flags |= RIP_RTF_CHANGED;
+	for (rp = route_top(rip->table); rp; rp = route_next(rp)) {
+		list = rp->info;
 
-				if (IS_RIP_DEBUG_EVENT) {
-					struct prefix_ipv4 *p =
-						(struct prefix_ipv4 *)&rp->p;
+		if (list == NULL)
+			continue;
 
-					zlog_debug(
-						"Poisone %pFX on the interface %s with an infinity metric [withdraw]",
-						p,
-						ifindex2ifname(
-							rinfo->nh.ifindex,
-							rip->vrf->vrf_id));
-				}
+		rinfo = listgetdata(listhead(list));
 
-				rip_event(rip, RIP_TRIGGERED_UPDATE, 0);
-			}
+		if (rinfo->type != type)
+			continue;
+
+		if (rinfo->sub_type == RIP_ROUTE_INTERFACE)
+			continue;
+
+		/* Perform poisoned reverse. */
+		rinfo->metric = RIP_METRIC_INFINITY;
+		RIP_TIMER_ON(rinfo->t_garbage_collect, rip_garbage_collect,
+			     rip->garbage_time);
+		RIP_TIMER_OFF(rinfo->t_timeout);
+		rinfo->flags |= RIP_RTF_CHANGED;
+
+		if (IS_RIP_DEBUG_EVENT) {
+			struct prefix_ipv4 *p = (struct prefix_ipv4 *)&rp->p;
+
+			zlog_debug(
+				"Poisone %pFX on the interface %s with an infinity metric [withdraw]",
+				p,
+				ifindex2ifname(rinfo->nh.ifindex,
+					       rip->vrf->vrf_id));
 		}
+
+		rip_event(rip, RIP_TRIGGERED_UPDATE, 0);
+	}
 }
 
 struct rip *rip_lookup_by_vrf_id(vrf_id_t vrf_id)
@@ -2915,19 +2885,20 @@ static void rip_distance_show(struct vty *vty, struct rip *rip)
 	vty_out(vty, "  Distance: (default is %u)\n",
 		rip->distance ? rip->distance : ZEBRA_RIP_DISTANCE_DEFAULT);
 
-	for (rn = route_top(rip->distance_table); rn; rn = route_next(rn))
-		if ((rdistance = rn->info) != NULL) {
-			if (header) {
-				vty_out(vty,
-					"    Address           Distance  List\n");
-				header = 0;
-			}
-			snprintfrr(buf, sizeof(buf), "%pFX", &rn->p);
-			vty_out(vty, "    %-20s  %4d  %s\n", buf,
-				rdistance->distance,
-				rdistance->access_list ? rdistance->access_list
-						       : "");
+	for (rn = route_top(rip->distance_table); rn; rn = route_next(rn)) {
+		rdistance = rn->info;
+
+		if (rdistance == NULL)
+			continue;
+
+		if (header) {
+			vty_out(vty, "    Address           Distance  List\n");
+			header = 0;
 		}
+		snprintfrr(buf, sizeof(buf), "%pFX", &rn->p);
+		vty_out(vty, "    %-20s  %4d  %s\n", buf, rdistance->distance,
+			rdistance->access_list ? rdistance->access_list : "");
+	}
 }
 
 /* Update ECMP routes to zebra when ECMP is disabled. */
@@ -2938,31 +2909,38 @@ void rip_ecmp_disable(struct rip *rip)
 	struct list *list;
 	struct listnode *node, *nextnode;
 
-	for (rp = route_top(rip->table); rp; rp = route_next(rp))
-		if ((list = rp->info) != NULL && listcount(list) > 1) {
-			rinfo = listgetdata(listhead(list));
-			if (!rip_route_rte(rinfo))
-				continue;
+	for (rp = route_top(rip->table); rp; rp = route_next(rp)) {
+		list = rp->info;
 
-			/* Drop all other entries, except the first one. */
-			for (ALL_LIST_ELEMENTS(list, node, nextnode, tmp_rinfo))
-				if (tmp_rinfo != rinfo) {
-					RIP_TIMER_OFF(tmp_rinfo->t_timeout);
-					RIP_TIMER_OFF(
-						tmp_rinfo->t_garbage_collect);
-					list_delete_node(list, node);
-					rip_info_free(tmp_rinfo);
-				}
+		if (!list)
+			continue;
+		if (listcount(list) == 0)
+			continue;
 
-			/* Update zebra. */
-			rip_zebra_ipv4_add(rip, rp);
+		rinfo = listgetdata(listhead(list));
+		if (!rip_route_rte(rinfo))
+			continue;
 
-			/* Set the route change flag. */
-			SET_FLAG(rinfo->flags, RIP_RTF_CHANGED);
+		/* Drop all other entries, except the first one. */
+		for (ALL_LIST_ELEMENTS(list, node, nextnode, tmp_rinfo)) {
+			if (tmp_rinfo == rinfo)
+				continue;
 
-			/* Signal the output process to trigger an update. */
-			rip_event(rip, RIP_TRIGGERED_UPDATE, 0);
+			RIP_TIMER_OFF(tmp_rinfo->t_timeout);
+			RIP_TIMER_OFF(tmp_rinfo->t_garbage_collect);
+			list_delete_node(list, node);
+			rip_info_free(tmp_rinfo);
 		}
+
+		/* Update zebra. */
+		rip_zebra_ipv4_add(rip, rp);
+
+		/* Set the route change flag. */
+		SET_FLAG(rinfo->flags, RIP_RTF_CHANGED);
+
+		/* Signal the output process to trigger an update. */
+		rip_event(rip, RIP_TRIGGERED_UPDATE, 0);
+	}
 }
 
 /* Print out routes update time. */
@@ -3043,82 +3021,77 @@ DEFUN (show_ip_rip,
 		"      (i) - interface\n\n"
 		"     Network            Next Hop         Metric From            Tag Time\n");
 
-	for (np = route_top(rip->table); np; np = route_next(np))
-		if ((list = np->info) != NULL)
-			for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) {
-				int len;
-
-				len = vty_out(
-					vty, "%c(%s) %pFX",
-					/* np->lock, For debugging. */
-					zebra_route_char(rinfo->type),
-					rip_route_type_print(rinfo->sub_type),
-					&np->p);
-
-				len = 24 - len;
-
-				if (len > 0)
-					vty_out(vty, "%*s", len, " ");
-
-				switch (rinfo->nh.type) {
-				case NEXTHOP_TYPE_IPV4:
-				case NEXTHOP_TYPE_IPV4_IFINDEX:
-					vty_out(vty, "%-20pI4 %2d ",
-						&rinfo->nh.gate.ipv4,
-						rinfo->metric);
-					break;
-				case NEXTHOP_TYPE_IFINDEX:
-					vty_out(vty,
-						"0.0.0.0              %2d ",
-						rinfo->metric);
-					break;
-				case NEXTHOP_TYPE_BLACKHOLE:
-					vty_out(vty,
-						"blackhole            %2d ",
-						rinfo->metric);
-					break;
-				case NEXTHOP_TYPE_IPV6:
-				case NEXTHOP_TYPE_IPV6_IFINDEX:
-					vty_out(vty,
-						"V6 Address Hidden    %2d ",
-						rinfo->metric);
-					break;
-				}
+	for (np = route_top(rip->table); np; np = route_next(np)) {
+		list = np->info;
 
-				/* Route which exist in kernel routing table. */
-				if ((rinfo->type == ZEBRA_ROUTE_RIP)
-				    && (rinfo->sub_type == RIP_ROUTE_RTE)) {
-					vty_out(vty, "%-15pI4 ",
-						&rinfo->from);
-					vty_out(vty, "%3" ROUTE_TAG_PRI " ",
-						(route_tag_t)rinfo->tag);
-					rip_vty_out_uptime(vty, rinfo);
-				} else if (rinfo->metric
-					   == RIP_METRIC_INFINITY) {
-					vty_out(vty, "self            ");
-					vty_out(vty, "%3" ROUTE_TAG_PRI " ",
-						(route_tag_t)rinfo->tag);
-					rip_vty_out_uptime(vty, rinfo);
-				} else {
-					if (rinfo->external_metric) {
-						len = vty_out(
-							vty, "self (%s:%d)",
-							zebra_route_string(
-								rinfo->type),
-							rinfo->external_metric);
-						len = 16 - len;
-						if (len > 0)
-							vty_out(vty, "%*s", len,
-								" ");
-					} else
-						vty_out(vty,
-							"self            ");
-					vty_out(vty, "%3" ROUTE_TAG_PRI,
-						(route_tag_t)rinfo->tag);
-				}
+		if (!list)
+			continue;
+
+		for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) {
+			int len;
+
+			len = vty_out(vty, "%c(%s) %pFX",
+				      /* np->lock, For debugging. */
+				      zebra_route_char(rinfo->type),
+				      rip_route_type_print(rinfo->sub_type),
+				      &np->p);
+
+			len = 24 - len;
+
+			if (len > 0)
+				vty_out(vty, "%*s", len, " ");
 
-				vty_out(vty, "\n");
+			switch (rinfo->nh.type) {
+			case NEXTHOP_TYPE_IPV4:
+			case NEXTHOP_TYPE_IPV4_IFINDEX:
+				vty_out(vty, "%-20pI4 %2d ",
+					&rinfo->nh.gate.ipv4, rinfo->metric);
+				break;
+			case NEXTHOP_TYPE_IFINDEX:
+				vty_out(vty, "0.0.0.0              %2d ",
+					rinfo->metric);
+				break;
+			case NEXTHOP_TYPE_BLACKHOLE:
+				vty_out(vty, "blackhole            %2d ",
+					rinfo->metric);
+				break;
+			case NEXTHOP_TYPE_IPV6:
+			case NEXTHOP_TYPE_IPV6_IFINDEX:
+				vty_out(vty, "V6 Address Hidden    %2d ",
+					rinfo->metric);
+				break;
+			}
+
+			/* Route which exist in kernel routing table. */
+			if ((rinfo->type == ZEBRA_ROUTE_RIP) &&
+			    (rinfo->sub_type == RIP_ROUTE_RTE)) {
+				vty_out(vty, "%-15pI4 ", &rinfo->from);
+				vty_out(vty, "%3" ROUTE_TAG_PRI " ",
+					(route_tag_t)rinfo->tag);
+				rip_vty_out_uptime(vty, rinfo);
+			} else if (rinfo->metric == RIP_METRIC_INFINITY) {
+				vty_out(vty, "self            ");
+				vty_out(vty, "%3" ROUTE_TAG_PRI " ",
+					(route_tag_t)rinfo->tag);
+				rip_vty_out_uptime(vty, rinfo);
+			} else {
+				if (rinfo->external_metric) {
+					len = vty_out(
+						vty, "self (%s:%d)",
+						zebra_route_string(rinfo->type),
+						rinfo->external_metric);
+					len = 16 - len;
+					if (len > 0)
+						vty_out(vty, "%*s", len, " ");
+				} else
+					vty_out(vty, "self            ");
+				vty_out(vty, "%3" ROUTE_TAG_PRI,
+					(route_tag_t)rinfo->tag);
 			}
+
+			vty_out(vty, "\n");
+		}
+	}
 	return CMD_SUCCESS;
 }
 
@@ -3218,20 +3191,17 @@ DEFUN (show_ip_rip_status,
 	vty_out(vty, "  Routing for Networks:\n");
 	rip_show_network_config(vty, rip);
 
-	{
-		int found_passive = 0;
-		FOR_ALL_INTERFACES (rip->vrf, ifp) {
-			ri = ifp->info;
-
-			if ((ri->enable_network || ri->enable_interface)
-			    && ri->passive) {
-				if (!found_passive) {
-					vty_out(vty,
-						"  Passive Interface(s):\n");
-					found_passive = 1;
-				}
-				vty_out(vty, "    %s\n", ifp->name);
+	int found_passive = 0;
+	FOR_ALL_INTERFACES (rip->vrf, ifp) {
+		ri = ifp->info;
+
+		if ((ri->enable_network || ri->enable_interface) &&
+		    ri->passive) {
+			if (!found_passive) {
+				vty_out(vty, "  Passive Interface(s):\n");
+				found_passive = 1;
 			}
+			vty_out(vty, "    %s\n", ifp->name);
 		}
 	}