*: stop double initialization of ferr

* Stop double init of ferr
* Fixup bugs in zebra ferr
* Add missing init in ospfd

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/babeld/babel_errors.c b/babeld/babel_errors.c
index ffcc3867fcea87736dda90c72fbcbdd69bcddf19..ec0ff5192a9783d458d3fd7f148a9a6f955ffc8b 100644 (file)
--- a/babeld/babel_errors.c
+++ b/babeld/babel_errors.c
@@ -57,7 +57,5 @@ static struct ferr_ref ferr_babel_err[] = {
 
 void babel_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_babel_err);
 }

diff --git a/bgpd/bgp_errors.c b/bgpd/bgp_errors.c
index 5535a2a8ad675ae2a66d92a43a98012629f6401d..c86178d99a0551c82edce495d805dbca6af1da76 100644 (file)
--- a/bgpd/bgp_errors.c
+++ b/bgpd/bgp_errors.c
@@ -302,7 +302,5 @@ static struct ferr_ref ferr_bgp_err[] = {
 
 void bgp_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_bgp_err);
 }

diff --git a/eigrpd/eigrp_errors.c b/eigrpd/eigrp_errors.c
index 5732fc39c8148c3c2d188f630a84ac766337c739..4e6337a7bad21f4c5ae3ec57a4e3de349538d72c 100644 (file)
--- a/eigrpd/eigrp_errors.c
+++ b/eigrpd/eigrp_errors.c
@@ -45,7 +45,5 @@ static struct ferr_ref ferr_eigrp_err[] = {
 
 void eigrp_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_eigrp_err);
 }

diff --git a/isisd/isis_errors.c b/isisd/isis_errors.c
index d7425153a3ba1b72b6b47ff768a99f99f55bed6e..3f69a10cab2ac30143aac98803bc939e020eea16 100644 (file)
--- a/isisd/isis_errors.c
+++ b/isisd/isis_errors.c
@@ -45,7 +45,5 @@ static struct ferr_ref ferr_isis_err[] = {
 
 void isis_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_isis_err);
 }

diff --git a/lib/lib_errors.c b/lib/lib_errors.c
index e08b03f17fbb77eaa9b5ef383167f5a6d2c06b77..c659a7aae6c96e81927b7a47f87dec40e231f774 100644 (file)
--- a/lib/lib_errors.c
+++ b/lib/lib_errors.c
@@ -114,6 +114,5 @@ static struct ferr_ref ferr_lib_err[] = {
 
 void lib_error_init(void)
 {
-       ferr_ref_init();
        ferr_ref_add(ferr_lib_err);
 }

diff --git a/lib/libfrr.c b/lib/libfrr.c
index 05b001b6de98ccc9d36c705c07aefe0c86b4800d..154f19eae5d39662803b2bef2adfad71cb1bc25b 100644 (file)
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -599,6 +599,7 @@ struct thread_master *frr_init(void)
        vty_init(master);
        memory_init();
 
+       ferr_ref_init();
        lib_error_init();
 
        return master;

diff --git a/nhrpd/nhrp_errors.c b/nhrpd/nhrp_errors.c
index 71ec211136b066b46abff0a34b073bb3d585937b..3c0d4c3e5e6a8635c47b2ea2f58296a3338cdb81 100644 (file)
--- a/nhrpd/nhrp_errors.c
+++ b/nhrpd/nhrp_errors.c
@@ -45,7 +45,5 @@ static struct ferr_ref ferr_nhrp_err[] = {
 
 void nhrp_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_nhrp_err);
 }

diff --git a/ospfd/ospf_errors.c b/ospfd/ospf_errors.c
index f4ae731a9bc5696b18edce6b375c94b2b063c1ab..244aa269537f6c1c138413cd86e74dee7f3357e9 100644 (file)
--- a/ospfd/ospf_errors.c
+++ b/ospfd/ospf_errors.c
@@ -80,7 +80,5 @@ static struct ferr_ref ferr_ospf_err[] = {
 
 void ospf_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_ospf_err);
 }

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 1a25e27d7a5f23fffa2befd7a0f02c365d0babeb..c3f919ef1eb8ffa7f97743df0321b8da71d992df 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -207,6 +207,9 @@ int main(int argc, char **argv)
        ospf_route_map_init();
        ospf_opaque_init();
 
