zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / ospfd / ospf_nsm.c

diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 1e72e3db6308f93ba136cf3e18222942a05f08bf..f7c73fee3397914b2d4ed7b19eef86e2f64a3b1d 100644 (file)
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -48,6 +48,7 @@
 #include "ospfd/ospf_flood.h"
 #include "ospfd/ospf_abr.h"
 #include "ospfd/ospf_bfd.h"
+#include "ospfd/ospf_errors.h"
 
 DEFINE_HOOK(ospf_nsm_change,
            (struct ospf_neighbor * on, int state, int oldstate),
@@ -93,7 +94,7 @@ static int ospf_db_desc_timer(struct thread *thread)
        return 0;
 }
 
-/* Hook function called after ospf NSM event is occured.
+/* Hook function called after ospf NSM event is occurred.
  *
  * Set/clear any timers whose condition is implicit to the neighbour
  * state. There may be other timers which are set/unset according to other
@@ -713,7 +714,7 @@ static void nsm_change_state(struct ospf_neighbor *nbr, int state)
                ospf_router_lsa_update_area(oi->area);
 
                if (oi->type == OSPF_IFTYPE_VIRTUALLINK) {
-                       struct ospf_area *vl_area = ospf_area_lookup_by_area_id(
+                       vl_area = ospf_area_lookup_by_area_id(
                                oi->ospf, oi->vl_data->vl_area_id);
 
                        if (vl_area)
@@ -795,7 +796,8 @@ int ospf_nsm_event(struct thread *thread)
                         * not
                         * try set next_state.
                         */
-                       zlog_warn(
+                       flog_err(
+                               EC_OSPF_FSM_INVALID_STATE,
                                "NSM[%s:%s]: %s (%s): "
                                "Warning: action tried to change next_state to %s",
                                IF_NAME(nbr->oi), inet_ntoa(nbr->router_id),