From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 29 Jun 2018 02:33:35 +0000 (-0400)
Subject: bgpd: Add some asserts because of our linklist stuff
X-Git-Tag: frr-6.1-dev~214^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b3a4db3dceeac307a5ae3cdf3950ae8b8d8e9968;p=matthieu%2Ffrr.git

bgpd: Add some asserts because of our linklist stuff

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

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 0557bbcce9..8137cb6a8e 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -4242,6 +4242,7 @@ void bgp_evpn_unconfigure_import_rt_for_vrf(struct bgp *bgp_vrf,
 	if (node_to_del)
 		list_delete_node(bgp_vrf->vrf_import_rtl, node_to_del);
 
+	assert(bgp_vrf->vrf_import_rtl);
 	/* fallback to auto import rt, if this was the last RT */
 	if (list_isempty(bgp_vrf->vrf_import_rtl)) {
 		UNSET_FLAG(bgp_vrf->vrf_flags, BGP_VRF_IMPORT_RT_CFGD);
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 729bd87ada..5a4ebc9b17 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -1717,6 +1717,7 @@ static void evpn_unconfigure_import_rt(struct bgp *bgp, struct bgpevpn *vpn,
 			list_delete_node(vpn->import_rtl, node_to_del);
 	}
 
+	assert(vpn->import_rtl);
 	/* Reset to auto RT - this also rebuilds the RT to VNI mapping */
 	if (list_isempty(vpn->import_rtl)) {
 		UNSET_FLAG(vpn->flags, VNI_FLAG_IMPRT_CFGD);
@@ -1784,6 +1785,7 @@ static void evpn_unconfigure_export_rt(struct bgp *bgp, struct bgpevpn *vpn,
 			list_delete_node(vpn->export_rtl, node_to_del);
 	}
 
+	assert(vpn->export_rtl);
 	if (list_isempty(vpn->export_rtl)) {
 		UNSET_FLAG(vpn->flags, VNI_FLAG_EXPRT_CFGD);
 		bgp_evpn_derive_auto_rt_export(bgp, vpn);