Merge branch 'patches/jt_ospf-fixes-20091129' into ospf-merge-3

15 files changed, 313 insertions, 457 deletions

diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 15fd2e5f..bd5c026c 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -2470,7 +2470,7 @@ ospf_apiserver_clients_notify_nsm_change (struct ospf_neighbor *nbr)
       ifaddr = nbr->oi->address->u.prefix4;
     }
 
-  nbraddr = nbr->address.u.prefix4;
+  nbraddr = nbr->src;
 
   msg = new_msg_nsm_change (0, ifaddr, nbraddr, nbr->router_id, nbr->state);
   if (!msg)
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index e65b2e33..4786a87c 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -215,9 +215,9 @@ ospf_nbr_state_message (struct ospf_neighbor *nbr, char *buf, size_t size)
   int state;
   struct ospf_interface *oi = nbr->oi;
 
-  if (IPV4_ADDR_SAME (&DR (oi), &nbr->address.u.prefix4))
+  if (IPV4_ADDR_SAME (&DR (oi), &nbr->src))
     state = ISM_DR;
-  else if (IPV4_ADDR_SAME (&BDR (oi), &nbr->address.u.prefix4))
+  else if (IPV4_ADDR_SAME (&BDR (oi), &nbr->src))
     state = ISM_Backup;
   else
     state = ISM_DROther;
diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 41661da2..5ebf4f2f 100644
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -346,7 +346,7 @@ ospf_flood_through_interface (struct ospf_interface *oi,
 			      struct ospf_lsa *lsa)
 {
   struct ospf_neighbor *onbr;
-  struct route_node *rn;
+  struct listnode *node;
   int retx_flag;
 
   if (IS_DEBUG_OSPF_EVENT)
@@ -364,14 +364,10 @@ ospf_flood_through_interface (struct ospf_interface *oi,
   /* Each of the neighbors attached to this interface are examined,
      to determine whether they must receive the new LSA.  The following
      steps are executed for each neighbor: */
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, onbr))
     {
       struct ospf_lsa *ls_req;
- 
-      if (rn->info == NULL)
-	continue;
 
-      onbr = rn->info;
       if (IS_DEBUG_OSPF_EVENT)
 	zlog_debug ("ospf_flood_through_interface(): considering nbr %s (%s)",
 		   inet_ntoa (onbr->router_id),
@@ -543,13 +539,12 @@ ospf_flood_through_interface (struct ospf_interface *oi,
       addresses.   */
   if (oi->type == OSPF_IFTYPE_NBMA)
     {
-      struct route_node *rn;
+      struct listnode *node;
       struct ospf_neighbor *nbr;
 
-      for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-        if ((nbr = rn->info) != NULL)
-	  if (nbr != oi->nbr_self && nbr->state >= NSM_Exchange)
-	    ospf_ls_upd_send_lsa (nbr, lsa, OSPF_SEND_PACKET_DIRECT);
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+	if (nbr != oi->nbr_self && nbr->state >= NSM_Exchange)
+	  ospf_ls_upd_send_lsa (nbr, lsa, OSPF_SEND_PACKET_DIRECT);
     }
   else
     ospf_ls_upd_send_lsa (oi->nbr_self, lsa, OSPF_SEND_PACKET_INDIRECT);
@@ -934,21 +929,20 @@ static void
 ospf_ls_retransmit_delete_nbr_if (struct ospf_interface *oi,
 				  struct ospf_lsa *lsa)
 {
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *nbr;
   struct ospf_lsa *lsr;
 
   if (ospf_if_is_enable (oi))
-    for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
+    for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
       /* If LSA find in LS-retransmit list, then remove it. */
-      if ((nbr = rn->info) != NULL)
-	{
-	  lsr = ospf_ls_retransmit_lookup (nbr, lsa);
-	     
-	  /* If LSA find in ls-retransmit list, remove it. */
-	  if (lsr != NULL && lsr->data->ls_seqnum == lsa->data->ls_seqnum)
-	    ospf_ls_retransmit_delete (nbr, lsr);
-	}
+      {
+	lsr = ospf_ls_retransmit_lookup (nbr, lsa);
+
+	/* If LSA find in ls-retransmit list, remove it. */
+	if (lsr != NULL && lsr->data->ls_seqnum == lsa->data->ls_seqnum)
+	  ospf_ls_retransmit_delete (nbr, lsr);
+      }
 }
 
 void
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index afe3acf1..5c64ba29 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -223,7 +223,7 @@ ospf_if_new (struct ospf *ospf, struct interface *ifp, struct prefix *p)
   oi->network_lsa_self = NULL;
 
   /* Initialize neighbor list. */
-  oi->nbrs = route_table_init ();
+  oi->nbrs = list_new ();
 
   /* Initialize static neighbor list. */
   oi->nbr_nbma = list_new ();
@@ -258,7 +258,6 @@ ospf_if_new (struct ospf *ospf, struct interface *ifp, struct prefix *p)
 void
 ospf_if_cleanup (struct ospf_interface *oi)
 {
-  struct route_node *rn;
   struct listnode *node, *nnode;
   struct ospf_neighbor *nbr;
   struct ospf_nbr_nbma *nbr_nbma;
@@ -282,10 +281,9 @@ ospf_if_cleanup (struct ospf_interface *oi)
     }
 
   /* send Neighbor event KillNbr to all associated neighbors. */
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info) != NULL)
-      if (nbr != oi->nbr_self)
-	OSPF_NSM_EVENT_EXECUTE (nbr, NSM_KillNbr);
+  for (ALL_LIST_ELEMENTS (oi->nbrs, node, nnode, nbr))
+    if (nbr != oi->nbr_self)
+      OSPF_NSM_EVENT_EXECUTE (nbr, NSM_KillNbr);
 
   /* Cleanup Link State Acknowlegdment list. */
   for (ALL_LIST_ELEMENTS (oi->ls_ack, node, nnode, lsa))
@@ -321,7 +319,7 @@ ospf_if_free (struct ospf_interface *oi)
   /* Free Pseudo Neighbour */
   ospf_nbr_delete (oi->nbr_self);
   
-  route_table_finish (oi->nbrs);
+  list_free (oi->nbrs);
   route_table_finish (oi->ls_upd_queue);
   
   /* Free any lists that should be freed */
diff --git a/ospfd/ospf_interface.h b/ospfd/ospf_interface.h
index ab0b7580..18b98cd0 100644
--- a/ospfd/ospf_interface.h
+++ b/ospfd/ospf_interface.h
@@ -171,7 +171,7 @@ struct ospf_interface
   u_int32_t output_cost;	        /* Acutual Interface Output Cost */
 
   /* Neighbor information. */
-  struct route_table *nbrs;             /* OSPF Neighbor List */
+  struct list *nbrs;			/* OSPF Neighbor List */
   struct ospf_neighbor *nbr_self;	/* Neighbor Self */
 #define DR(I)			((I)->nbr_self->d_router)
 #define BDR(I)			((I)->nbr_self->bd_router)
diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c
index 18402836..2186e894 100644
--- a/ospfd/ospf_ism.c
+++ b/ospfd/ospf_ism.c
@@ -88,7 +88,7 @@ ospf_elect_dr (struct ospf_interface *oi, struct list *el_list)
 	listnode_add (dr_list, nbr);
 
       /* Preserve neighbor BDR. */
-      if (IPV4_ADDR_SAME (&BDR (oi), &nbr->address.u.prefix4))
+      if (IPV4_ADDR_SAME (&BDR (oi), &nbr->src))
 	bdr = nbr;
     }
 
@@ -100,7 +100,7 @@ ospf_elect_dr (struct ospf_interface *oi, struct list *el_list)
 
   /* Set DR to interface. */
   if (dr)
