zebra: minor fix to label manager log

zebra should only check whether a get_chunk operation succeeded
when processing the response, rather than insde the get_chunk
call itself. Spllitting the request and response hooks was done
precisely to allow for asynchronous calls to an external label
manager; in this case, the requested chunk is not necessarily
going to be available at request time.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>

diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index 0825fb55caa2664c1d2b8625e95513082f31d729..5f2128a09c0c13412233b017aa017d69df1fa60c 100644 (file)
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -446,6 +446,15 @@ int lm_client_connect_response(uint8_t proto, uint16_t instance,
 int lm_get_chunk_response(struct label_manager_chunk *lmc, uint8_t proto,
                          uint16_t instance, vrf_id_t vrf_id)
 {
+       if (!lmc)
+               flog_err(EC_ZEBRA_LM_CANNOT_ASSIGN_CHUNK,
+                        "Unable to assign Label Chunk to %s instance %u",
+                        zebra_route_string(proto), instance);
+       else if (IS_ZEBRA_DEBUG_PACKET)
+               zlog_debug("Assigned Label Chunk %u - %u to %s instance %u",
+                          lmc->start, lmc->end, zebra_route_string(proto),
+                          instance);
+
        struct zserv *client = zserv_find_client(proto, instance);
        if (!client) {
                zlog_err("%s: could not find client for daemon %s instance %u",

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index aabe533ee69639cbe26227ba1e136c8214bb1a2e..a58df826984180487ceb648ec4e4ee3759bb933f 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -2225,17 +2225,6 @@ static void zread_get_label_chunk(struct zserv *client, struct stream *msg,
        /* call hook to get a chunk using wrapper */
        lm_get_chunk_call(&lmc, proto, instance, keep, size, base, vrf_id);
 
-       if (!lmc)
-               flog_err(
-                       EC_ZEBRA_LM_CANNOT_ASSIGN_CHUNK,
-                       "Unable to assign Label Chunk of size %u to %s instance %u",
-                       size, zebra_route_string(proto), instance);
-       else
-               if (IS_ZEBRA_DEBUG_PACKET)
-                       zlog_debug("Assigned Label Chunk %u - %u to %s instance %u",
-                                  lmc->start, lmc->end,
-                                  zebra_route_string(proto), instance);
-
 stream_failure:
        return;
 }