diff options
| author | Renato Westphal <renato@openbsd.org> | 2018-06-07 11:54:34 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-07 11:54:34 -0300 |
| commit | b2e1ccbb7c6abcfa901e0b6411f3bcfc4282ddc7 (patch) | |
| tree | 19230a4980bdba5fbbdd8b3a17f402298ac97ae1 /lib/zclient.c | |
| parent | f89270226297ec1f1a8290481d1dc7fb66d71422 (diff) | |
| parent | e73380ce47d8838a6f4f0e9f7b6443e731bede96 (diff) | |
Merge pull request #2333 from pacovn/dev/5.0
bgpd label manager support fixes
Diffstat (limited to 'lib/zclient.c')
| -rw-r--r-- | lib/zclient.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/zclient.c b/lib/zclient.c index 1b46ed671e..4c29b9ec24 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -2046,24 +2046,29 @@ static int zclient_read_sync_response(struct zclient *zclient, * immediately reads the answer from the input buffer. * * @param zclient Zclient used to connect to label manager (zebra) + * @param async Synchronous (0) or asynchronous (1) operation * @result Result of response */ -int lm_label_manager_connect(struct zclient *zclient) +int lm_label_manager_connect(struct zclient *zclient, int async) { int ret; struct stream *s; uint8_t result; + uint16_t cmd = async ? ZEBRA_LABEL_MANAGER_CONNECT_ASYNC : + ZEBRA_LABEL_MANAGER_CONNECT; if (zclient_debug) zlog_debug("Connecting to Label Manager (LM)"); - if (zclient->sock < 0) + if (zclient->sock < 0) { + zlog_debug("%s: invalid zclient socket", __func__); return -1; + } /* send request */ s = zclient->obuf; stream_reset(s); - zclient_create_header(s, ZEBRA_LABEL_MANAGER_CONNECT, VRF_DEFAULT); + zclient_create_header(s, cmd, VRF_DEFAULT); /* proto */ stream_putc(s, zclient->redist_default); @@ -2089,8 +2094,11 @@ int lm_label_manager_connect(struct zclient *zclient) if (zclient_debug) zlog_debug("LM connect request sent (%d bytes)", ret); + if (async) + return 0; + /* read response */ - if (zclient_read_sync_response(zclient, ZEBRA_LABEL_MANAGER_CONNECT) + if (zclient_read_sync_response(zclient, cmd) != 0) return -1; |