-    DR (oi) = dr->address.u.prefix4;
+    DR (oi) = dr->src;
   else
     DR (oi).s_addr = 0;
 
@@ -141,7 +141,7 @@ ospf_elect_bdr (struct ospf_interface *oi, struct list *el_list)
 
   /* Set BDR to interface. */
   if (bdr)
-    BDR (oi) = bdr->address.u.prefix4;
+    BDR (oi) = bdr->src;
   else
     BDR (oi).s_addr = 0;
 
@@ -163,38 +163,36 @@ ospf_ism_state (struct ospf_interface *oi)
 }
 
 static void
-ospf_dr_eligible_routers (struct route_table *nbrs, struct list *el_list)
+ospf_dr_eligible_routers (struct list *nbrs, struct list *el_list)
 {
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *nbr;
 
-  for (rn = route_top (nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info) != NULL)
-      /* Ignore 0.0.0.0 node*/
-      if (nbr->router_id.s_addr != 0)
-	/* Is neighbor eligible? */
-	if (nbr->priority > 0)
-	  /* Is neighbor upper 2-Way? */
-	  if (nbr->state >= NSM_TwoWay)
-	    listnode_add (el_list, nbr);
+  for (ALL_LIST_ELEMENTS_RO (nbrs, node, nbr))
+    /* Ignore 0.0.0.0 node*/
+    if (nbr->router_id.s_addr != 0)
+      /* Is neighbor eligible? */
+      if (nbr->priority > 0)
+	/* Is neighbor upper 2-Way? */
+	if (nbr->state >= NSM_TwoWay)
+	  listnode_add (el_list, nbr);
 }
 
 /* Generate AdjOK? NSM event. */
 static void
-ospf_dr_change (struct ospf *ospf, struct route_table *nbrs)
+ospf_dr_change (struct ospf *ospf, struct list *nbrs)
 {
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *nbr;
 
-  for (rn = route_top (nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info) != NULL)
-      /* Ignore 0.0.0.0 node*/
-      if (nbr->router_id.s_addr != 0)
-	/* Is neighbor upper 2-Way? */
-	if (nbr->state >= NSM_TwoWay)
-	  /* Ignore myself. */
-	  if (!IPV4_ADDR_SAME (&nbr->router_id, &ospf->router_id))
-	    OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_AdjOK);
+  for (ALL_LIST_ELEMENTS_RO (nbrs, node, nbr))
+    /* Ignore 0.0.0.0 node*/
+    if (nbr->router_id.s_addr != 0)
+      /* Is neighbor upper 2-Way? */
+      if (nbr->state >= NSM_TwoWay)
+	/* Ignore myself. */
+	if (!IPV4_ADDR_SAME (&nbr->router_id, &ospf->router_id))
+	  OSPF_NSM_EVENT_SCHEDULE (nbr, NSM_AdjOK);
 }
 
 static int
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 8737bca2..c9f2cba3 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -436,17 +436,13 @@ struct ospf_neighbor *
 ospf_nbr_lookup_ptop (struct ospf_interface *oi)
 {
   struct ospf_neighbor *nbr = NULL;
-  struct route_node *rn;
+  struct listnode *node;
 
   /* Search neighbor, there must be one of two nbrs. */
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info))
-      if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
-	if (nbr->state == NSM_Full)
-	  {
-	    route_unlock_node (rn);
-	    break;
-	  }
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+    if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
+      if (nbr->state == NSM_Full)
+	  break;
 
   /* PtoP link must have only 1 neighbor. */
   if (ospf_nbr_count (oi, 0) > 1)
@@ -623,7 +619,7 @@ static int
 lsa_link_ptomp_set (struct stream *s, struct ospf_interface *oi)
 {
   int links = 0;
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *nbr = NULL;
   struct in_addr id, mask;
   u_int16_t cost = ospf_link_cost (oi);
@@ -636,20 +632,18 @@ lsa_link_ptomp_set (struct stream *s, struct ospf_interface *oi)
     zlog_debug ("PointToMultipoint: running ptomultip_set");
 
   /* Search neighbor, */
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info) != NULL)
-      /* Ignore myself. */
-      if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
-	if (nbr->state == NSM_Full)
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+    /* Ignore myself. */
+    if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
+      if (nbr->state == NSM_Full)
+	{
+	  links += link_info_set (s, nbr->router_id, oi->address->u.prefix4,
+				  LSA_LINK_TYPE_POINTOPOINT, 0, cost);
+	  if (IS_DEBUG_OSPF (lsa, LSA_GENERATE))
+	    zlog_debug ("PointToMultipoint: set link to %s",
+			inet_ntoa(oi->address->u.prefix4));
+	}
 
-	  {
-	    links += link_info_set (s, nbr->router_id, oi->address->u.prefix4,
-			            LSA_LINK_TYPE_POINTOPOINT, 0, cost);
-            if (IS_DEBUG_OSPF (lsa, LSA_GENERATE))
- 	      zlog_debug ("PointToMultipoint: set link to %s",
-		         inet_ntoa(oi->address->u.prefix4));
-	  }
-  
   return links;
 }
 
@@ -1030,7 +1024,7 @@ static void
 ospf_network_lsa_body_set (struct stream *s, struct ospf_interface *oi)
 {
   struct in_addr mask;
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *nbr;
 
   masklen2ip (oi->address->prefixlen, &mask);
@@ -1041,10 +1035,9 @@ ospf_network_lsa_body_set (struct stream *s, struct ospf_interface *oi)
     its OSPF Router ID.  The Designated Router includes itself in this
     list. RFC2328, Section 12.4.2 */
 
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info) != NULL)
-      if (nbr->state == NSM_Full || nbr == oi->nbr_self)
-	stream_put_ipv4 (s, nbr->router_id.s_addr);
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+    if (nbr->state == NSM_Full || nbr == oi->nbr_self)
+      stream_put_ipv4 (s, nbr->router_id.s_addr);
 }
 
 static struct ospf_lsa *
@@ -2844,19 +2837,14 @@ ospf_check_nbr_status (struct ospf *ospf)
   struct listnode *node, *nnode;
   struct ospf_interface *oi;
   
-  for (ALL_LIST_ELEMENTS (ospf->oiflist, node, nnode, oi))
+  for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi))
     {
-      struct route_node *rn;
       struct ospf_neighbor *nbr;
 
       if (ospf_if_is_enable (oi))
-	for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-          if ((nbr = rn->info) != NULL)
-	    if (nbr->state == NSM_Exchange || nbr->state == NSM_Loading)
-	      {
-		route_unlock_node (rn);
-		return 0;
-	      }
+	for (ALL_LIST_ELEMENTS_RO (oi->nbrs, nnode, nbr))
+	  if (nbr->state == NSM_Exchange || nbr->state == NSM_Loading)
+	    return 0;
     }
 
   return 1;
diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c
index 967ca15d..e55a1903 100644
--- a/ospfd/ospf_neighbor.c
+++ b/ospfd/ospf_neighbor.c
@@ -43,26 +43,6 @@
 #include "ospfd/ospf_flood.h"
 #include "ospfd/ospf_dump.h"
 
-/* Fill in the the 'key' as appropriate to retrieve the entry for nbr
- * from the ospf_interface's nbrs table. Indexed by interface address
- * for all cases except Virtual-link interfaces, where neighbours are
- * indexed by router-ID instead.
- */
-static void
-ospf_nbr_key (struct ospf_interface *oi, struct ospf_neighbor *nbr,
-              struct prefix *key)
-{
-  key->family = AF_INET;
-  key->prefixlen = IPV4_MAX_BITLEN;
-
-  /* vlinks are indexed by router-id */
-  if (oi->type == OSPF_IFTYPE_VIRTUALLINK)
-    key->u.prefix4 = nbr->router_id;
-  else
-    key->u.prefix4 = nbr->src;
-  return;
-}
-
 struct ospf_neighbor *
 ospf_nbr_new (struct ospf_interface *oi)
 {
@@ -143,44 +123,43 @@ ospf_nbr_free (struct ospf_neighbor *nbr)
 
   XFREE (MTYPE_OSPF_NEIGHBOR, nbr);
 }
