From: Fredi Raspall <fredi@voltanet.io>
Date: Fri, 27 Apr 2018 18:29:52 +0000 (+0200)
Subject: zebra: LM temporally ignore id/proto mismatch error
X-Git-Tag: frr-6.1-dev~440^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9c610007653446005f8979e0e8c3002289488607;p=mirror%2Ffrr.git

zebra: LM temporally ignore id/proto mismatch error

Since BGPd is not currently setting ID and PROTOCOL in label
requests, temporally disable mismatch error propagation.

This commit will be reverted once fixes for BGPd and label
manager are integrated.

Signed-off-by: Fredi Raspall <fredi@voltanet.io>
---

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 24f1748e22..2bd678d629 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -2414,13 +2414,15 @@ static int msg_client_id_mismatch(const char *op, struct zserv *client,
 	if (proto != client->proto) {
 		zlog_err("%s: msg vs client proto mismatch, client=%u msg=%u",
 				op, client->proto, proto);
-		return 1;
+		/* TODO: fail when BGP sets proto and instance */
+		/* return 1; */
 	}
 
 	if (instance != client->instance) {
 		zlog_err("%s: msg vs client instance mismatch, client=%u msg=%u",
 				op, client->instance, instance);
-		return 1;
+		/* TODO: fail when BGP sets proto and instance */
+		/* return 1; */
 	}
 
 	return 0;