diff options
| -rw-r--r-- | ospfd/ospf_apiserver.c | 8 | ||||
| -rw-r--r-- | ospfd/ospf_errors.c | 6 | ||||
| -rw-r--r-- | ospfd/ospf_errors.h | 1 | ||||
| -rw-r--r-- | ospfd/ospf_ext.c | 7 | ||||
| -rw-r--r-- | ospfd/ospf_ri.c | 5 | ||||
| -rw-r--r-- | ospfd/ospf_te.c | 9 |
6 files changed, 25 insertions, 11 deletions
diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c index 57e0ae5ec9..e37f87db9f 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -54,6 +54,7 @@ #include "ospfd/ospf_route.h" #include "ospfd/ospf_ase.h" #include "ospfd/ospf_zebra.h" +#include "ospfd/ospf_errors.h" #include "ospfd/ospf_api.h" #include "ospfd/ospf_apiserver.h" @@ -152,8 +153,8 @@ int ospf_apiserver_init(void) NULL, /* ospf_apiserver_lsa_refresher */ ospf_apiserver_lsa_update, ospf_apiserver_lsa_delete); if (rc != 0) { - zlog_warn( - "ospf_apiserver_init: Failed to register opaque type [0/0]"); + flog_warn(OSPF_WARN_OPAQUE_REGISTRATION, + "ospf_apiserver_init: Failed to register opaque type [0/0]"); } rc = 0; @@ -867,7 +868,8 @@ int ospf_apiserver_register_opaque_type(struct ospf_apiserver *apiserv, NULL /* ospf_apiserver_lsa_delete */); if (rc != 0) { - zlog_warn("Failed to register opaque type [%d/%d]", lsa_type, + flog_warn(OSPF_WARN_OPAQUE_REGISTRATION, + "Failed to register opaque type [%d/%d]", lsa_type, opaque_type); return OSPF_API_OPAQUETYPEINUSE; } diff --git a/ospfd/ospf_errors.c b/ospfd/ospf_errors.c index 7c885a8cd0..87760b3a34 100644 --- a/ospfd/ospf_errors.c +++ b/ospfd/ospf_errors.c @@ -62,6 +62,12 @@ static struct log_ref ferr_ospf_warn[] = { .suggestion = "Gather log data and open an Issue", }, { + .code = OSPF_WARN_OPAQUE_REGISTRATION, + .title = "OSPF has failed to properly register Opaque Handler", + .description = "During initialization OSPF has detected a failure to install an opaque handler", + .suggestion = "Gather log data and open an Issue", + }, + { .code = END_FERR, } }; diff --git a/ospfd/ospf_errors.h b/ospfd/ospf_errors.h index 5d7531687d..09b368fef3 100644 --- a/ospfd/ospf_errors.h +++ b/ospfd/ospf_errors.h @@ -38,6 +38,7 @@ enum ospf_log_refs { OSPF_WARN_LARGE_LSA, OSPF_WARN_LSA_UNEXPECTED, OSPF_WARN_LSA, + OSPF_WARN_OPAQUE_REGISTRATION, }; extern void ospf_error_init(void); diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c index 25b27d442b..8ddf7db9d1 100644 --- a/ospfd/ospf_ext.c +++ b/ospfd/ospf_ext.c @@ -62,6 +62,7 @@ #include "ospfd/ospf_zebra.h" #include "ospfd/ospf_sr.h" #include "ospfd/ospf_ext.h" +#include "ospfd/ospf_errors.h" /* Following structure are internal use only. */ @@ -136,7 +137,8 @@ int ospf_ext_init(void) NULL); /* del_lsa_hook */ if (rc != 0) { - zlog_warn("EXT (%s): Failed to register Extended Link LSA", + flog_warn(OSPF_WARN_OPAQUE_REGISTRATION, + "EXT (%s): Failed to register Extended Link LSA", __func__); return rc; } @@ -157,7 +159,8 @@ int ospf_ext_init(void) ospf_ext_pref_lsa_update, /* new_lsa_hook */ NULL); /* del_lsa_hook */ if (rc != 0) { - zlog_warn("EXT (%s): Failed to register Extended Prefix LSA", + flog_warn(OSPF_WARN_OPAQUE_REGISTRATION, + "EXT (%s): Failed to register Extended Prefix LSA", __func__); return rc; } diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 4f6e1be0f4..c5e0cd3873 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -57,6 +57,7 @@ #include "ospfd/ospf_zebra.h" #include "ospfd/ospf_sr.h" #include "ospfd/ospf_ri.h" +#include "ospfd/ospf_errors.h" /* Store Router Information PCE TLV and SubTLV in network byte order. */ struct ospf_pce_info { @@ -185,8 +186,8 @@ static int ospf_router_info_register(uint8_t scope) NULL); /* del_lsa_hook */ if (rc != 0) { - zlog_warn( - "ospf_router_info_init: Failed to register functions"); + flog_warn(OSPF_WARN_OPAQUE_REGISTRATION, + "ospf_router_info_init: Failed to register functions"); return rc; } diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index f8722f9c86..8428893115 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -61,6 +61,7 @@ #include "ospfd/ospf_zebra.h" #include "ospfd/ospf_te.h" #include "ospfd/ospf_vty.h" +#include "ospfd/ospf_errors.h" /* * Global variable to manage Opaque-LSA/MPLS-TE on this node. @@ -102,8 +103,8 @@ int ospf_mpls_te_init(void) ospf_mpls_te_lsa_refresh, NULL, /* ospf_mpls_te_new_lsa_hook */ NULL /* ospf_mpls_te_del_lsa_hook */); if (rc != 0) { - zlog_warn( - "ospf_mpls_te_init: Failed to register Traffic Engineering functions"); + flog_warn(OSPF_WARN_OPAQUE_REGISTRATION, + "ospf_mpls_te_init: Failed to register Traffic Engineering functions"); return rc; } @@ -139,8 +140,8 @@ static int ospf_mpls_te_register(enum inter_as_mode mode) ospf_mpls_te_lsa_refresh, NULL, NULL); if (rc != 0) { - zlog_warn( - "ospf_router_info_init: Failed to register Inter-AS functions"); + flog_warn(OSPF_WARN_OPAQUE_REGISTRATION, + "ospf_router_info_init: Failed to register Inter-AS functions"); return rc; } |