+/* lookup nbr by address - use this only if you know you must
+ * otherwise use the ospf_nbr_lookup() wrapper, which deals
+ * with virtual link and PointToPoint neighbours
+ */
+struct ospf_neighbor *
+ospf_nbr_lookup_by_addr (struct list *nbrs,
+			 struct in_addr *addr)
+{
+  struct listnode *node;
+  struct ospf_neighbor *nbr;
 
-/* Delete specified OSPF neighbor from interface. */
-void
-ospf_nbr_delete (struct ospf_neighbor *nbr)
+  for (ALL_LIST_ELEMENTS_RO (nbrs, node, nbr))
+    if (IPV4_ADDR_SAME (&nbr->src, addr))
+	return nbr;
+
+  return NULL;
+}
+
+struct ospf_neighbor *
+ospf_nbr_lookup_by_routerid (struct list *nbrs,
+			     struct in_addr *id)
 {
-  struct ospf_interface *oi;
-  struct route_node *rn;
-  struct prefix p;
+  struct listnode *node;
+  struct ospf_neighbor *nbr;
 
-  oi = nbr->oi;
-  
-  /* get appropriate prefix 'key' */
-  ospf_nbr_key (oi, nbr, &p);
+  for (ALL_LIST_ELEMENTS_RO (nbrs, node, nbr))
+    if (IPV4_ADDR_SAME (&nbr->router_id, id))
+	return nbr;
 
-  rn = route_node_lookup (oi->nbrs, &p);
-  if (rn)
-    {
-      /* If lookup for a NBR succeeds, the leaf route_node could
-       * only exist because there is (or was) a nbr there.
-       * If the nbr was deleted, the leaf route_node should have
-       * lost its last refcount too, and be deleted.
-       * Therefore a looked-up leaf route_node in nbrs table
-       * should never have NULL info.
-       */
-      assert (rn->info);
-      
-      if (rn->info)
-	{
-	  rn->info = NULL;
-	  route_unlock_node (rn);
-	}
-      else
-	zlog_info ("Can't find neighbor %s in the interface %s",
-		   inet_ntoa (nbr->src), IF_NAME (oi));
-
-      route_unlock_node (rn);
-    }
+  return NULL;
+}
 
+/* Delete specified OSPF neighbor from interface. */
+void
+ospf_nbr_delete (struct ospf_neighbor *nbr)
+{
+  listnode_delete(nbr->oi->nbrs, nbr);
   /* Free ospf_neighbor structure. */
   ospf_nbr_free (nbr);
 }
@@ -206,11 +185,9 @@ ospf_nbr_bidirectional (struct in_addr *router_id,
 void
 ospf_nbr_add_self (struct ospf_interface *oi)
 {
-  struct prefix p;
-  struct route_node *rn;
+  struct ospf_neighbor *nbr;
 
   /* Initial state */
-  oi->nbr_self->address = *oi->address;
   oi->nbr_self->priority = OSPF_IF_PARAM (oi, priority);
   oi->nbr_self->router_id = oi->ospf->router_id;
   oi->nbr_self->src = oi->address->u.prefix4;
@@ -229,19 +206,23 @@ ospf_nbr_add_self (struct ospf_interface *oi)
         SET_FLAG (oi->nbr_self->options, OSPF_OPTION_NP);
         break;
     }
-  
-  /* Add nbr_self to nbrs table */
-  ospf_nbr_key (oi, oi->nbr_self, &p);
-  
-  rn = route_node_get (oi->nbrs, &p);
-  if (rn->info)
+
+  /* Sanity check, should not be needed */
+  if (oi->type == OSPF_IFTYPE_VIRTUALLINK ||
+      oi->type == OSPF_IFTYPE_POINTOPOINT)
+    nbr = ospf_nbr_lookup_by_routerid (oi->nbrs, &oi->nbr_self->router_id);
+  else
+    nbr = ospf_nbr_lookup_by_addr (oi->nbrs, &oi->nbr_self->src);
+  if (nbr)
     {
-      /* There is already pseudo neighbor. */
-      assert (oi->nbr_self == rn->info);
-      route_unlock_node (rn);
+      assert (oi->nbr_self == nbr);
+      zlog_info("Self neighbor already added for ospf I/F:%s",
+		oi->ifp->name);
+      return;
     }
-  else
-    rn->info = oi->nbr_self;
+
+  /* Add nbr_self to nbrs table */
+  listnode_add(oi->nbrs, oi->nbr_self);
 }
 
 /* Get neighbor count by status.
@@ -250,14 +231,13 @@ int
 ospf_nbr_count (struct ospf_interface *oi, int state)
 {
   struct ospf_neighbor *nbr;
-  struct route_node *rn;
+  struct listnode *node;
   int count = 0;
 
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info))
-      if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
-	if (state == 0 || nbr->state == state)
-	  count++;
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+    if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
+      if (state == 0 || nbr->state == state)
+	count++;
 
   return count;
 }
@@ -267,80 +247,24 @@ int
 ospf_nbr_count_opaque_capable (struct ospf_interface *oi)
 {
   struct ospf_neighbor *nbr;
-  struct route_node *rn;
+  struct listnode *node;
   int count = 0;
 
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info))
-      if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
-	if (nbr->state == NSM_Full)
-	  if (CHECK_FLAG (nbr->options, OSPF_OPTION_O))
-	    count++;
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+    if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
+      if (nbr->state == NSM_Full)
+	if (CHECK_FLAG (nbr->options, OSPF_OPTION_O))
+	  count++;
 
   return count;
 }
 #endif /* HAVE_OPAQUE_LSA */
 
