Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / zebra / table_manager.c

diff --git a/zebra/table_manager.c b/zebra/table_manager.c
index cb8c384436977bb44228e598f2d5c710f0973ad2..7ed673a88f12ee73a5d64f798c2dd7c9518f0410 100644 (file)
--- a/zebra/table_manager.c
+++ b/zebra/table_manager.c
@@ -35,6 +35,7 @@
 #include "zebra/zebra_vrf.h"
 #include "zebra/label_manager.h" /* for NO_PROTO */
 #include "zebra/table_manager.h"
+#include "zebra/zebra_errors.h"
 
 /* routing table identifiers
  *
@@ -78,7 +79,7 @@ void table_manager_enable(ns_id_t ns_id)
                return;
        tbl_mgr.lc_list = list_new();
        tbl_mgr.lc_list->del = delete_table_chunk;
-       hook_register(zapi_client_close, release_daemon_table_chunks);
+       hook_register(zserv_client_close, release_daemon_table_chunks);
 }
 
 /**
@@ -146,8 +147,8 @@ struct table_manager_chunk *assign_table_chunk(uint8_t proto, uint16_t instance,
 #endif /* SUNOS_5 */
        tmc->start = start;
        if (RT_TABLE_ID_UNRESERVED_MAX - size  + 1 < start) {
-               zlog_err("Reached max table id. Start/Size %u/%u",
-                        start, size);
+               flog_err(EC_ZEBRA_TM_EXHAUSTED_IDS,
+                        "Reached max table id. Start/Size %u/%u", start, size);
                XFREE(MTYPE_TM_CHUNK, tmc);
                return NULL;
        }
@@ -184,7 +185,8 @@ int release_table_chunk(uint8_t proto, uint16_t instance, uint32_t start,
                if (tmc->end != end)
                        continue;
                if (tmc->proto != proto || tmc->instance != instance) {
-                       zlog_err("%s: Daemon mismatch!!", __func__);
+                       flog_err(EC_ZEBRA_TM_DAEMON_MISMATCH,
+                                "%s: Daemon mismatch!!", __func__);
                        continue;
                }
                tmc->proto = NO_PROTO;
@@ -193,7 +195,8 @@ int release_table_chunk(uint8_t proto, uint16_t instance, uint32_t start,
                break;
        }
        if (ret != 0)
-               zlog_err("%s: Table chunk not released!!", __func__);
+               flog_err(EC_ZEBRA_TM_UNRELEASED_CHUNK,
+                        "%s: Table chunk not released!!", __func__);
 
        return ret;
 }
@@ -234,5 +237,5 @@ void table_manager_disable(ns_id_t ns_id)
 {
        if (ns_id != NS_DEFAULT)
                return;
-       list_delete_and_null(&tbl_mgr.lc_list);
+       list_delete(&tbl_mgr.lc_list);
 }