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 24f1748e220dfd472adf75616a680159c4d92fab..2bd678d629cbb51b65be68f919efa03574ac3bcb 100644 (file)
--- 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;