bgpd: reuse bgp_path_info_extra_free() routing in rfapi

[mirror_frr.git] / bgpd / bgp_labelpool.c

diff --git a/bgpd/bgp_labelpool.c b/bgpd/bgp_labelpool.c
index 8d15649ea55f2bd38ecd6c0b40567c222a2659cc..181f864575a6916ee66f689ff85df43e20d9658f 100644 (file)
--- a/bgpd/bgp_labelpool.c
+++ b/bgpd/bgp_labelpool.c
@@ -127,8 +127,8 @@ static wq_item_status lp_cbq_docallback(struct work_queue *wq, void *data)
 
        if (lcbq->label == MPLS_LABEL_NONE) {
                /* shouldn't happen */
-               flog_err(BGP_ERR_LABEL, "%s: error: label==MPLS_LABEL_NONE",
-                         __func__);
+               flog_err(EC_BGP_LABEL, "%s: error: label==MPLS_LABEL_NONE",
+                        __func__);
                return WQ_SUCCESS;
        }
 
@@ -223,7 +223,7 @@ void bgp_lp_finish(void)
        skiplist_free(lp->inuse);
        lp->inuse = NULL;
 
-       list_delete_and_null(&lp->chunks);
+       list_delete(&lp->chunks);
 
        while ((lf = LABEL_FIFO_HEAD(lp->requests))) {
 
@@ -338,9 +338,9 @@ void bgp_lp_get(
 
                if (rc) {
                        /* shouldn't happen */
-                       flog_err(BGP_ERR_LABEL,
-                                 "%s: can't insert new LCB into ledger list",
-                                 __func__);
+                       flog_err(EC_BGP_LABEL,
+                                "%s: can't insert new LCB into ledger list",
+                                __func__);
                        XFREE(MTYPE_BGP_LABEL_CB, lcb);
                        return;
                }
@@ -427,9 +427,9 @@ void bgp_lp_event_chunk(uint8_t keep, uint32_t first, uint32_t last)
        struct lp_fifo *lf;
 
        if (last < first) {
-               flog_err(BGP_ERR_LABEL,
-                         "%s: zebra label chunk invalid: first=%u, last=%u",
-                         __func__, first, last);
+               flog_err(EC_BGP_LABEL,
+                        "%s: zebra label chunk invalid: first=%u, last=%u",
+                        __func__, first, last);
                return;
        }
 
@@ -530,6 +530,7 @@ void bgp_lp_event_zebra_up(void)
        int chunks_needed;
        void *labelid;
        struct lp_lcb *lcb;
+       int lm_init_ok;
 
        /*
         * Get label chunk allocation request dispatched to zebra
@@ -541,6 +542,11 @@ void bgp_lp_event_zebra_up(void)
        chunks_needed = (labels_needed / LP_CHUNK_SIZE) + 1;
        labels_needed = chunks_needed * LP_CHUNK_SIZE;
 
+       lm_init_ok = lm_label_manager_connect(zclient, 1) == 0;
+
+       if (!lm_init_ok)
+               zlog_err("%s: label manager connection error", __func__);
+
        zclient_send_get_label_chunk(zclient, 0, labels_needed);
        lp->pending_count = labels_needed;