-/* lookup nbr by address - use this only if you know you must
- * otherwise use the ospf_nbr_lookup() wrapper, which deals 
- * with virtual link neighbours
- */
-struct ospf_neighbor *
-ospf_nbr_lookup_by_addr (struct route_table *nbrs,
-			 struct in_addr *addr)
-{
-  struct prefix p;
-  struct route_node *rn;
-  struct ospf_neighbor *nbr;
-
-  p.family = AF_INET;
-  p.prefixlen = IPV4_MAX_BITLEN;
-  p.u.prefix4 = *addr;
-
-  rn = route_node_lookup (nbrs, &p);
-  if (! rn)
-    return NULL;
-  
-  /* See comment in ospf_nbr_delete */
-  assert (rn->info);
-
-  if (rn->info == NULL)
-    {
-      route_unlock_node (rn);
-      return NULL;
-    }
-
-  nbr = (struct ospf_neighbor *) rn->info;
-  route_unlock_node (rn);
-
-  return nbr;
-}
-
-struct ospf_neighbor *
-ospf_nbr_lookup_by_routerid (struct route_table *nbrs,
-			     struct in_addr *id)
-{
-  struct route_node *rn;
-  struct ospf_neighbor *nbr;
-
-  for (rn = route_top (nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info) != NULL)
-      if (IPV4_ADDR_SAME (&nbr->router_id, id))
-	{
-	  route_unlock_node(rn);
-	  return nbr;
-	}
-
-  return NULL;
-}
-
 void
 ospf_renegotiate_optional_capabilities (struct ospf *top)
 {
-  struct listnode *node;
+  struct listnode *node, *nnode;
   struct ospf_interface *oi;
-  struct route_table *nbrs;
-  struct route_node *rn;
   struct ospf_neighbor *nbr;
 
   /* At first, flush self-originated LSAs from routing domain. */
@@ -349,12 +273,9 @@ ospf_renegotiate_optional_capabilities (struct ospf *top)
   /* Revert all neighbor status to ExStart. */
   for (ALL_LIST_ELEMENTS_RO (top->oiflist, node, oi))
     {
-      if ((nbrs = oi->nbrs) == NULL)
-        continue;
-
-      for (rn = route_top (nbrs); rn; rn = route_next (rn))
-        {
-          if ((nbr = rn->info) == NULL || nbr == oi->nbr_self)
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, nnode, nbr))
+	{
+          if (nbr == oi->nbr_self)
             continue;
 
           if (nbr->state < NSM_ExStart)
@@ -375,22 +296,22 @@ struct ospf_neighbor *
 ospf_nbr_lookup (struct ospf_interface *oi, struct ip *iph,
                  struct ospf_header *ospfh)
 {
-  if (oi->type == OSPF_IFTYPE_VIRTUALLINK)
-    return (ospf_nbr_lookup_by_routerid (oi->nbrs, &ospfh->router_id));
+  if (oi->type == OSPF_IFTYPE_VIRTUALLINK ||
+      oi->type == OSPF_IFTYPE_POINTOPOINT)
+    return ospf_nbr_lookup_by_routerid (oi->nbrs, &ospfh->router_id);
   else
-    return (ospf_nbr_lookup_by_addr (oi->nbrs, &iph->ip_src));
+    return ospf_nbr_lookup_by_addr (oi->nbrs, &iph->ip_src);
 }
 
 static struct ospf_neighbor *
 ospf_nbr_add (struct ospf_interface *oi, struct ospf_header *ospfh,
-              struct prefix *p)
+              struct ip *iph)
 {
   struct ospf_neighbor *nbr;
   
   nbr = ospf_nbr_new (oi);
   nbr->state = NSM_Down;
-  nbr->src = p->u.prefix4;
-  memcpy (&nbr->address, p, sizeof (struct prefix));
+  nbr->src = iph->ip_src;
 
   nbr->nbr_nbma = NULL;
   if (oi->type == OSPF_IFTYPE_NBMA)
@@ -420,43 +341,31 @@ ospf_nbr_add (struct ospf_interface *oi, struct ospf_header *ospfh,
   if (IS_DEBUG_OSPF_EVENT)
     zlog_debug ("NSM[%s:%s]: start", IF_NAME (nbr->oi),
                inet_ntoa (nbr->router_id));
-  
+
+  listnode_add(oi->nbrs, nbr);
   return nbr;
 }
 
 struct ospf_neighbor *
 ospf_nbr_get (struct ospf_interface *oi, struct ospf_header *ospfh,
-              struct ip *iph, struct prefix *p)
+              struct ip *iph)
 {
-  struct route_node *rn;
-  struct prefix key;
   struct ospf_neighbor *nbr;
-  
-  key.family = AF_INET;
-  key.prefixlen = IPV4_MAX_BITLEN;
 
-  if (oi->type == OSPF_IFTYPE_VIRTUALLINK)
-    key.u.prefix4 = ospfh->router_id;   /* index vlink nbrs by router-id */
-  else
-    key.u.prefix4 = iph->ip_src;
-
-  rn = route_node_get (oi->nbrs, &key);
-  if (rn->info)
+  nbr = ospf_nbr_lookup (oi, iph, ospfh);
+  if (nbr)
     {
-      route_unlock_node (rn);
-      nbr = rn->info;
-      
       if (oi->type == OSPF_IFTYPE_NBMA && nbr->state == NSM_Attempt)
         {
           nbr->src = iph->ip_src;
-          memcpy (&nbr->address, p, sizeof (struct prefix));
         }
     }
   else
     {
-      rn->info = nbr = ospf_nbr_add (oi, ospfh, p);
+      nbr = ospf_nbr_add (oi, ospfh, iph);
+      listnode_add (oi->nbrs, nbr);
     }
-  
+
   nbr->router_id = ospfh->router_id;
 
   return nbr;
diff --git a/ospfd/ospf_neighbor.h b/ospfd/ospf_neighbor.h
index 25f13524..70cc7855 100644
--- a/ospfd/ospf_neighbor.h
+++ b/ospfd/ospf_neighbor.h
@@ -37,8 +37,6 @@ struct ospf_neighbor
   u_int32_t dd_seqnum;			/* DD Sequence Number. */
 
   /* Neighbor Information from Hello. */
-  struct prefix address;		/* Neighbor Interface Address. */
-
   struct in_addr src;			/* Src address. */
   struct in_addr router_id;		/* Router ID. */
   u_char options;			/* Options. */
@@ -91,8 +89,8 @@ struct ospf_neighbor
 };
 
 /* Macros. */
-#define NBR_IS_DR(n)	IPV4_ADDR_SAME (&n->address.u.prefix4, &n->d_router)
-#define NBR_IS_BDR(n)   IPV4_ADDR_SAME (&n->address.u.prefix4, &n->bd_router)
+#define NBR_IS_DR(n)	IPV4_ADDR_SAME (&n->src, &n->d_router)
+#define NBR_IS_BDR(n)   IPV4_ADDR_SAME (&n->src, &n->bd_router)
 
 /* Prototypes. */
 extern struct ospf_neighbor *ospf_nbr_new (struct ospf_interface *);
@@ -106,14 +104,13 @@ extern int ospf_nbr_count_opaque_capable (struct ospf_interface *);
 #endif /* HAVE_OPAQUE_LSA */
 extern struct ospf_neighbor *ospf_nbr_get (struct ospf_interface *,
 					   struct ospf_header *,
-					   struct ip *, struct prefix *);
+					   struct ip *);
 extern struct ospf_neighbor *ospf_nbr_lookup (struct ospf_interface *,
 					      struct ip *,
 					      struct ospf_header *);
-extern struct ospf_neighbor *ospf_nbr_lookup_by_addr (struct route_table *,
+extern struct ospf_neighbor *ospf_nbr_lookup_by_addr (struct list *,
 						      struct in_addr *);
-extern struct ospf_neighbor *ospf_nbr_lookup_by_routerid (struct route_table
-							  *,
+extern struct ospf_neighbor *ospf_nbr_lookup_by_routerid (struct list *,
 							  struct in_addr *);
 extern void ospf_renegotiate_optional_capabilities (struct ospf *top);
 
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 15fff349..b15efbd6 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -153,8 +153,8 @@ nsm_should_adj (struct ospf_neighbor *nbr)
       || IPV4_ADDR_SAME (&oi->address->u.prefix4, &DR (oi))
       || IPV4_ADDR_SAME (&oi->address->u.prefix4, &BDR (oi))
       /* Neighboring Router is the DRouter or the BDRouter. */
-      || IPV4_ADDR_SAME (&nbr->address.u.prefix4, &DR (oi))
-      || IPV4_ADDR_SAME (&nbr->address.u.prefix4, &BDR (oi)))
+      || IPV4_ADDR_SAME (&nbr->src, &DR (oi))
+      || IPV4_ADDR_SAME (&nbr->src, &BDR (oi)))
     return 1;
 
   return 0;
@@ -393,7 +393,7 @@ nsm_kill_nbr (struct ospf_neighbor *nbr)
 
       if (IS_DEBUG_OSPF (nsm, NSM_EVENTS))
 	zlog_debug ("NSM[%s:%s]: Down (PollIntervalTimer scheduled)",
-		   IF_NAME (nbr->oi), inet_ntoa (nbr->address.u.prefix4));  
+		   IF_NAME (nbr->oi), inet_ntoa (nbr->src));
     }
 
   return 0;
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 0b6ac4cb..826d149f 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -2118,11 +2118,12 @@ out:
  * Followings are control functions to block origination after restart.
  *------------------------------------------------------------------------*/
 
