Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-draft-ietf-grow-bgp-gshut-10

Conflicts:
	bgpd/bgp_route.c

1 files changed, 5 insertions, 9 deletions

diff --git a/lib/log.c b/lib/log.c
index 5c89e7080e..ea2e804cda 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -701,7 +701,7 @@ void _zlog_assert_failed(const char *assertion, const char *file,
 	     assertion, file, line, (function ? function : "?"));
 	zlog_backtrace(LOG_CRIT);
 	zlog_thread_info(LOG_CRIT);
-	log_memstats_stderr("log");
+	log_memstats(stderr, "log");
 	abort();
 }
 
@@ -867,6 +867,8 @@ static const struct zebra_desc_table command_types[] = {
 	DESC_ENTRY(ZEBRA_INTERFACE_UP),
 	DESC_ENTRY(ZEBRA_INTERFACE_DOWN),
 	DESC_ENTRY(ZEBRA_INTERFACE_SET_MASTER),
+	DESC_ENTRY(ZEBRA_ROUTE_ADD),
+	DESC_ENTRY(ZEBRA_ROUTE_DELETE),
 	DESC_ENTRY(ZEBRA_IPV4_ROUTE_ADD),
 	DESC_ENTRY(ZEBRA_IPV4_ROUTE_DELETE),
 	DESC_ENTRY(ZEBRA_IPV6_ROUTE_ADD),
@@ -893,10 +895,8 @@ static const struct zebra_desc_table command_types[] = {
 	DESC_ENTRY(ZEBRA_BFD_DEST_DEREGISTER),
 	DESC_ENTRY(ZEBRA_BFD_DEST_UPDATE),
 	DESC_ENTRY(ZEBRA_BFD_DEST_REPLAY),
-	DESC_ENTRY(ZEBRA_REDISTRIBUTE_IPV4_ADD),
-	DESC_ENTRY(ZEBRA_REDISTRIBUTE_IPV4_DEL),
-	DESC_ENTRY(ZEBRA_REDISTRIBUTE_IPV6_ADD),
-	DESC_ENTRY(ZEBRA_REDISTRIBUTE_IPV6_DEL),
+	DESC_ENTRY(ZEBRA_REDISTRIBUTE_ROUTE_ADD),
+	DESC_ENTRY(ZEBRA_REDISTRIBUTE_ROUTE_DEL),
 	DESC_ENTRY(ZEBRA_VRF_UNREGISTER),
 	DESC_ENTRY(ZEBRA_VRF_ADD),
 	DESC_ENTRY(ZEBRA_VRF_DELETE),
@@ -908,10 +908,6 @@ static const struct zebra_desc_table command_types[] = {
 	DESC_ENTRY(ZEBRA_INTERFACE_LINK_PARAMS),
 	DESC_ENTRY(ZEBRA_MPLS_LABELS_ADD),
 	DESC_ENTRY(ZEBRA_MPLS_LABELS_DELETE),
-	DESC_ENTRY(ZEBRA_IPV4_NEXTHOP_ADD),
-	DESC_ENTRY(ZEBRA_IPV4_NEXTHOP_DELETE),
-	DESC_ENTRY(ZEBRA_IPV6_NEXTHOP_ADD),
-	DESC_ENTRY(ZEBRA_IPV6_NEXTHOP_DELETE),
 	DESC_ENTRY(ZEBRA_IPMR_ROUTE_STATS),
 	DESC_ENTRY(ZEBRA_LABEL_MANAGER_CONNECT),
 	DESC_ENTRY(ZEBRA_GET_LABEL_CHUNK),