From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 13 Sep 2018 19:12:58 +0000 (+0000)
Subject: pimd: PIM_[ERR|WARN] -> EC_PIM
X-Git-Tag: frr-7.1-dev~365^2~5
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=298004a1396b23aa934708b12e27deff50e4d209;p=mirror%2Ffrr.git

pimd: PIM_[ERR|WARN] -> EC_PIM

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

diff --git a/pimd/pim_errors.c b/pimd/pim_errors.c
index d154752bdc..0674a4e994 100644
--- a/pimd/pim_errors.c
+++ b/pimd/pim_errors.c
@@ -26,13 +26,13 @@
 /* clang-format off */
 static struct log_ref ferr_pim_err[] = {
 	{
-		.code = PIM_ERR_MSDP_PACKET,
+		.code = EC_PIM_MSDP_PACKET,
 		.title = "PIM MSDP Packet Error",
 		.description = "PIM has received a packet from a peer that does not correctly decode",
 		.suggestion = "Check MSDP peer and ensure it is correctly working"
 	},
 	{
-		.code = PIM_ERR_CONFIG,
+		.code = EC_PIM_CONFIG,
 		.title = "PIM Configuration Error",
 		.description = "PIM has detected a configuration error",
 		.suggestion = "Ensure the configuration is correct and apply correct configuration"
diff --git a/pimd/pim_errors.h b/pimd/pim_errors.h
index ad9c95a93d..d73caa3f8f 100644
--- a/pimd/pim_errors.h
+++ b/pimd/pim_errors.h
@@ -24,8 +24,8 @@
 #include "lib/ferr.h"
 
 enum pim_log_refs {
-	PIM_ERR_MSDP_PACKET = PIM_FERR_START,
-	PIM_ERR_CONFIG,
+	EC_PIM_MSDP_PACKET = PIM_FERR_START,
+	EC_PIM_CONFIG,
 };
 
 extern void pim_error_init(void);
diff --git a/pimd/pim_msdp_packet.c b/pimd/pim_msdp_packet.c
index 65232aafa2..7875f05c98 100644
--- a/pimd/pim_msdp_packet.c
+++ b/pimd/pim_msdp_packet.c
@@ -484,7 +484,7 @@ static void pim_msdp_pkt_sa_rx_one(struct pim_msdp_peer *mp, struct in_addr rp)
 
 	if (prefix_len != 32) {
 		/* ignore SA update if the prefix length is not 32 */
-		flog_err(PIM_ERR_MSDP_PACKET,
+		flog_err(EC_PIM_MSDP_PACKET,
 			  "rxed sa update with invalid prefix length %d",
 			  prefix_len);
 		return;
diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c
index feac42cf53..4271f5e616 100644
--- a/pimd/pim_msdp_socket.c
+++ b/pimd/pim_msdp_socket.c
@@ -95,7 +95,7 @@ static int pim_msdp_sock_accept(struct thread *thread)
 	if (!mp || !PIM_MSDP_PEER_IS_LISTENER(mp)) {
 		++pim->msdp.rejected_accepts;
 		if (PIM_DEBUG_MSDP_EVENTS) {
-			flog_err(PIM_ERR_MSDP_PACKET,
+			flog_err(EC_PIM_MSDP_PACKET,
 				  "msdp peer connection refused from %s",
 				  sockunion2str(&su, buf, SU_ADDRSTRLEN));
 		}
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index cf078064d8..c5410eef2a 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -116,7 +116,7 @@ void pim_sock_delete(struct interface *ifp, const char *delete_message)
 		  delete_message);
 
 	if (!ifp->info) {
-		flog_err(PIM_ERR_CONFIG,
+		flog_err(EC_PIM_CONFIG,
 			  "%s: %s: but PIM not enabled on interface %s (!)",
 			  __PRETTY_FUNCTION__, delete_message, ifp->name);
 		return;