From: Renato Westphal <renato@opensourcerouting.org>
Date: Sat, 19 Aug 2017 14:28:21 +0000 (-0300)
Subject: vnc/eigrpd/isisd: check for the correct message types
X-Git-Tag: frr-4.0-dev~379^2~23
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=89a8b5cada731a52f71167b7e4faa8a7028374c6;p=mirror%2Ffrr.git

vnc/eigrpd/isisd: check for the correct message types

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c
index 8f4a550bde..29652e59db 100644
--- a/bgpd/rfapi/vnc_zebra.c
+++ b/bgpd/rfapi/vnc_zebra.c
@@ -367,7 +367,7 @@ static int vnc_zebra_read_ipv4(int command, struct zclient *zclient,
 	else
 		api.metric = 0;
 
-	if (command == ZEBRA_IPV4_ROUTE_ADD) {
+	if (command == ZEBRA_REDISTRIBUTE_IPV4_ADD) {
 		if (BGP_DEBUG(zebra, ZEBRA)) {
 			char buf[2][INET_ADDRSTRLEN];
 			vnc_zlog_debug_verbose(
@@ -456,7 +456,7 @@ static int vnc_zebra_read_ipv6(int command, struct zclient *zclient,
 	if (IN6_IS_ADDR_LINKLOCAL(&p.prefix))
 		return 0;
 
-	if (command == ZEBRA_IPV6_ROUTE_ADD) {
+	if (command == ZEBRA_REDISTRIBUTE_IPV6_ADD) {
 		if (BGP_DEBUG(zebra, ZEBRA)) {
 			char buf[INET6_ADDRSTRLEN];
 			vnc_zlog_debug_verbose(
diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c
index 00b269b489..0ee89eb675 100644
--- a/eigrpd/eigrp_zebra.c
+++ b/eigrpd/eigrp_zebra.c
@@ -162,9 +162,9 @@ static int eigrp_zebra_read_ipv4(int command, struct zclient *zclient,
 	if (eigrp == NULL)
 		return 0;
 
-	if (command == ZEBRA_IPV4_ROUTE_ADD) {
+	if (command == ZEBRA_REDISTRIBUTE_IPV4_ADD) {
 
-	} else /* if (command == ZEBRA_IPV4_ROUTE_DELETE) */
+	} else /* if (command == ZEBRA_REDISTRIBUTE_IPV4_DEL) */
 	{
 	}
 
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index c1d558fc22..5fc3a24c30 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -568,7 +568,7 @@ static int isis_zebra_read_ipv4(int command, struct zclient *zclient,
 	 * without this check)
 	 */
 	if (p.prefixlen == 0 && api.type == ZEBRA_ROUTE_ISIS)
-		command = ZEBRA_IPV4_ROUTE_DELETE;
+		command = ZEBRA_REDISTRIBUTE_IPV4_DEL;
 
 	if (command == ZEBRA_REDISTRIBUTE_IPV4_ADD)
 		isis_redist_add(api.type, p_generic, api.distance, api.metric);
@@ -637,7 +637,7 @@ static int isis_zebra_read_ipv6(int command, struct zclient *zclient,
 	 * without this check)
 	 */
 	if (p.prefixlen == 0 && api.type == ZEBRA_ROUTE_ISIS)
-		command = ZEBRA_IPV6_ROUTE_DELETE;
+		command = ZEBRA_REDISTRIBUTE_IPV6_DEL;
 
 	if (command == ZEBRA_REDISTRIBUTE_IPV6_ADD)
 		isis_redist_add(api.type, p_generic, api.distance, api.metric);