-static void ospf_opaque_exclude_lsa_from_lsreq (struct route_table *nbrs, struct ospf_neighbor *inbr, struct ospf_lsa *lsa);
+static void ospf_opaque_exclude_lsa_from_lsreq (struct list *nbrs,
+		struct ospf_neighbor *inbr, struct ospf_lsa *lsa);
 static void ospf_opaque_type9_lsa_rxmt_nbr_check (struct ospf_interface *oi);
 static void ospf_opaque_type10_lsa_rxmt_nbr_check (struct ospf_area *area);
 static void ospf_opaque_type11_lsa_rxmt_nbr_check (struct ospf *top);
-static unsigned long ospf_opaque_nrxmt_self (struct route_table *nbrs, int lsa_type);
+static unsigned long ospf_opaque_nrxmt_self (struct list *nbrs, int lsa_type);
 
 void
 ospf_opaque_adjust_lsreq (struct ospf_neighbor *nbr, struct list *lsas)
@@ -2199,18 +2200,16 @@ out:
 }
 
 static void
-ospf_opaque_exclude_lsa_from_lsreq (struct route_table *nbrs,
+ospf_opaque_exclude_lsa_from_lsreq (struct list *nbrs,
                                     struct ospf_neighbor *inbr,
                                     struct ospf_lsa *lsa)
 {
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *onbr;
   struct ospf_lsa *ls_req;
 
-  for (rn = route_top (nbrs); rn; rn = route_next (rn))
+  for (ALL_LIST_ELEMENTS_RO (nbrs, node, onbr))
     {
-      if ((onbr = rn->info) == NULL)
-        continue;
       if (onbr == inbr)
         continue;
       if ((ls_req = ospf_ls_request_lookup (onbr, lsa)) == NULL)
@@ -2412,17 +2411,15 @@ out:
 }
 
 static unsigned long
-ospf_opaque_nrxmt_self (struct route_table *nbrs, int lsa_type)
+ospf_opaque_nrxmt_self (struct list *nbrs, int lsa_type)
 {
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *nbr;
   struct ospf *top;
   unsigned long n = 0;
 
-  for (rn = route_top (nbrs); rn; rn = route_next (rn))
+  for (ALL_LIST_ELEMENTS_RO (nbrs, node, nbr))
     {
-      if ((nbr = rn->info) == NULL)
-        continue;
       if ((top = oi_to_top (nbr->oi)) == NULL)
         continue;
       if (IPV4_ADDR_SAME (&nbr->router_id, &top->router_id))
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 78add552..74e1d46f 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -745,7 +745,6 @@ ospf_hello (struct ip *iph, struct ospf_header *ospfh,
   struct ospf_hello *hello;
   struct ospf_neighbor *nbr;
   int old_state;
-  struct prefix p;
 
   /* increment statistics. */
   oi->hello_in++;
@@ -765,20 +764,15 @@ ospf_hello (struct ip *iph, struct ospf_header *ospfh,
       return;
     }
 
-  /* get neighbor prefix. */
-  p.family = AF_INET;
-  p.prefixlen = ip_masklen (hello->network_mask);
-  p.u.prefix4 = iph->ip_src;
-
   /* Compare network mask. */
   /* Checking is ignored for Point-to-Point and Virtual link. */
   if (oi->type != OSPF_IFTYPE_POINTOPOINT 
       && oi->type != OSPF_IFTYPE_VIRTUALLINK)
-    if (oi->address->prefixlen != p.prefixlen)
+    if (oi->address->prefixlen != ip_masklen (hello->network_mask))
       {
 	zlog_warn ("Packet %s [Hello:RECV]: NetworkMask mismatch on %s (configured prefix length is %d, but hello packet indicates %d).",
 		   inet_ntoa(ospfh->router_id), IF_NAME(oi),
-		   (int)oi->address->prefixlen, (int)p.prefixlen);
+		   (int)oi->address->prefixlen, (int)ip_masklen (hello->network_mask));
 	return;
       }
 
@@ -873,7 +867,7 @@ ospf_hello (struct ip *iph, struct ospf_header *ospfh,
       }
   
   /* get neighbour struct */
-  nbr = ospf_nbr_get (oi, ospfh, iph, &p);
+  nbr = ospf_nbr_get (oi, ospfh, iph);
 
   /* neighbour must be valid, ospf_nbr_get creates if none existed */
   assert (nbr);
@@ -902,10 +896,7 @@ ospf_hello (struct ip *iph, struct ospf_header *ospfh,
       (old_state == NSM_Down || old_state == NSM_Attempt))
     {
       OSPF_NSM_EVENT_EXECUTE (nbr, NSM_OneWayReceived);
-      nbr->priority = hello->priority;
-      nbr->d_router = hello->d_router;
-      nbr->bd_router = hello->bd_router;
-      return;
+      goto done;
     }
 
   if (ospf_nbr_bidirectional (&oi->ospf->router_id, hello->neighbors,
@@ -917,42 +908,50 @@ ospf_hello (struct ip *iph, struct ospf_header *ospfh,
   else
     {
       OSPF_NSM_EVENT_EXECUTE (nbr, NSM_OneWayReceived);
-      /* Set neighbor information. */
-      nbr->priority = hello->priority;
-      nbr->d_router = hello->d_router;
-      nbr->bd_router = hello->bd_router;
-      return;
+      goto done;
     }
 
+  /* Neighbor priority check. */
+  if (nbr->priority >= 0 && nbr->priority != hello->priority)
+    OSPF_ISM_EVENT_SCHEDULE (oi, ISM_NeighborChange);
+
   /* If neighbor itself declares DR and no BDR exists,
      cause event BackupSeen */
-  if (IPV4_ADDR_SAME (&nbr->address.u.prefix4, &hello->d_router))
-    if (hello->bd_router.s_addr == 0 && oi->state == ISM_Waiting)
+  if (oi->state == ISM_Waiting &&
+      IPV4_ADDR_SAME (&nbr->src, &hello->d_router) &&
+      hello->bd_router.s_addr == 0)
+    {
       OSPF_ISM_EVENT_SCHEDULE (oi, ISM_BackupSeen);
+      goto done;
+    }
+  /* had not previously. */
+  if ((IPV4_ADDR_SAME (&nbr->src, &hello->d_router) &&
+       IPV4_ADDR_CMP (&nbr->src, &nbr->d_router)) ||
+      (IPV4_ADDR_CMP (&nbr->src, &hello->d_router) &&
+       IPV4_ADDR_SAME (&nbr->src, &nbr->d_router)))
+    {
+      OSPF_ISM_EVENT_SCHEDULE (oi, ISM_NeighborChange);
+      goto done;
+    }
 
   /* neighbor itself declares BDR. */
   if (oi->state == ISM_Waiting &&
-      IPV4_ADDR_SAME (&nbr->address.u.prefix4, &hello->bd_router))
-    OSPF_ISM_EVENT_SCHEDULE (oi, ISM_BackupSeen);
-
-  /* had not previously. */
-  if ((IPV4_ADDR_SAME (&nbr->address.u.prefix4, &hello->d_router) &&
-       IPV4_ADDR_CMP (&nbr->address.u.prefix4, &nbr->d_router)) ||
-      (IPV4_ADDR_CMP (&nbr->address.u.prefix4, &hello->d_router) &&
-       IPV4_ADDR_SAME (&nbr->address.u.prefix4, &nbr->d_router)))
-    OSPF_ISM_EVENT_SCHEDULE (oi, ISM_NeighborChange);
-
+      IPV4_ADDR_SAME (&nbr->src, &hello->bd_router))
+    {
+      OSPF_ISM_EVENT_SCHEDULE (oi, ISM_BackupSeen);
+      goto done;
+    }
   /* had not previously. */
-  if ((IPV4_ADDR_SAME (&nbr->address.u.prefix4, &hello->bd_router) &&
-       IPV4_ADDR_CMP (&nbr->address.u.prefix4, &nbr->bd_router)) ||
-      (IPV4_ADDR_CMP (&nbr->address.u.prefix4, &hello->bd_router) &&
-       IPV4_ADDR_SAME (&nbr->address.u.prefix4, &nbr->bd_router)))
-    OSPF_ISM_EVENT_SCHEDULE (oi, ISM_NeighborChange);
-
-  /* Neighbor priority check. */
-  if (nbr->priority >= 0 && nbr->priority != hello->priority)
-    OSPF_ISM_EVENT_SCHEDULE (oi, ISM_NeighborChange);
+  if ((IPV4_ADDR_SAME (&nbr->src, &hello->bd_router) &&
+       IPV4_ADDR_CMP (&nbr->src, &nbr->bd_router)) ||
+      (IPV4_ADDR_CMP (&nbr->src, &hello->bd_router) &&
+       IPV4_ADDR_SAME (&nbr->src, &nbr->bd_router)))
+    {
+      OSPF_ISM_EVENT_SCHEDULE (oi, ISM_NeighborChange);
+      goto done;
+    }
 
+ done:
   /* Set neighbor information. */
   nbr->priority = hello->priority;
   nbr->d_router = hello->d_router;
@@ -1260,7 +1259,7 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh,
 		       CHECK_FLAG (nbr->options, OSPF_OPTION_O) ? "" : "NOT ");
 
           if (! CHECK_FLAG (nbr->options, OSPF_OPTION_O)
-          &&  IPV4_ADDR_SAME (&DR (oi), &nbr->address.u.prefix4))
+          &&  IPV4_ADDR_SAME (&DR (oi), &nbr->src))
             {
               zlog_warn ("DR-neighbor[%s] is NOT opaque-capable; "
                          "Opaque-LSAs cannot be reliably advertised "
@@ -2620,7 +2619,7 @@ static int
 ospf_make_hello (struct ospf_interface *oi, struct stream *s)
 {
   struct ospf_neighbor *nbr;
-  struct route_node *rn;
+  struct listnode *node;
   u_int16_t length = OSPF_HELLO_MIN_SIZE;
   struct in_addr mask;
   unsigned long p;
@@ -2662,10 +2661,9 @@ ospf_make_hello (struct ospf_interface *oi, struct stream *s)
   stream_put_ipv4 (s, BDR (oi).s_addr);
 
   /* Add neighbor seen. */
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info))
-      if (nbr->router_id.s_addr != 0)	/* Ignore 0.0.0.0 node. */
-	if (nbr->state != NSM_Attempt)  /* Ignore Down neighbor. */
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+    if (nbr->router_id.s_addr != 0)	/* Ignore 0.0.0.0 node. */
+      if (nbr->state != NSM_Attempt)	/* Ignore Down neighbor. */
 	if (nbr->state != NSM_Down)     /* This is myself for DR election. */
 	  if (!IPV4_ADDR_SAME (&nbr->router_id, &oi->ospf->router_id))
 	    {
@@ -3048,7 +3046,7 @@ ospf_hello_reply_timer (struct thread *thread)
     zlog (NULL, LOG_DEBUG, "NSM[%s:%s]: Timer (hello-reply timer expire)",
 	  IF_NAME (nbr->oi), inet_ntoa (nbr->router_id));
 
-  ospf_hello_send_sub (nbr->oi, &nbr->address.u.prefix4);
+  ospf_hello_send_sub (nbr->oi, &nbr->src);
 
   return 0;
 }
@@ -3081,45 +3079,43 @@ ospf_hello_send (struct ospf_interface *oi)
   if (oi->type == OSPF_IFTYPE_NBMA)
     {
       struct ospf_neighbor *nbr;
-      struct route_node *rn;
+      struct listnode *node;
 
-      for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-	if ((nbr = rn->info))
-	  if (nbr != oi->nbr_self)
-	    if (nbr->state != NSM_Down)
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+	if (nbr != oi->nbr_self)
+	  if (nbr->state != NSM_Down)
+	    {
+	      /*  RFC 2328  Section 9.5.1
+		  If the router is not eligible to become Designated Router,
+		  it must periodically send Hello Packets to both the
+		  Designated Router and the Backup Designated Router (if they
+		  exist).  */
+	      if (PRIORITY(oi) == 0 &&
+		  IPV4_ADDR_CMP(&DR(oi),  &nbr->src) &&
+		  IPV4_ADDR_CMP(&BDR(oi), &nbr->src))
+		continue;
+
+	      /*  If the router is eligible to become Designated Router, it
+		  must periodically send Hello Packets to all neighbors that
+		  are also eligible. In addition, if the router is itself the
+		  Designated Router or Backup Designated Router, it must also
+		  send periodic Hello Packets to all other neighbors. */
+
+	      if (nbr->priority == 0 && oi->state == ISM_DROther)
+		continue;
+	      /* if oi->state == Waiting, send hello to all neighbors */
 	      {
-		/*  RFC 2328  Section 9.5.1
-		    If the router is not eligible to become Designated Router,
-		    it must periodically send Hello Packets to both the
-		    Designated Router and the Backup Designated Router (if they
-		    exist).  */
-		if (PRIORITY(oi) == 0 &&
-		    IPV4_ADDR_CMP(&DR(oi),  &nbr->address.u.prefix4) &&
-		    IPV4_ADDR_CMP(&BDR(oi), &nbr->address.u.prefix4))
-		  continue;
-
-		/*  If the router is eligible to become Designated Router, it
-		    must periodically send Hello Packets to all neighbors that
-		    are also eligible. In addition, if the router is itself the
-		    Designated Router or Backup Designated Router, it must also
-		    send periodic Hello Packets to all other neighbors. */
-
-		if (nbr->priority == 0 && oi->state == ISM_DROther)
-		  continue;
-		/* if oi->state == Waiting, send hello to all neighbors */
-		{
-		  struct ospf_packet *op_dup;
+		struct ospf_packet *op_dup;
 
-		  op_dup = ospf_packet_dup(op);
-		  op_dup->dst = nbr->address.u.prefix4;
+		op_dup = ospf_packet_dup(op);
+		op_dup->dst = nbr->src;
 
-		  /* Add packet to the interface output queue. */
-		  ospf_packet_add (oi, op_dup);
-
-		  OSPF_ISM_WRITE_ON (oi->ospf);
-		}
+		/* Add packet to the interface output queue. */
+		ospf_packet_add (oi, op_dup);
 
+		OSPF_ISM_WRITE_ON (oi->ospf);
 	      }
+	    }
       ospf_packet_free (op);
     }
   else
@@ -3165,7 +3161,7 @@ ospf_db_desc_send (struct ospf_neighbor *nbr)
   if (oi->type == OSPF_IFTYPE_POINTOPOINT) 
     op->dst.s_addr = htonl (OSPF_ALLSPFROUTERS);
   else
-    op->dst = nbr->address.u.prefix4;
+    op->dst = nbr->src;
 
   /* Add packet to the interface output queue. */
   ospf_packet_add (oi, op);
@@ -3227,7 +3223,7 @@ ospf_ls_req_send (struct ospf_neighbor *nbr)
   if (oi->type == OSPF_IFTYPE_POINTOPOINT) 
     op->dst.s_addr = htonl (OSPF_ALLSPFROUTERS);
   else
-    op->dst = nbr->address.u.prefix4;
+    op->dst = nbr->src;
 
   /* Add packet to the interface output queue. */
   ospf_packet_add (oi, op);
@@ -3434,7 +3430,7 @@ ospf_ls_upd_send (struct ospf_neighbor *nbr, struct list *update, int flag)
   else if (oi->type == OSPF_IFTYPE_POINTOPOINT) 
      p.prefix.s_addr = htonl (OSPF_ALLSPFROUTERS);
   else if (flag == OSPF_SEND_PACKET_DIRECT)
-     p.prefix = nbr->address.u.prefix4;
+     p.prefix = nbr->src;
   else if (oi->state == ISM_DR || oi->state == ISM_Backup)
      p.prefix.s_addr = htonl (OSPF_ALLSPFROUTERS);
   else if (oi->type == OSPF_IFTYPE_POINTOMULTIPOINT)
@@ -3514,7 +3510,7 @@ ospf_ls_ack_send (struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
   struct ospf_interface *oi = nbr->oi;
 
   if (listcount (oi->ls_ack_direct.ls_ack) == 0)
-    oi->ls_ack_direct.dst = nbr->address.u.prefix4;
+    oi->ls_ack_direct.dst = nbr->src;
   
   listnode_add (oi->ls_ack_direct.ls_ack, ospf_lsa_lock (lsa));
   
@@ -3537,13 +3533,12 @@ ospf_ls_ack_send_delayed (struct ospf_interface *oi)
   if (oi->type == OSPF_IFTYPE_NBMA)
     {
       struct ospf_neighbor *nbr;
-      struct route_node *rn;
+      struct listnode *node;
 
-      for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-	if ((nbr = rn->info) != NULL)
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
 	  if (nbr != oi->nbr_self && nbr->state >= NSM_Exchange)
 	    while (listcount (oi->ls_ack))
-	      ospf_ls_ack_send_list (oi, oi->ls_ack, nbr->address.u.prefix4);
+	      ospf_ls_ack_send_list (oi, oi->ls_ack, nbr->src);
       return;
     }
   if (oi->type == OSPF_IFTYPE_VIRTUALLINK)
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index cc4974ce..84b169f4 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -2105,16 +2105,15 @@ static struct ospf_neighbor *
 ospf_snmp_nbr_lookup (struct ospf *ospf, struct in_addr *nbr_addr,
 		      unsigned int *ifindex)
 {
-  struct listnode *node, *nnode;
+  struct listnode *node, *nnode, *nbrnode;
   struct ospf_interface *oi;
   struct ospf_neighbor *nbr;
   struct route_node *rn;
 
   for (ALL_LIST_ELEMENTS (ospf->oiflist, node, nnode, oi))
     {
-      for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-	if ((nbr = rn->info) != NULL
-	    && nbr != oi->nbr_self
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, nbrnode, nbr))
+	if (nbr != oi->nbr_self
 /* If EXACT match is needed, provide ALL entry found
 	    && nbr->state != NSM_Down
  */
@@ -2134,10 +2133,9 @@ static struct ospf_neighbor *
 ospf_snmp_nbr_lookup_next (struct in_addr *nbr_addr, unsigned int *ifindex,
 			   int first)
 {
-  struct listnode *nn;
+  struct listnode *nn, *nbrnode;
   struct ospf_interface *oi;
   struct ospf_neighbor *nbr;
-  struct route_node *rn;
   struct ospf_neighbor *min = NULL;
   struct ospf *ospf = ospf;
 
@@ -2145,9 +2143,8 @@ ospf_snmp_nbr_lookup_next (struct in_addr *nbr_addr, unsigned int *ifindex,
 
   for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, nn, oi))
     {
-      for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-	if ((nbr = rn->info) != NULL
-	    && nbr != oi->nbr_self
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, nbrnode, nbr))
+	if (nbr != oi->nbr_self
 	    && nbr->state != NSM_Down
 	    && nbr->src.s_addr != 0)
 	  {
@@ -2613,9 +2610,9 @@ ospfTrapNbrStateChange (struct ospf_neighbor *on)
   
   ospf_nbr_state_message(on, msgbuf, sizeof(msgbuf));
   zlog (NULL, LOG_INFO, "ospfTrapNbrStateChange trap sent: %s now %s",
-	inet_ntoa(on->address.u.prefix4), msgbuf);
+	inet_ntoa(on->router_id), msgbuf);
 
-  oid_copy_addr (index, &(on->address.u.prefix4), IN_ADDR_SIZE);
+  oid_copy_addr (index, &(on->router_id), IN_ADDR_SIZE);
   index[IN_ADDR_SIZE] = 0;
 
   smux_trap (ospf_oid, sizeof ospf_oid / sizeof (oid),
@@ -2632,7 +2629,7 @@ ospfTrapVirtNbrStateChange (struct ospf_neighbor *on)
   
   zlog (NULL, LOG_INFO, "ospfTrapVirtNbrStateChange trap sent");
 
-  oid_copy_addr (index, &(on->address.u.prefix4), IN_ADDR_SIZE);
+  oid_copy_addr (index, &(on->router_id), IN_ADDR_SIZE);
   index[IN_ADDR_SIZE] = 0;
 
   smux_trap (ospf_oid, sizeof ospf_oid / sizeof (oid),
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 07e1f32d..be028228 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2911,7 +2911,7 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf,
 	      vty_out (vty, "  Designated Router (ID) %s,",
 		       inet_ntoa (nbr->router_id));
 	      vty_out (vty, " Interface Address %s%s",
-		       inet_ntoa (nbr->address.u.prefix4), VTY_NEWLINE);
+		       inet_ntoa (nbr->src), VTY_NEWLINE);
 	    }
 	}
 
@@ -2930,7 +2930,7 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf,
 	      vty_out (vty, "  Backup Designated Router (ID) %s,",
 		       inet_ntoa (nbr->router_id));
 	      vty_out (vty, " Interface Address %s%s",
-		       inet_ntoa (nbr->address.u.prefix4), VTY_NEWLINE);
+		       inet_ntoa (nbr->src), VTY_NEWLINE);
 	    }
 	}
 
@@ -3024,39 +3024,37 @@ show_ip_ospf_neighbour_header (struct vty *vty)
 static void
 show_ip_ospf_neighbor_sub (struct vty *vty, struct ospf_interface *oi)
 {
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *nbr;
   char msgbuf[16];
   char timebuf[OSPF_TIME_DUMP_SIZE];
 
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info))
-      /* Do not show myself. */
-      if (nbr != oi->nbr_self)
-	/* Down state is not shown. */
-	if (nbr->state != NSM_Down)
-	  {
-	    ospf_nbr_state_message (nbr, msgbuf, 16);
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+    /* Do not show myself. */
+    if (nbr != oi->nbr_self)
+      /* Down state is not shown. */
+      if (nbr->state != NSM_Down)
+	{
+	  ospf_nbr_state_message (nbr, msgbuf, 16);
+	  if (nbr->state == NSM_Attempt && nbr->router_id.s_addr == 0)
+	    vty_out (vty, "%-15s %3d %-15s ",
+		     "-", nbr->priority,
+		     msgbuf);
+	  else
+	    vty_out (vty, "%-15s %3d %-15s ",
+		     inet_ntoa (nbr->router_id), nbr->priority,
+		     msgbuf);
 
-	    if (nbr->state == NSM_Attempt && nbr->router_id.s_addr == 0)
-	      vty_out (vty, "%-15s %3d %-15s ",
-		       "-", nbr->priority,
-		       msgbuf);
-            else
-	      vty_out (vty, "%-15s %3d %-15s ",
-		       inet_ntoa (nbr->router_id), nbr->priority,
-		       msgbuf);
-            
-            vty_out (vty, "%9s ",
-                     ospf_timer_dump (nbr->t_inactivity, timebuf, 
+	  vty_out (vty, "%9s ",
+		   ospf_timer_dump (nbr->t_inactivity, timebuf,
                                       sizeof(timebuf)));
-            
-	    vty_out (vty, "%-15s ", inet_ntoa (nbr->src));
-	    vty_out (vty, "%-20s %5ld %5ld %5d%s",
-		     IF_NAME (oi), ospf_ls_retransmit_count (nbr),
-		     ospf_ls_request_count (nbr), ospf_db_summary_count (nbr),
-		     VTY_NEWLINE);
-	  }
+
+	  vty_out (vty, "%-15s ", inet_ntoa (nbr->src));
+	  vty_out (vty, "%-20s %5ld %5ld %5d%s",
+		   IF_NAME (oi), ospf_ls_retransmit_count (nbr),
+		   ospf_ls_request_count (nbr), ospf_db_summary_count (nbr),
+		   VTY_NEWLINE);
+	}
 }
 
 DEFUN (show_ip_ospf_neighbor,
@@ -3222,7 +3220,7 @@ show_ip_ospf_neighbor_detail_sub (struct vty *vty, struct ospf_interface *oi,
 
   /* Show interface address. */
   vty_out (vty, " interface address %s%s",
-	   inet_ntoa (nbr->address.u.prefix4), VTY_NEWLINE);
+	   inet_ntoa (nbr->src), VTY_NEWLINE);
   /* Show Area ID. */
   vty_out (vty, "    In the area %s via interface %s%s",
 	   ospf_area_desc_string (oi->area), oi->ifp->name, VTY_NEWLINE);
@@ -3343,14 +3341,13 @@ DEFUN (show_ip_ospf_neighbor_detail,
 
   for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi))
     {
-      struct route_node *rn;
+      struct listnode *nnode;
       struct ospf_neighbor *nbr;
 
-      for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-	if ((nbr = rn->info))
-	  if (nbr != oi->nbr_self)
-	    if (nbr->state != NSM_Down)
-	      show_ip_ospf_neighbor_detail_sub (vty, oi, nbr);
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, nnode, nbr))
+	if (nbr != oi->nbr_self)
+	  if (nbr->state != NSM_Down)
+	    show_ip_ospf_neighbor_detail_sub (vty, oi, nbr);
     }
 
   return CMD_SUCCESS;
@@ -3379,15 +3376,14 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
 
   for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi))
     {
-      struct route_node *rn;
+      struct listnode *nnode;
       struct ospf_neighbor *nbr;
       struct ospf_nbr_nbma *nbr_nbma;
 
-      for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-	if ((nbr = rn->info))
-	  if (nbr != oi->nbr_self)
-	    if (oi->type == OSPF_IFTYPE_NBMA && nbr->state != NSM_Down)
-	      show_ip_ospf_neighbor_detail_sub (vty, oi, rn->info);
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, nnode, nbr))
+	if (nbr != oi->nbr_self)
+	  if (oi->type == OSPF_IFTYPE_NBMA && nbr->state != NSM_Down)
+	    show_ip_ospf_neighbor_detail_sub (vty, oi, nbr);
 
       if (oi->type == OSPF_IFTYPE_NBMA)
 	{
@@ -3416,8 +3412,9 @@ DEFUN (show_ip_ospf_neighbor_int_detail,
   struct ospf *ospf;
   struct ospf_interface *oi;
   struct interface *ifp;
-  struct route_node *rn, *nrn;
+  struct route_node *rn;
   struct ospf_neighbor *nbr;
+  struct listnode *node;
 
   ifp = if_lookup_by_name (argv[0]);
   if (!ifp)
@@ -3436,11 +3433,10 @@ DEFUN (show_ip_ospf_neighbor_int_detail,
 
   for (rn = route_top (IF_OIFS (ifp)); rn; rn = route_next (rn))
     if ((oi = rn->info))
-      for (nrn = route_top (oi->nbrs); nrn; nrn = route_next (nrn))
-	if ((nbr = nrn->info))
-	  if (nbr != oi->nbr_self)
-	    if (nbr->state != NSM_Down)
-	      show_ip_ospf_neighbor_detail_sub (vty, oi, nbr);
+      for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+	if (nbr != oi->nbr_self)
+	  if (nbr->state != NSM_Down)
+	    show_ip_ospf_neighbor_detail_sub (vty, oi, nbr);
 
   return CMD_SUCCESS;
 }
@@ -4952,17 +4948,16 @@ ALIAS (no_ip_ospf_cost2,
 static void
 ospf_nbr_timer_update (struct ospf_interface *oi)
 {
-  struct route_node *rn;
+  struct listnode *node;
   struct ospf_neighbor *nbr;
 
-  for (rn = route_top (oi->nbrs); rn; rn = route_next (rn))
-    if ((nbr = rn->info))
-      {
-	nbr->v_inactivity = OSPF_IF_PARAM (oi, v_wait);
-	nbr->v_db_desc = OSPF_IF_PARAM (oi, retransmit_interval);
-	nbr->v_ls_req = OSPF_IF_PARAM (oi, retransmit_interval);
-	nbr->v_ls_upd = OSPF_IF_PARAM (oi, retransmit_interval);
-      }
+  for (ALL_LIST_ELEMENTS_RO (oi->nbrs, node, nbr))
+    {
+      nbr->v_inactivity = OSPF_IF_PARAM (oi, v_wait);
+      nbr->v_db_desc = OSPF_IF_PARAM (oi, retransmit_interval);
+      nbr->v_ls_req = OSPF_IF_PARAM (oi, retransmit_interval);
+      nbr->v_ls_upd = OSPF_IF_PARAM (oi, retransmit_interval);
+    }
 }
 
 static int
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index b11ee1bb..11d1b9d1 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -1409,8 +1409,6 @@ ospf_nbr_nbma_add (struct ospf_nbr_nbma *nbr_nbma,
 		   struct ospf_interface *oi)
 {
   struct ospf_neighbor *nbr;
-  struct route_node *rn;
-  struct prefix p;
 
   if (oi->type != OSPF_IFTYPE_NBMA)
     return;
@@ -1418,37 +1416,27 @@ ospf_nbr_nbma_add (struct ospf_nbr_nbma *nbr_nbma,
   if (nbr_nbma->nbr != NULL)
     return;
 
-  if (IPV4_ADDR_SAME (&oi->nbr_self->address.u.prefix4, &nbr_nbma->addr))
+  if (IPV4_ADDR_SAME (&oi->nbr_self->src, &nbr_nbma->addr))
     return;
       
   nbr_nbma->oi = oi;
   listnode_add (oi->nbr_nbma, nbr_nbma);
 
   /* Get neighbor information from table. */
-  p.family = AF_INET;
-  p.prefixlen = IPV4_MAX_BITLEN;
-  p.u.prefix4 = nbr_nbma->addr;
-
-  rn = route_node_get (oi->nbrs, (struct prefix *)&p);
-  if (rn->info)
+  nbr = ospf_nbr_lookup_by_addr (oi->nbrs, &nbr_nbma->addr);
+  if (nbr)
     {
-      nbr = rn->info;
       nbr->nbr_nbma = nbr_nbma;
       nbr_nbma->nbr = nbr;
-
-      route_unlock_node (rn);
     }
   else
     {
-      nbr = rn->info = ospf_nbr_new (oi);
+      nbr = ospf_nbr_new (oi);
       nbr->state = NSM_Down;
       nbr->src = nbr_nbma->addr;
       nbr->nbr_nbma = nbr_nbma;
       nbr->priority = nbr_nbma->priority;
-      nbr->address = p;
-
       nbr_nbma->nbr = nbr;
-
       OSPF_NSM_EVENT_EXECUTE (nbr, NSM_Start);
     }
 }