zebra: replace zlog_err with flog_err

[mirror_frr.git] / ospf6d / ospf6_neighbor.c

diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index 16bf2fd8e7bbb87ee6913f80566e2e954e4daccf..bb451c239e6c3ae584aebd58b126cdf417d423b9 100644 (file)
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -59,10 +59,14 @@ int ospf6_neighbor_cmp(void *va, void *vb)
 {
        struct ospf6_neighbor *ona = (struct ospf6_neighbor *)va;
        struct ospf6_neighbor *onb = (struct ospf6_neighbor *)vb;
-       return (ntohl(ona->router_id) < ntohl(onb->router_id) ? -1 : 1);
+
+       if (ona->router_id == onb->router_id)
+               return 0;
+
+       return (ntohl(ona->router_id) < ntohl(onb->router_id)) ? -1 : 1;
 }
 
-struct ospf6_neighbor *ospf6_neighbor_lookup(u_int32_t router_id,
+struct ospf6_neighbor *ospf6_neighbor_lookup(uint32_t router_id,
                                             struct ospf6_interface *oi)
 {
        struct listnode *n;
@@ -76,7 +80,7 @@ struct ospf6_neighbor *ospf6_neighbor_lookup(u_int32_t router_id,
 }
 
 /* create ospf6_neighbor */
-struct ospf6_neighbor *ospf6_neighbor_create(u_int32_t router_id,
+struct ospf6_neighbor *ospf6_neighbor_create(uint32_t router_id,
                                             struct ospf6_interface *oi)
 {
        struct ospf6_neighbor *on;
@@ -84,10 +88,6 @@ struct ospf6_neighbor *ospf6_neighbor_create(u_int32_t router_id,
 
        on = (struct ospf6_neighbor *)XMALLOC(MTYPE_OSPF6_NEIGHBOR,
                                              sizeof(struct ospf6_neighbor));
-       if (on == NULL) {
-               zlog_warn("neighbor: malloc failed");
-               return NULL;
-       }
 
        memset(on, 0, sizeof(struct ospf6_neighbor));
        inet_ntop(AF_INET, &router_id, buf, sizeof(buf));
@@ -147,10 +147,10 @@ void ospf6_neighbor_delete(struct ospf6_neighbor *on)
        XFREE(MTYPE_OSPF6_NEIGHBOR, on);
 }
 
-static void ospf6_neighbor_state_change(u_char next_state,
+static void ospf6_neighbor_state_change(uint8_t next_state,
                                        struct ospf6_neighbor *on, int event)
 {
-       u_char prev_state;
+       uint8_t prev_state;
 
        prev_state = on->state;
        on->state = next_state;
@@ -193,8 +193,9 @@ static void ospf6_neighbor_state_change(u_char next_state,
 
                OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(on->ospf6_if->area);
 
-               if (prev_state == OSPF6_NEIGHBOR_LOADING
-                   && next_state == OSPF6_NEIGHBOR_FULL) {
+               if ((prev_state == OSPF6_NEIGHBOR_LOADING ||
+                    prev_state == OSPF6_NEIGHBOR_EXCHANGE) &&
+                   next_state == OSPF6_NEIGHBOR_FULL) {
                        OSPF6_AS_EXTERN_LSA_SCHEDULE(on->ospf6_if);
                        on->ospf6_if->area->full_nbrs++;
                }
@@ -708,7 +709,7 @@ static void ospf6_neighbor_show_detail(struct vty *vty,
                (CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT) ? "More " : ""),
                (CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MSBIT) ? "Master"
                                                                 : "Slave"),
-               (u_long)ntohl(on->dbdesc_seqnum));
+               (unsigned long)ntohl(on->dbdesc_seqnum));
 
        vty_out(vty, "    Summary-List: %d LSAs\n", on->summary_list->count);
        for (ALL_LSDB(on->summary_list, lsa))
@@ -826,7 +827,7 @@ DEFUN (show_ipv6_ospf6_neighbor_one,
        struct ospf6_area *oa;
        struct listnode *i, *j, *k;
        void (*showfunc)(struct vty *, struct ospf6_neighbor *);
-       u_int32_t router_id;
+       uint32_t router_id;
 
        OSPF6_CMD_CHECK_RUNNING();
        showfunc = ospf6_neighbor_show_detail;
@@ -909,7 +910,7 @@ DEFUN (no_debug_ospf6,
        DEBUG_STR
        OSPF6_STR)
 {
-       u_int i;
+       unsigned int i;
        struct ospf6_lsa_handler *handler = NULL;
 
        OSPF6_DEBUG_ABR_OFF();
@@ -924,7 +925,7 @@ DEFUN (no_debug_ospf6,
                handler = vector_slot(ospf6_lsa_handler_vector, i);
 
                if (handler != NULL) {
-                       UNSET_FLAG(handler->debug, OSPF6_LSA_DEBUG);
+                       UNSET_FLAG(handler->lh_debug, OSPF6_LSA_DEBUG);
                }
        }