diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-08-21 15:35:08 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-09-06 22:50:58 +0200 |
| commit | 239697e3b2542c86d8b1b56979c65ad6758e878b (patch) | |
| tree | 5444762b6638d6ad26e3418757b7c896894b3f79 /ospfd | |
| parent | ospf_nsm.c: Convert warn->err and use error-code (diff) | |
| download | frr-239697e3b2542c86d8b1b56979c65ad6758e878b.tar.xz frr-239697e3b2542c86d8b1b56979c65ad6758e878b.zip | |
ospfd: Convert ospf_ri to use error-code subsystem
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_ri.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index ab25f1da4..37d18767e 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -876,7 +876,8 @@ static int ospf_router_info_lsa_originate(void *arg) } } else { if (!is_mandated_params_set(OspfRI)) - zlog_warn( + flog_warn( + OSPF_WARN_LSA, "ospf_router_info_lsa_originate: lacks mandated ROUTER INFORMATION parameters"); /* Ok, let's try to originate an LSA */ @@ -907,7 +908,8 @@ static struct ospf_lsa *ospf_router_info_lsa_refresh(struct ospf_lsa *lsa) /* Verify that the Router Information ID is supported */ if (GET_OPAQUE_ID(ntohl(lsa->data->id.s_addr)) != 0) { - zlog_warn( + flog_warn( + OSPF_WARN_LSA, "ospf_router_info_lsa_refresh: Unsupported Router Information ID"); return NULL; } @@ -977,7 +979,8 @@ static void ospf_router_info_lsa_schedule(enum lsa_opcode opcode) top = ospf_lookup_by_vrf_id(VRF_DEFAULT); if ((OspfRI.scope == OSPF_OPAQUE_AREA_LSA) && (OspfRI.area == NULL)) { - zlog_warn( + flog_warn( + OSPF_WARN_LSA, "ospf_router_info_lsa_schedule(): Router Info is Area scope flooding but area is not set"); OspfRI.area = ospf_area_lookup_by_area_id(top, OspfRI.area_id); } @@ -1007,10 +1010,6 @@ static void ospf_router_info_lsa_schedule(enum lsa_opcode opcode) UNSET_FLAG(OspfRI.flags, RIFLG_LSA_ENGAGED); ospf_opaque_lsa_flush_schedule(&lsa); break; - default: - zlog_warn("ospf_router_info_lsa_schedule: Unknown opcode (%u)", - opcode); - break; } return; @@ -1022,7 +1021,8 @@ static int ospf_router_info_lsa_update(struct ospf_lsa *lsa) /* Sanity Check */ if (lsa == NULL) { - zlog_warn("OSPF-RI (%s): Abort! LSA is NULL", __func__); + flog_warn(OSPF_WARN_LSA, "OSPF-RI (%s): Abort! LSA is NULL", + __func__); return -1; } @@ -1444,7 +1444,10 @@ DEFUN (router_info, /* First start to register Router Information callbacks */ if ((ospf_router_info_register(scope)) != 0) { - zlog_warn( + vty_out(vty, + "%% Unable to register Router Information callbacks."); + flog_err( + OSPF_ERR_INIT_FAIL, "Unable to register Router Information callbacks. Abort!"); return CMD_WARNING_CONFIG_FAILED; } |