ospfd: OSPF_[ERR|WARN] -> EC_OSPF

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

1 files changed, 25 insertions, 25 deletions

diff --git a/ospfd/ospf_ext.c b/ospfd/ospf_ext.c
index 1aab61168..316019c15 100644
--- a/ospfd/ospf_ext.c
+++ b/ospfd/ospf_ext.c
@@ -137,7 +137,7 @@ int ospf_ext_init(void)
 		NULL);			     /* del_lsa_hook */
 
 	if (rc != 0) {
-		flog_warn(OSPF_WARN_OPAQUE_REGISTRATION,
+		flog_warn(EC_OSPF_OPAQUE_REGISTRATION,
 			  "EXT (%s): Failed to register Extended Link LSA",
 			  __func__);
 		return rc;
@@ -159,7 +159,7 @@ int ospf_ext_init(void)
 		ospf_ext_pref_lsa_update,    /* new_lsa_hook */
 		NULL);			     /* del_lsa_hook */
 	if (rc != 0) {
-		flog_warn(OSPF_WARN_OPAQUE_REGISTRATION,
+		flog_warn(EC_OSPF_OPAQUE_REGISTRATION,
 			  "EXT (%s): Failed to register Extended Prefix LSA",
 			  __func__);
 		return rc;
@@ -315,7 +315,7 @@ static void set_prefix_sid(struct ext_itf *exti, uint8_t algorithm,
 
 	if ((algorithm != SR_ALGORITHM_SPF)
 	    && (algorithm != SR_ALGORITHM_STRICT_SPF)) {
-		flog_err(OSPF_ERR_INVALID_ALGORITHM,
+		flog_err(EC_OSPF_INVALID_ALGORITHM,
 			 "EXT (%s): unrecognized algorithm, not SPF or S-SPF",
 			 __func__);
 		return;
@@ -571,7 +571,7 @@ static int ospf_ext_link_del_if(struct interface *ifp)
 
 		rc = 0;
 	} else {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): interface %s is not found", __func__,
 			  ifp ? ifp->name : "-");
 	}
@@ -619,7 +619,7 @@ static void ospf_ext_pref_ism_change(struct ospf_interface *oi, int old_status)
 	/* Get interface information for Segment Routing */
 	exti = lookup_ext_by_ifp(oi->ifp);
 	if (exti == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): Cannot get Extended info. from OI(%s)",
 			  __func__, IF_NAME(oi));
 		return;
@@ -657,14 +657,14 @@ static void ospf_ext_link_nsm_change(struct ospf_neighbor *nbr, int old_status)
 	/* Get interface information for Segment Routing */
 	exti = lookup_ext_by_ifp(oi->ifp);
 	if (exti == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): Cannot get Extended info. from OI(%s)",
 			  __func__, IF_NAME(oi));
 		return;
 	}
 
 	if (oi->area == NULL || oi->area->ospf == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): Cannot refer to OSPF from OI(%s)",
 			  __func__, IF_NAME(oi));
 		return;
