summaryrefslogtreecommitdiff
path: root/zebra/label_manager.c
diff options
context:
space:
mode:
authorpaco <paco@voltanet.io>2018-06-07 15:28:12 +0200
committerpaco <paco@voltanet.io>2018-06-07 15:28:59 +0200
commite73380ce47d8838a6f4f0e9f7b6443e731bede96 (patch)
tree19230a4980bdba5fbbdd8b3a17f402298ac97ae1 /zebra/label_manager.c
parentf89270226297ec1f1a8290481d1dc7fb66d71422 (diff)
bgpd, doc, ldpd, lib, tests, zebra: LM fixes
Corrections so that the BGP daemon can work with the label manager properly through a label-manager proxy. Details: - Correction so the BGP daemon behind a proxy label manager gets the range correctly (-I added to the BGP daemon, to set the daemon instance id) - For the BGP case, added an asynchronous label manager connect command so the labels get recycled in case of a BGP daemon reconnection. With this, BGPd and LDPd would behave similarly. Signed-off-by: F. Aragon <paco@voltanet.io>
Diffstat (limited to 'zebra/label_manager.c')
-rw-r--r--zebra/label_manager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index f3fa3ba94e..9591843bbe 100644
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -221,8 +221,9 @@ int zread_relay_label_manager_request(int cmd, struct zserv *zserv,
zserv->proto = proto;
/* in case there's any incoming message enqueued, read and forward it */
- while (ret == 0)
- ret = relay_response_back();
+ if (zserv->is_synchronous)
+ while (ret == 0)
+ ret = relay_response_back();
/* get the msg buffer used toward the 'master' Label Manager */
dst = zclient->obuf;