From 9c610007653446005f8979e0e8c3002289488607 Mon Sep 17 00:00:00 2001 From: Fredi Raspall Date: Fri, 27 Apr 2018 20:29:52 +0200 Subject: [PATCH] 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 --- zebra/zapi_msg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- 2.39.5