@@ -760,7 +760,7 @@ static int ospf_ext_link_lsa_update(struct ospf_lsa *lsa)
 {
 	/* Sanity Check */
 	if (lsa == NULL) {
-		flog_warn(OSPF_WARN_LSA_NULL, "EXT (%s): Abort! LSA is NULL",
+		flog_warn(EC_OSPF_LSA_NULL, "EXT (%s): Abort! LSA is NULL",
 			  __func__);
 		return -1;
 	}
@@ -794,7 +794,7 @@ static int ospf_ext_pref_lsa_update(struct ospf_lsa *lsa)
 
 	/* Sanity Check */
 	if (lsa == NULL) {
-		flog_warn(OSPF_WARN_LSA_NULL, "EXT (%s): Abort! LSA is NULL",
+		flog_warn(EC_OSPF_LSA_NULL, "EXT (%s): Abort! LSA is NULL",
 			  __func__);
 		return -1;
 	}
@@ -1062,14 +1062,14 @@ static int ospf_ext_pref_lsa_originate1(struct ospf_area *area,
 	/* Create new Opaque-LSA/Extended Prefix Opaque LSA instance. */
 	new = ospf_ext_pref_lsa_new(area, exti);
 	if (new == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): ospf_ext_pref_lsa_new() error", __func__);
 		return rc;
 	}
 
 	/* Install this LSA into LSDB. */
 	if (ospf_lsa_install(area->ospf, NULL /*oi */, new) == NULL) {
-		flog_warn(OSPF_WARN_LSA_INSTALL_FAILURE,
+		flog_warn(EC_OSPF_LSA_INSTALL_FAILURE,
 			  "EXT (%s): ospf_lsa_install() error", __func__);
 		ospf_lsa_unlock(&new);
 		return rc;
@@ -1116,14 +1116,14 @@ static int ospf_ext_link_lsa_originate1(struct ospf_area *area,
 	/* Create new Opaque-LSA/Extended Link Opaque LSA instance. */
 	new = ospf_ext_link_lsa_new(area, exti);
 	if (new == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): ospf_ext_link_lsa_new() error", __func__);
 		return rc;
 	}
 
 	/* Install this LSA into LSDB. */
 	if (ospf_lsa_install(area->ospf, NULL /*oi */, new) == NULL) {
-		flog_warn(OSPF_WARN_LSA_INSTALL_FAILURE,
+		flog_warn(EC_OSPF_LSA_INSTALL_FAILURE,
 			  "EXT (%s): ospf_lsa_install() error", __func__);
 		ospf_lsa_unlock(&new);
 		return rc;
@@ -1191,7 +1191,7 @@ static int ospf_ext_pref_lsa_originate(void *arg)
 			if (CHECK_FLAG(exti->flags,
 				       EXT_LPFLG_LSA_FORCED_REFRESH)) {
 				flog_warn(
-					OSPF_WARN_EXT_LSA_UNEXPECTED,
+					EC_OSPF_EXT_LSA_UNEXPECTED,
 					"EXT (%s): Refresh instead of Originate",
 					__func__);
 				UNSET_FLAG(exti->flags,
@@ -1249,7 +1249,7 @@ static int ospf_ext_link_lsa_originate(void *arg)
 			if (CHECK_FLAG(exti->flags,
 				       EXT_LPFLG_LSA_FORCED_REFRESH)) {
 				flog_warn(
-					OSPF_WARN_EXT_LSA_UNEXPECTED,
+					EC_OSPF_EXT_LSA_UNEXPECTED,
 					"EXT (%s): Refresh instead of Originate",
 					__func__);
 				UNSET_FLAG(exti->flags,
@@ -1300,7 +1300,7 @@ static struct ospf_lsa *ospf_ext_pref_lsa_refresh(struct ospf_lsa *lsa)
 	/* Lookup this lsa corresponding Extended parameters */
 	exti = lookup_ext_by_instance(lsa);
 	if (exti == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): Invalid parameter LSA ID", __func__);
 		/* Flush it anyway. */
 		lsa->data->ls_age = htons(OSPF_LSA_MAXAGE);
@@ -1308,7 +1308,7 @@ static struct ospf_lsa *ospf_ext_pref_lsa_refresh(struct ospf_lsa *lsa)
 
 	/* Check if Interface was not disable in the interval */
 	if ((exti != NULL) && !CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): Interface was Disabled: Flush it!",
 			  __func__);
 		/* Flush it anyway. */
@@ -1327,7 +1327,7 @@ static struct ospf_lsa *ospf_ext_pref_lsa_refresh(struct ospf_lsa *lsa)
 	new = ospf_ext_pref_lsa_new(area, exti);
 
 	if (new == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): ospf_ext_pref_lsa_new() error", __func__);
 		return NULL;
 	}
@@ -1345,7 +1345,7 @@ static struct ospf_lsa *ospf_ext_pref_lsa_refresh(struct ospf_lsa *lsa)
 		top = ospf_lookup_by_vrf_id(VRF_DEFAULT);
 
 	if (ospf_lsa_install(top, NULL /*oi */, new) == NULL) {
-		flog_warn(OSPF_WARN_LSA_INSTALL_FAILURE,
+		flog_warn(EC_OSPF_LSA_INSTALL_FAILURE,
 			  "EXT (%s): ospf_lsa_install() error", __func__);
 		ospf_lsa_unlock(&new);
 		return NULL;
@@ -1387,7 +1387,7 @@ static struct ospf_lsa *ospf_ext_link_lsa_refresh(struct ospf_lsa *lsa)
 	/* Lookup this LSA corresponding Extended parameters */
 	exti = lookup_ext_by_instance(lsa);
 	if (exti == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): Invalid parameter LSA ID", __func__);
 		/* Flush it anyway. */
 		lsa->data->ls_age = htons(OSPF_LSA_MAXAGE);
@@ -1395,7 +1395,7 @@ static struct ospf_lsa *ospf_ext_link_lsa_refresh(struct ospf_lsa *lsa)
 
 	/* Check if Interface was not disable in the interval */
 	if ((exti != NULL) && !CHECK_FLAG(exti->flags, EXT_LPFLG_LSA_ACTIVE)) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): Interface was Disabled: Flush it!",
 			  __func__);
 		lsa->data->ls_age = htons(OSPF_LSA_MAXAGE);
@@ -1412,7 +1412,7 @@ static struct ospf_lsa *ospf_ext_link_lsa_refresh(struct ospf_lsa *lsa)
 	/* Create new Opaque-LSA/Extended Link instance */
 	new = ospf_ext_link_lsa_new(area, exti);
 	if (new == NULL) {
-		flog_warn(OSPF_WARN_EXT_LSA_UNEXPECTED,
+		flog_warn(EC_OSPF_EXT_LSA_UNEXPECTED,
 			  "EXT (%s): Error creating new LSA", __func__);
 		return NULL;
 	}
@@ -1421,7 +1421,7 @@ static struct ospf_lsa *ospf_ext_link_lsa_refresh(struct ospf_lsa *lsa)
 	/* Install this LSA into LSDB. */
 	/* Given "lsa" will be freed in the next function */
 	if (ospf_lsa_install(top, NULL /*oi */, new) == NULL) {
-		flog_warn(OSPF_WARN_LSA_INSTALL_FAILURE,
+		flog_warn(EC_OSPF_LSA_INSTALL_FAILURE,
 			  "EXT (%s): Error installing new LSA", __func__);
 		ospf_lsa_unlock(&new);
 		return NULL;
@@ -1470,7 +1470,7 @@ static void ospf_ext_pref_lsa_schedule(struct ext_itf *exti,
 	/* Set LSA header information */
 	if (exti->area == NULL) {
 		flog_warn(
-			OSPF_WARN_EXT_LSA_UNEXPECTED,
+			EC_OSPF_EXT_LSA_UNEXPECTED,
 			"EXT (%s): Flooding is Area scope but area is not yet set",
 			__func__);
 		if (OspfEXT.area == NULL) {
@@ -1531,7 +1531,7 @@ static void ospf_ext_link_lsa_schedule(struct ext_itf *exti,
 	/* Set LSA header information */
 	if (exti->area == NULL) {
 		flog_warn(
-			OSPF_WARN_EXT_LSA_UNEXPECTED,
+			EC_OSPF_EXT_LSA_UNEXPECTED,
 			"EXT (%s): Flooding is Area scope but area is not yet set",
 			__func__);
 		if (OspfEXT.area == NULL) {