+       /* OSPF errors init */
+       ospf_error_init();
+
        /* Need to initialize the default ospf structure, so the interface mode
           commands can be duly processed if they are received before 'router
           ospf',

diff --git a/pimd/pim_errors.c b/pimd/pim_errors.c
index 15f0345f0c7942f1f1b12dfd04c4c2288566b8b8..81e2bd55633fc808f3688347c53ef41330b043d0 100644 (file)
--- a/pimd/pim_errors.c
+++ b/pimd/pim_errors.c
@@ -45,7 +45,5 @@ static struct ferr_ref ferr_pim_err[] = {
 
 void pim_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_pim_err);
 }

diff --git a/ripd/rip_errors.c b/ripd/rip_errors.c
index 4a2a2bd5a9a0feeb08d47cfde30291c07d69c794..133d8085243a19766f509bb309bd8c478521695f 100644 (file)
--- a/ripd/rip_errors.c
+++ b/ripd/rip_errors.c
@@ -37,7 +37,5 @@ static struct ferr_ref ferr_rip_err[] = {
 
 void rip_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_rip_err);
 }

diff --git a/watchfrr/watchfrr_errors.c b/watchfrr/watchfrr_errors.c
index 9a4842a5dfe272eca999d63770ee0383fca20e8e..494132e52f573c06e3e53dbbe2a0913335e1731b 100644 (file)
--- a/watchfrr/watchfrr_errors.c
+++ b/watchfrr/watchfrr_errors.c
@@ -39,7 +39,5 @@ static struct ferr_ref ferr_watchfrr_err[] = {
 
 void watchfrr_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_watchfrr_err);
 }

diff --git a/zebra/main.c b/zebra/main.c
index 719a6ca59f7bfd5b0dbb63d9e2628a0e41a17d7f..9453e54b6198c080d2860bd2ae49a603ccfe5152 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -413,6 +413,9 @@ int main(int argc, char **argv)
 
        /* RNH init */
        zebra_rnh_init();
+       
+       /* Error init */
+       zebra_error_init();
 
 #if defined(HANDLE_ZAPI_FUZZING)
        if (zapi_fuzzing) {

diff --git a/zebra/zebra_errors.c b/zebra/zebra_errors.c
index f657bdcdc77f3cad9e74feac5a153193db0ad12a..39e3939bb22dde6c1c1c35806f714a13037736fd 100644 (file)
--- a/zebra/zebra_errors.c
+++ b/zebra/zebra_errors.c
@@ -265,13 +265,14 @@ static struct ferr_ref ferr_zebra_err[] = {
                .description = "Zebra attempted to add a VNI hash to an interface and failed",
                .suggestion = "Notify a developer.",
        },
+       {
+               .code = END_FERR,
+       }
 };
 /* clang-format on */
 
 
 void zebra_error_init(void)
 {
-       ferr_ref_init();
-
        ferr_ref_add(ferr_zebra_err);
 }

diff --git a/zebra/zebra_errors.h b/zebra/zebra_errors.h
index 66771a33d64189f868bf84d84dffb6bdbbe64809..f5f4894ece730636c9e1f4ff7b837eb128647510 100644 (file)
--- a/zebra/zebra_errors.h
+++ b/zebra/zebra_errors.h
@@ -24,7 +24,7 @@
 #include "lib/ferr.h"
 
 enum zebra_ferr_refs {
-       ZEBRA_ERR_LM_RESPONSE,
+       ZEBRA_ERR_LM_RESPONSE = ZEBRA_FERR_START,
        ZEBRA_ERR_LM_NO_SUCH_CLIENT,
        ZEBRA_ERR_LM_RELAY_FAILED,
        ZEBRA_ERR_LM_NO_SOCKET,