eigrpd: EIGRP_[ERR|WARN] -> EC_EIGRP

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

diff --git a/eigrpd/eigrp_errors.c b/eigrpd/eigrp_errors.c
index 3db0ec8545d1219c5bb7f9ed23565f161d052238..75cf9535572841ffc5d13dc536f6908738e4cce6 100644 (file)
--- a/eigrpd/eigrp_errors.c
+++ b/eigrpd/eigrp_errors.c
@@ -26,13 +26,13 @@
 /* clang-format off */
 static struct log_ref ferr_eigrp_err[] = {
        {
-               .code = EIGRP_ERR_PACKET,
+               .code = EC_EIGRP_PACKET,
                .title = "EIGRP Packet Error",
                .description = "EIGRP has a packet that does not correctly decode or encode",
                .suggestion = "Gather log files from both sides of the neighbor relationship and open an issue"
        },
        {
-               .code = EIGRP_ERR_CONFIG,
+               .code = EC_EIGRP_CONFIG,
                .title = "EIGRP Configuration Error",
                .description = "EIGRP has detected a configuration error",
                .suggestion = "Correct the configuration issue, if it still persists open an Issue"

diff --git a/eigrpd/eigrp_errors.h b/eigrpd/eigrp_errors.h
index e1ace8ab49f62aa184529108e0f4c5756d50a243..3270e65138bdef16cf4589387894d419ecf40c7c 100644 (file)
--- a/eigrpd/eigrp_errors.h
+++ b/eigrpd/eigrp_errors.h
@@ -24,8 +24,8 @@
 #include "lib/ferr.h"
 
 enum eigrp_log_refs {
-       EIGRP_ERR_PACKET = EIGRP_FERR_START,
-       EIGRP_ERR_CONFIG,
+       EC_EIGRP_PACKET = EIGRP_FERR_START,
+       EC_EIGRP_CONFIG,
 };
 
 extern void eigrp_error_init(void);

diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
index d438db28d66bb597c63a18a6e9e4d3338fc962f9..acbd3995375a96dcb26cc975919eb17603be7f87 100644 (file)
--- a/eigrpd/eigrp_hello.c
+++ b/eigrpd/eigrp_hello.c
@@ -421,7 +421,7 @@ void eigrp_sw_version_initialize(void)
        ret = sscanf(ver_string, "%" SCNu32 ".%" SCNu32, &FRR_MAJOR,
                     &FRR_MINOR);
        if (ret != 2)
-               flog_err(EIGRP_ERR_PACKET,
+               flog_err(EC_EIGRP_PACKET,
                          "Did not Properly parse %s, please fix VERSION string",
                          VERSION);
 }

diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c
index b10673d9e422f08ba4757490cd14fae8fd849a06..fc05b956b915ae2bc8895a1df696c6e7ccbdfaec 100644 (file)
--- a/eigrpd/eigrp_neighbor.c
+++ b/eigrpd/eigrp_neighbor.c
@@ -336,7 +336,7 @@ int eigrp_nbr_count_get(void)
 void eigrp_nbr_hard_restart(struct eigrp_neighbor *nbr, struct vty *vty)
 {
        if (nbr == NULL) {
-               flog_err(EIGRP_ERR_CONFIG,
+               flog_err(EC_EIGRP_CONFIG,
                          "Nbr Hard restart: Neighbor not specified.");
                return;
        }

diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index 6338e5cf74b02342ef594c407afab1c836f4c8fc..2ace1e2ea9ae0a229cc7397002cc1dfe7459e949 100644 (file)
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -354,7 +354,7 @@ int eigrp_write(struct thread *thread)
                goto out;
        }
        if (ep->length < EIGRP_HEADER_LEN) {
-               flog_err(EIGRP_ERR_PACKET,
+               flog_err(EC_EIGRP_PACKET,
                          "%s: Packet just has a header?", __PRETTY_FUNCTION__);
                eigrp_header_dump((struct eigrp_header *)ep->s->data);
                eigrp_packet_delete(ei);

diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c
index b6e6352def7bbc3206a7feff4f437add6dd5dc21..88b14b602151a75614205180f77a608fe784ae02 100644 (file)
--- a/eigrpd/eigrp_reply.c
+++ b/eigrpd/eigrp_reply.c
@@ -170,7 +170,7 @@ void eigrp_reply_receive(struct eigrp *eigrp, struct ip *iph,
                if (!dest) {
                        char buf[PREFIX_STRLEN];
 
-                       flog_err(EIGRP_ERR_PACKET,
+                       flog_err(EC_EIGRP_PACKET,
                                  "%s: Received prefix %s which we do not know about",
                                  __PRETTY_FUNCTION__,
                                  prefix2str(&dest_addr, buf, sizeof(buf)));