1 files changed, 54 insertions, 64 deletions

diff --git a/staticd/static_routes.c b/staticd/static_routes.c
index cdafc4a76a..0ca0011d00 100644
--- a/staticd/static_routes.c
+++ b/staticd/static_routes.c
@@ -98,26 +98,24 @@ void zebra_stable_node_cleanup(struct route_table *table,
 }
 
 /* Install static path into rib. */
-void static_install_path(struct route_node *rn, struct static_path *pn,
-			 safi_t safi, struct static_vrf *svrf)
+void static_install_path(struct static_path *pn)
 {
 	struct static_nexthop *nh;
 
 	frr_each(static_nexthop_list, &pn->nexthop_list, nh)
-		static_zebra_nht_register(rn, nh, true);
+		static_zebra_nht_register(nh, true);
 
-	if (static_nexthop_list_count(&pn->nexthop_list) && svrf && svrf->vrf)
-		static_zebra_route_add(rn, pn, safi, true);
+	if (static_nexthop_list_count(&pn->nexthop_list))
+		static_zebra_route_add(pn, true);
 }
 
 /* Uninstall static path from RIB. */
-static void static_uninstall_path(struct route_node *rn, struct static_path *pn,
-				  safi_t safi, struct static_vrf *svrf)
+static void static_uninstall_path(struct static_path *pn)
 {
 	if (static_nexthop_list_count(&pn->nexthop_list))
-		static_zebra_route_add(rn, pn, safi, true);
+		static_zebra_route_add(pn, true);
 	else
-		static_zebra_route_add(rn, pn, safi, false);
+		static_zebra_route_add(pn, false);
 }
 
 struct route_node *static_add_route(afi_t afi, safi_t safi, struct prefix *p,
@@ -135,7 +133,10 @@ struct route_node *static_add_route(afi_t afi, safi_t safi, struct prefix *p,
 	rn = srcdest_rnode_get(stable, p, src_p);
 
 	si = XCALLOC(MTYPE_STATIC_ROUTE, sizeof(struct static_route_info));
-	static_route_info_init(si);
+
+	si->svrf = svrf;
+	si->safi = safi;
+	static_path_list_init(&(si->path_list));
 
 	rn->info = si;
 
@@ -143,8 +144,7 @@ struct route_node *static_add_route(afi_t afi, safi_t safi, struct prefix *p,
 }
 
 /* To delete the srcnodes */
-static void static_del_src_route(struct route_node *rn, safi_t safi,
-				 struct static_vrf *svrf)
+static void static_del_src_route(struct route_node *rn)
 {
 	struct static_path *pn;
 	struct static_route_info *si;
@@ -152,15 +152,14 @@ static void static_del_src_route(struct route_node *rn, safi_t safi,
 	si = rn->info;
 
 	frr_each_safe(static_path_list, &si->path_list, pn) {
-		static_del_path(rn, pn, safi, svrf);
+		static_del_path(pn);
 	}
 
 	XFREE(MTYPE_STATIC_ROUTE, rn->info);
 	route_unlock_node(rn);
 }
 
-void static_del_route(struct route_node *rn, safi_t safi,
-		      struct static_vrf *svrf)
+void static_del_route(struct route_node *rn)
 {
 	struct static_path *pn;
 	struct static_route_info *si;
@@ -170,7 +169,7 @@ void static_del_route(struct route_node *rn, safi_t safi,
 	si = rn->info;
 
 	frr_each_safe(static_path_list, &si->path_list, pn) {
-		static_del_path(rn, pn, safi, svrf);
+		static_del_path(pn);
 	}
 
 	/* clean up for dst table */
@@ -181,7 +180,7 @@ void static_del_route(struct route_node *rn, safi_t safi,
 		 */
 		for (src_node = route_top(src_table); src_node;
 		     src_node = route_next(src_node)) {
-			static_del_src_route(src_node, safi, svrf);
+			static_del_src_route(src_node);
 		}
 	}
 	XFREE(MTYPE_STATIC_ROUTE, rn->info);
@@ -228,6 +227,7 @@ struct static_path *static_add_path(struct route_node *rn, uint32_t table_id,
 	/* Make new static route structure. */
 	pn = XCALLOC(MTYPE_STATIC_PATH, sizeof(struct static_path));
 
+	pn->rn = rn;
 	pn->distance = distance;
 	pn->table_id = table_id;
 	static_nexthop_list_init(&(pn->nexthop_list));
@@ -238,9 +238,9 @@ struct static_path *static_add_path(struct route_node *rn, uint32_t table_id,
 	return pn;
 }
 
-void static_del_path(struct route_node *rn, struct static_path *pn, safi_t safi,
-		     struct static_vrf *svrf)
+void static_del_path(struct static_path *pn)
 {
+	struct route_node *rn = pn->rn;
 	struct static_route_info *si;
 	struct static_nexthop *nh;
 
@@ -249,7 +249,7 @@ void static_del_path(struct route_node *rn, struct static_path *pn, safi_t safi,
 	static_path_list_del(&si->path_list, pn);
 
 	frr_each_safe(static_nexthop_list, &pn->nexthop_list, nh) {
-		static_delete_nexthop(rn, pn, safi, svrf, nh);
+		static_delete_nexthop(nh);
 	}
 
 	route_unlock_node(rn);
@@ -257,12 +257,13 @@ void static_del_path(struct route_node *rn, struct static_path *pn, safi_t safi,
 	XFREE(MTYPE_STATIC_PATH, pn);
 }
 
-struct static_nexthop *
-static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
-		   struct static_vrf *svrf, static_types type,
-		   struct ipaddr *ipaddr, const char *ifname,
-		   const char *nh_vrf, uint32_t color)
+struct static_nexthop *static_add_nexthop(struct static_path *pn,
+					  static_types type,
+					  struct ipaddr *ipaddr,
+					  const char *ifname,
+					  const char *nh_vrf, uint32_t color)
 {
+	struct route_node *rn = pn->rn;
 	struct static_nexthop *nh;
 	struct static_vrf *nh_svrf;
 	struct interface *ifp;
@@ -275,9 +276,14 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
 	/* Make new static route structure. */
 	nh = XCALLOC(MTYPE_STATIC_NEXTHOP, sizeof(struct static_nexthop));
 
+	nh->pn = pn;
+
 	nh->type = type;
 	nh->color = color;
 
+	if (nh->type == STATIC_BLACKHOLE)
+		nh->bh_type = STATIC_BLACKHOLE_NULL;
+
 	nh->nh_vrf_id = nh_svrf ? nh_svrf->vrf->vrf_id : VRF_UNKNOWN;
 	strlcpy(nh->nh_vrfname, nh_vrf, sizeof(nh->nh_vrfname));
 
@@ -325,6 +331,7 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
 	switch (nh->type) {
 	case STATIC_IPV4_GATEWAY:
 	case STATIC_IPV6_GATEWAY:
+	case STATIC_BLACKHOLE:
 		break;
 	case STATIC_IPV4_GATEWAY_IFNAME:
 	case STATIC_IPV6_GATEWAY_IFNAME:
@@ -337,9 +344,6 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
 				ifname);
 
 		break;
-	case STATIC_BLACKHOLE:
-		nh->bh_type = STATIC_BLACKHOLE_NULL;
-		break;
 	case STATIC_IFNAME:
 		ifp = if_lookup_by_name(ifname, nh->nh_vrf_id);
 		if (ifp && ifp->ifindex != IFINDEX_INTERNAL) {
@@ -354,11 +358,10 @@ static_add_nexthop(struct route_node *rn, struct static_path *pn, safi_t safi,
 	return nh;
 }
 
-void static_install_nexthop(struct route_node *rn, struct static_path *pn,
-			    struct static_nexthop *nh, safi_t safi,
-			    struct static_vrf *svrf, const char *ifname,
-			    static_types type, const char *nh_vrf)
+void static_install_nexthop(struct static_nexthop *nh)
 {
+	struct static_path *pn = nh->pn;
+	struct route_node *rn = pn->rn;
 	struct interface *ifp;
 
 	if (nh->nh_vrf_id == VRF_UNKNOWN) {
@@ -375,48 +378,47 @@ void static_install_nexthop(struct route_node *rn, struct static_path *pn,
 	switch (nh->type) {
 	case STATIC_IPV4_GATEWAY:
 	case STATIC_IPV6_GATEWAY:
-		if (!static_zebra_nh_update(rn, nh))
-			static_zebra_nht_register(rn, nh, true);
+		if (!static_zebra_nh_update(nh))
+			static_zebra_nht_register(nh, true);
 		break;
 	case STATIC_IPV4_GATEWAY_IFNAME:
 	case STATIC_IPV6_GATEWAY_IFNAME:
-		if (!static_zebra_nh_update(rn, nh))
-			static_zebra_nht_register(rn, nh, true);
+		if (!static_zebra_nh_update(nh))
+			static_zebra_nht_register(nh, true);
 		break;
 	case STATIC_BLACKHOLE:
-		static_install_path(rn, pn, safi, svrf);
+		static_install_path(pn);
 		break;
 	case STATIC_IFNAME:
-		ifp = if_lookup_by_name(ifname, nh->nh_vrf_id);
+		ifp = if_lookup_by_name(nh->ifname, nh->nh_vrf_id);
 		if (ifp && ifp->ifindex != IFINDEX_INTERNAL)
-			static_install_path(rn, pn, safi, svrf);
+			static_install_path(pn);
 
 		break;
 	}
 }
 
-int static_delete_nexthop(struct route_node *rn, struct static_path *pn,
-			  safi_t safi, struct static_vrf *svrf,
-			  struct static_nexthop *nh)
+void static_delete_nexthop(struct static_nexthop *nh)
 {
+	struct static_path *pn = nh->pn;
+	struct route_node *rn = pn->rn;
+
 	static_nexthop_list_del(&(pn->nexthop_list), nh);
 
 	if (nh->nh_vrf_id == VRF_UNKNOWN)
 		goto EXIT;
 
-	static_zebra_nht_register(rn, nh, false);
+	static_zebra_nht_register(nh, false);
 	/*
 	 * If we have other si nodes then route replace
 	 * else delete the route
 	 */
-	static_uninstall_path(rn, pn, safi, svrf);
+	static_uninstall_path(pn);
 
 EXIT:
 	route_unlock_node(rn);
 	/* Free static route configuration. */
 	XFREE(MTYPE_STATIC_NEXTHOP, nh);
-
-	return 1;
 }
 
 static void static_ifindex_update_nh(struct interface *ifp, bool up,
@@ -441,7 +443,7 @@ static void static_ifindex_update_nh(struct interface *ifp, bool up,
 		nh->ifindex = IFINDEX_INTERNAL;
 	}
 
-	static_install_path(rn, pn, safi, svrf);
+	static_install_path(pn);
 }
 
 static void static_ifindex_update_af(struct interface *ifp, bool up, afi_t afi,
@@ -520,7 +522,7 @@ static void static_fixup_vrf(struct static_vrf *svrf,
 						continue;
 				}
 
-				static_install_path(rn, pn, safi, svrf);
+				static_install_path(pn);
 			}
 		}
 	}
@@ -561,7 +563,7 @@ static void static_enable_vrf(struct static_vrf *svrf,
 				}
 				if (nh->nh_vrf_id == VRF_UNKNOWN)
 					continue;
-				static_install_path(rn, pn, safi, svrf);
+				static_install_path(pn);
 			}
 		}
 	}
@@ -628,7 +630,7 @@ static void static_cleanup_vrf(struct static_vrf *svrf,
 				    != 0)
 					continue;
 
-				static_uninstall_path(rn, pn, safi, svrf);
+				static_uninstall_path(pn);
 			}
 		}
 	}
@@ -648,18 +650,15 @@ static void static_disable_vrf(struct route_table *stable,
 	struct route_node *rn;
 	struct static_nexthop *nh;
 	struct static_path *pn;
-	struct stable_info *info;
 	struct static_route_info *si;
 
-	info = route_table_get_info(stable);
-
 	for (rn = route_top(stable); rn; rn = route_next(rn)) {
 		si = static_route_info_from_rnode(rn);
 		if (!si)
 			continue;
 		frr_each(static_path_list, &si->path_list, pn) {
 			frr_each(static_nexthop_list, &pn->nexthop_list, nh) {
-				static_uninstall_path(rn, pn, safi, info->svrf);
+				static_uninstall_path(pn);
 			}
 		}
 	}
@@ -714,13 +713,10 @@ static void static_fixup_intf_nh(struct route_table *stable,
 				 afi_t afi, safi_t safi)
 {
 	struct route_node *rn;
-	struct stable_info *info;
 	struct static_nexthop *nh;
 	struct static_path *pn;
 	struct static_route_info *si;
 
-	info = route_table_get_info(stable);
-
 	for (rn = route_top(stable); rn; rn = route_next(rn)) {
 		si = static_route_info_from_rnode(rn);
 		if (!si)
@@ -733,7 +729,7 @@ static void static_fixup_intf_nh(struct route_table *stable,
 				if (nh->ifindex != ifp->ifindex)
 					continue;
 
-				static_install_path(rn, pn, safi, info->svrf);
+				static_install_path(pn);
 			}
 		}
 	}
@@ -809,12 +805,6 @@ struct stable_info *static_get_stable_info(struct route_node *rn)
 	return table->info;
 }
 
-void static_route_info_init(struct static_route_info *si)
-{
-	static_path_list_init(&(si->path_list));
-}
-
-
 void static_get_nh_str(struct static_nexthop *nh, char *nexthop, size_t size)
 {
 	switch (nh->type) {