Temporary integrated OSPF commit.

1 files changed, 427 insertions, 560 deletions

diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 6756ff49..abcd527a 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -2,6 +2,8 @@
  *	BIRD -- OSPF
  *
  *	(c) 1999--2004 Ondrej Filip <feela@network.cz>
+ *	(c) 2009--2014 Ondrej Zajicek <santiago@crfreenet.org>
+ *	(c) 2009--2014 CZ.NIC z.s.p.o.
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -35,7 +37,7 @@
  * One instance of the protocol is able to hold LSA databases for
  * multiple OSPF areas, to exchange routing information between
  * multiple neighbors and to calculate the routing tables. The core
- * structure is &proto_ospf to which multiple &ospf_area and
+ * structure is &ospf_proto to which multiple &ospf_area and
  * &ospf_iface structures are connected. &ospf_area is also connected to
  * &top_hash_graph which is a dynamic hashing structure that
  * describes the link-state database. It allows fast search, addition
@@ -69,7 +71,7 @@
  * ospf_iface_down()).
  *
  * The heart beat of ospf is ospf_disp(). It is called at regular intervals
- * (&proto_ospf->tick). It is responsible for aging and flushing of LSAs in
+ * (&ospf_proto->tick). It is responsible for aging and flushing of LSAs in
  * the database, for routing table calculaction and it call area_disp() of every
  * ospf_area.
  * 
@@ -102,9 +104,10 @@
 #include <stdlib.h>
 #include "ospf.h"
 
-
-static int ospf_reload_routes(struct proto *p);
-static void ospf_rt_notify(struct proto *p, struct rtable *table UNUSED, net * n, rte * new, rte * old UNUSED, ea_list * attrs);
+static int ospf_import_control(struct proto *P, rte **new, ea_list **attrs, struct linpool *pool);
+static struct ea_list *ospf_make_tmp_attrs(struct rte *rt, struct linpool *pool);
+static void ospf_store_tmp_attrs(struct rte *rt, struct ea_list *attrs);
+static int ospf_reload_routes(struct proto *P);
 static int ospf_rte_better(struct rte *new, struct rte *old);
 static int ospf_rte_same(struct rte *new, struct rte *old);
 static void ospf_disp(timer *timer);
@@ -114,82 +117,78 @@ ospf_area_initfib(struct fib_node *fn)
 {
   struct area_net *an = (struct area_net *) fn;
   an->hidden = 0;
-  an->active = -1;	/* Force to regenerate summary lsa */
-	/* ac->oldactive will be rewritten by ospf_rt_spf() */
+  an->active = 0;
 }
 
 static void
 add_area_nets(struct ospf_area *oa, struct ospf_area_config *ac)
 {
-    struct proto_ospf *po = oa->po;
-    struct area_net_config *anc;
-    struct area_net *an;
+  struct ospf_proto *p = oa->po;
+  struct area_net_config *anc;
+  struct area_net *an;
 
-    fib_init(&oa->net_fib, po->proto.pool, sizeof(struct area_net), 0, ospf_area_initfib);
-    fib_init(&oa->enet_fib, po->proto.pool, sizeof(struct area_net), 0, ospf_area_initfib);
+  fib_init(&oa->net_fib, p->p.pool, sizeof(struct area_net), 0, ospf_area_initfib);
+  fib_init(&oa->enet_fib, p->p.pool, sizeof(struct area_net), 0, ospf_area_initfib);
 
-    WALK_LIST(anc, ac->net_list)
-    {
-      an = (struct area_net *) fib_get(&oa->net_fib, &anc->px.addr, anc->px.len);
-      an->hidden = anc->hidden;
-    }
+  WALK_LIST(anc, ac->net_list)
+  {
+    an = (struct area_net *) fib_get(&oa->net_fib, &anc->px.addr, anc->px.len);
+    an->hidden = anc->hidden;
+  }
 
-    WALK_LIST(anc, ac->enet_list)
-    {
-      an = (struct area_net *) fib_get(&oa->enet_fib, &anc->px.addr, anc->px.len);
-      an->hidden = anc->hidden;
-      an->tag = anc->tag;
-    }
+  WALK_LIST(anc, ac->enet_list)
+  {
+    an = (struct area_net *) fib_get(&oa->enet_fib, &anc->px.addr, anc->px.len);
+    an->hidden = anc->hidden;
+    an->tag = anc->tag;
+  }
 }
 
 static void
-ospf_area_add(struct proto_ospf *po, struct ospf_area_config *ac, int reconf)
+ospf_area_add(struct ospf_proto *p, struct ospf_area_config *ac, int reconf)
 {
-  struct proto *p = &po->proto;
   struct ospf_area *oa;
 
   OSPF_TRACE(D_EVENTS, "Adding area %R", ac->areaid);
 
-  oa = mb_allocz(p->pool, sizeof(struct ospf_area));
-  add_tail(&po->area_list, NODE oa);
-  po->areano++;
+  oa = mb_allocz(p->p.pool, sizeof(struct ospf_area));
+  add_tail(&p->area_list, NODE oa);
+  p->areano++;
 
   oa->ac = ac;
   oa->areaid = ac->areaid;
   oa->rt = NULL;
-  oa->po = po;
-  fib_init(&oa->rtr, p->pool, sizeof(ort), 0, ospf_rt_initort);
+  oa->po = p;
+  fib_init(&oa->rtr, p->p.pool, sizeof(ort), 0, ospf_rt_initort);
   add_area_nets(oa, ac);
 
   if (oa->areaid == 0)
-    po->backbone = oa;
+    p->backbone = oa;
 
-#ifdef OSPFv2
-  oa->options = ac->type;
-#else /* OSPFv3 */
-  oa->options = ac->type | OPT_V6 | (po->stub_router ? 0 : OPT_R);
-#endif
+  if (ospf_is_v2(p))
+    oa->options = ac->type;
+  else
+    oa->options = ac->type | OPT_V6 | (p->stub_router ? 0 : OPT_R);
+}
 
-  /*
-   * Set E-bit for NSSA ABR routers. No need to explicitly call
-   * schedule_rt_lsa() for other areas, will be done anyway.
-   * We use cf->abr because po->areano is not yet complete.
-   */
-  if (oa_is_nssa(oa) && ((struct ospf_config *) (p->cf))->abr)
-    po->ebit = 1;
+static void
+ospf_flush_area(struct ospf_proto *p, u32 areaid)
+{
+  struct top_hash_entry *en;
 
-  if (reconf)
-    ospf_ifaces_reconfigure(oa, ac);
+  WALK_SLIST(en, p->lsal)
+    if ((LSA_SCOPE(en->lsa_type) == LSA_SCOPE_AREA) && (en->domain == areaid))
+      ospf_flush_lsa(p, en);
 }
 
 static void
 ospf_area_remove(struct ospf_area *oa)
 {
-  struct proto *p = &oa->po->proto;
+  struct ospf_proto *p = oa->po;
   OSPF_TRACE(D_EVENTS, "Removing area %R", oa->areaid);
 
   /* We suppose that interfaces are already removed */
-  ospf_flush_area(oa->po, oa->areaid);
+  ospf_flush_area(p, oa->areaid);
  
   fib_free(&oa->rtr);
   fib_free(&oa->net_fib);
@@ -198,87 +197,88 @@ ospf_area_remove(struct ospf_area *oa)
   if (oa->translator_timer)
     rfree(oa->translator_timer);
 
-  oa->po->areano--;
+  p->areano--;
   rem_node(NODE oa);
   mb_free(oa);
 }
 
 
 struct ospf_area *
-ospf_find_area(struct proto_ospf *po, u32 aid)
+ospf_find_area(struct ospf_proto *p, u32 aid)
 {
   struct ospf_area *oa;
-  WALK_LIST(oa, po->area_list)
+  WALK_LIST(oa, p->area_list)
     if (((struct ospf_area *) oa)->areaid == aid)
       return oa;
   return NULL;
 }
 
 static struct ospf_iface *
-ospf_find_vlink(struct proto_ospf *po, u32 voa, u32 vid)
+ospf_find_vlink(struct ospf_proto *p, u32 voa, u32 vid)
 {
   struct ospf_iface *ifa;
-  WALK_LIST(ifa, po->iface_list) 
+  WALK_LIST(ifa, p->iface_list) 
     if ((ifa->type == OSPF_IT_VLINK) && (ifa->voa->areaid == voa) && (ifa->vid == vid))
       return ifa;
   return NULL;
 }
 
 static int
-ospf_start(struct proto *p)
+ospf_start(struct proto *P)
 {
-  struct proto_ospf *po = (struct proto_ospf *) p;
-  struct ospf_config *c = (struct ospf_config *) (p->cf);
+  struct ospf_proto *p = (struct ospf_proto *) P;
+  struct ospf_config *c = (struct ospf_config *) (P->cf);
   struct ospf_area_config *ac;
 
-  po->router_id = proto_get_router_id(p->cf);
-  po->rfc1583 = c->rfc1583;
-  po->stub_router = c->stub_router;
-  po->merge_external = c->merge_external;
-  po->ebit = 0;
-  po->ecmp = c->ecmp;
-  po->tick = c->tick;
-  po->disp_timer = tm_new(p->pool);
-  po->disp_timer->data = po;
-  po->disp_timer->randomize = 0;
-  po->disp_timer->hook = ospf_disp;
-  po->disp_timer->recurrent = po->tick;
-  tm_start(po->disp_timer, 1);
-  po->lsab_size = 256;
-  po->lsab_used = 0;
-  po->lsab = mb_alloc(p->pool, po->lsab_size);
-  po->nhpool = lp_new(p->pool, 12*sizeof(struct mpnh));
-  init_list(&(po->iface_list));
-  init_list(&(po->area_list));
-  fib_init(&po->rtf, p->pool, sizeof(ort), 0, ospf_rt_initort);
-  po->areano = 0;
-  po->gr = ospf_top_new(p->pool);
-  s_init_list(&(po->lsal));
+  p->router_id = proto_get_router_id(P->cf);
+  p->ospf2 = c->ospf2;
+  p->rfc1583 = c->rfc1583;
+  p->stub_router = c->stub_router;
+  p->merge_external = c->merge_external;
+  p->asbr = c->asbr;
+  p->ecmp = c->ecmp;
+  p->tick = c->tick;
+  p->disp_timer = tm_new(P->pool);
+  p->disp_timer->data = p;
+  p->disp_timer->randomize = 0;
+  p->disp_timer->hook = ospf_disp;
+  p->disp_timer->recurrent = p->tick;
+  tm_start(p->disp_timer, 1);
+  p->lsab_size = 256;
+  p->lsab_used = 0;
+  p->lsab = mb_alloc(P->pool, p->lsab_size);
+  p->nhpool = lp_new(P->pool, 12*sizeof(struct mpnh));
+  init_list(&(p->iface_list));
+  init_list(&(p->area_list));
+  fib_init(&p->rtf, P->pool, sizeof(ort), 0, ospf_rt_initort);
+  p->areano = 0;
+  p->gr = ospf_top_new(P->pool);
+  s_init_list(&(p->lsal));
 
   WALK_LIST(ac, c->area_list)
-    ospf_area_add(po, ac, 0);
+    ospf_area_add(p, ac, 0);
 
   if (c->abr)
-    ospf_open_vlink_sk(po);
+    ospf_open_vlink_sk(p);
 
   /* Add all virtual links */
   struct ospf_iface_patt *ic;
   WALK_LIST(ic, c->vlink_list)
-    ospf_iface_new_vlink(po, ic);
+    ospf_iface_new_vlink(p, ic);
 
   return PS_UP;
 }
 
 static void
-ospf_dump(struct proto *p)
+ospf_dump(struct proto *P)
 {
+  struct ospf_proto *p = (struct ospf_proto *) P;
   struct ospf_iface *ifa;
   struct ospf_neighbor *n;
-  struct proto_ospf *po = (struct proto_ospf *) p;
 
-  OSPF_TRACE(D_EVENTS, "Area number: %d", po->areano);
+  OSPF_TRACE(D_EVENTS, "Area number: %d", p->areano);
 
-  WALK_LIST(ifa, po->iface_list)
+  WALK_LIST(ifa, p->iface_list)
   {
     OSPF_TRACE(D_EVENTS, "Interface: %s", ifa->ifname);
     OSPF_TRACE(D_EVENTS, "state: %u", ifa->state);
@@ -292,7 +292,7 @@ ospf_dump(struct proto *p)
 
   /*
   OSPF_TRACE(D_EVENTS, "LSA graph dump start:");
-  ospf_top_dump(po->gr, p);
+  ospf_top_dump(p->gr, p);
   OSPF_TRACE(D_EVENTS, "LSA graph dump finished");
   */
   neigh_dump_all();
@@ -301,20 +301,21 @@ ospf_dump(struct proto *p)
 static struct proto *
 ospf_init(struct proto_config *c)
 {
-  struct proto *p = proto_new(c, sizeof(struct proto_ospf));
-
-  p->accept_ra_types = RA_OPTIMAL;
-  p->rt_notify = ospf_rt_notify;
-  p->if_notify = ospf_if_notify;
-  p->ifa_notify = ospf_ifa_notify;
-  p->import_control = ospf_import_control;
-  p->reload_routes = ospf_reload_routes;
-  p->make_tmp_attrs = ospf_make_tmp_attrs;
-  p->store_tmp_attrs = ospf_store_tmp_attrs;
-  p->rte_better = ospf_rte_better;
-  p->rte_same = ospf_rte_same;
-
-  return p;
+  struct ospf_config *oc = (struct ospf_config *) c;  
+  struct proto *P = proto_new(c, sizeof(struct ospf_proto));
+
+  P->accept_ra_types = RA_OPTIMAL;
+  P->rt_notify = ospf_rt_notify;
+  P->if_notify = ospf_if_notify;
+  P->ifa_notify = oc->ospf2 ? ospf_ifa_notify2 : ospf_ifa_notify3;
+  P->import_control = ospf_import_control;
+  P->reload_routes = ospf_reload_routes;
+  P->make_tmp_attrs = ospf_make_tmp_attrs;
+  P->store_tmp_attrs = ospf_store_tmp_attrs;
+  P->rte_better = ospf_rte_better;
+  P->rte_same = ospf_rte_same;
+
+  return P;
 }
 
 /* If new is better return 1 */
@@ -379,116 +380,53 @@ ospf_build_attrs(ea_list * next, struct linpool *pool, u32 m1, u32 m2,
   return l;
 }
 
-void
-schedule_net_lsa(struct ospf_iface *ifa)
-{
-  struct proto *p = &ifa->oa->po->proto;
-
-  OSPF_TRACE(D_EVENTS, "Scheduling network-LSA origination for iface %s", ifa->ifname);
-  ifa->orignet = 1;
-}
-
-#ifdef OSPFv3
-void
-schedule_link_lsa(struct ospf_iface *ifa)
-{
-  struct proto *p = &ifa->oa->po->proto;
-
-  OSPF_TRACE(D_EVENTS, "Scheduling link-LSA origination for iface %s", ifa->ifname);
-  ifa->origlink = 1;
-}
-#endif
-
-void
-schedule_rt_lsa(struct ospf_area *oa)
-{
-  struct proto *p = &oa->po->proto;
-
-  OSPF_TRACE(D_EVENTS, "Scheduling router-LSA origination for area %R", oa->areaid);
-  oa->origrt = 1;
-}
 
 void
-schedule_rtcalc(struct proto_ospf *po)
+schedule_rtcalc(struct ospf_proto *p)
 {
-  struct proto *p = &po->proto;
-
-  if (po->calcrt)
+  if (p->calcrt)
     return;
 
   OSPF_TRACE(D_EVENTS, "Scheduling routing table calculation");
-  po->calcrt = 1;
+  p->calcrt = 1;
 }
 
 static int
-ospf_reload_routes(struct proto *p)
+ospf_reload_routes(struct proto *P)
 {
-  struct proto_ospf *po = (struct proto_ospf *) p;
+  struct ospf_proto *p = (struct ospf_proto *) P;
 
-  if (po->calcrt != 2)
+  if (p->calcrt != 2)
     OSPF_TRACE(D_EVENTS, "Scheduling routing table calculation with route reload");
 
-  po->calcrt = 2;
+  p->calcrt = 2;
 
   return 1;
 }
 
-/**
- * area_disp - invokes origination of
- * router LSA and routing table cleanup
- * @oa: ospf area
- *
- * It invokes aging and when @ospf_area->origrt is set to 1, start
- * function for origination of router, network LSAs.
- */
-void
-area_disp(struct ospf_area *oa)
-{
-  struct proto_ospf *po = oa->po;
-  struct ospf_iface *ifa;
-
-  /* Now try to originage rt_lsa */
-  if (oa->origrt)
-    update_rt_lsa(oa);
-
-  /* Now try to originate network LSA's */
-  WALK_LIST(ifa, po->iface_list)
-  {
-#ifdef OSPFv3
-    /* Link LSA should be originated before Network LSA */
-    if (ifa->origlink && (ifa->oa == oa))
-      update_link_lsa(ifa);
-#endif
-
-    if (ifa->orignet && (ifa->oa == oa))
-      update_net_lsa(ifa);
-  }
-}
 
 /**
  * ospf_disp - invokes routing table calculation, aging and also area_disp()
- * @timer: timer usually called every @proto_ospf->tick second, @timer->data
- * point to @proto_ospf
+ * @timer: timer usually called every @ospf_proto->tick second, @timer->data
+ * point to @ospf_proto
  */
-void
+static void
 ospf_disp(timer * timer)
 {
-  struct proto_ospf *po = timer->data;
-  struct ospf_area *oa;
+  struct ospf_proto *p = timer->data;
 
-  WALK_LIST(oa, po->area_list)
-    area_disp(oa);
+  /* Originate or flush local topology LSAs */
+  ospf_update_topology(p);
 
   /* Age LSA DB */
-  ospf_age(po);
+  ospf_update_lsadb(p);
 
   /* Calculate routing table */
-  if (po->calcrt)
-    ospf_rt_spf(po);
+  if (p->calcrt)
+    ospf_rt_spf(p);
 }
 
 
-
 /**
  * ospf_import_control - accept or reject new route from nest's routing table
  * @p: current instance of protocol
@@ -499,15 +437,14 @@ ospf_disp(timer * timer)
  * Its quite simple. It does not accept our own routes and leaves the decision on
  * import to the filters.
  */
-
-int
-ospf_import_control(struct proto *p, rte ** new, ea_list ** attrs,
-		    struct linpool *pool)
+static int
+ospf_import_control(struct proto *P, rte **new, ea_list **attrs, struct linpool *pool)
 {
-  struct ospf_area *oa = ospf_main_area((struct proto_ospf *) p);
+  struct ospf_proto *p = (struct ospf_proto *) P;
+  struct ospf_area *oa = ospf_main_area(p);
   rte *e = *new;
 
-  if (e->attrs->src->proto == p)
+  if (e->attrs->src->proto == P)
     return -1;			/* Reject our own routes */
 
   if (oa_is_stub(oa))
@@ -520,14 +457,14 @@ ospf_import_control(struct proto *p, rte ** new, ea_list ** attrs,
   return 0;			/* Leave decision to the filters */
 }
 
-struct ea_list *
+static struct ea_list *
 ospf_make_tmp_attrs(struct rte *rt, struct linpool *pool)
 {
   return ospf_build_attrs(NULL, pool, rt->u.ospf.metric1, rt->u.ospf.metric2,
 			  rt->u.ospf.tag, rt->u.ospf.router_id);
 }
 
-void
+static void
 ospf_store_tmp_attrs(struct rte *rt, struct ea_list *attrs)
 {
   rt->u.ospf.metric1 = ea_get_int(attrs, EA_OSPF_METRIC1, LSINFINITY);
@@ -545,20 +482,20 @@ ospf_store_tmp_attrs(struct rte *rt, struct ea_list *attrs)
  * them hello packet with empty neighbor list. They should start
  * their neighbor state machine with event %NEIGHBOR_1WAY.
  */
-
 static int
-ospf_shutdown(struct proto *p)
+ospf_shutdown(struct proto *P)
 {
-  struct proto_ospf *po = (struct proto_ospf *) p;
+  struct ospf_proto *p = (struct ospf_proto *) P;
   struct ospf_iface *ifa;
+
   OSPF_TRACE(D_EVENTS, "Shutdown requested");
 
   /* And send to all my neighbors 1WAY */
-  WALK_LIST(ifa, po->iface_list)
+  WALK_LIST(ifa, p->iface_list)
     ospf_iface_shutdown(ifa);
 
   /* Cleanup locked rta entries */
-  FIB_WALK(&po->rtf, nftmp)
+  FIB_WALK(&p->rtf, nftmp)
   {
     rta_free(((ort *) nftmp)->old_rta);
   }
@@ -568,49 +505,11 @@ ospf_shutdown(struct proto *p)
 }
 
 static void
-ospf_rt_notify(struct proto *p, rtable *tbl UNUSED, net * n, rte * new, rte * old UNUSED, ea_list * attrs)
+ospf_get_status(struct proto *P, byte * buf)
 {
-  struct proto_ospf *po = (struct proto_ospf *) p;
-  struct ospf_area *oa = ospf_main_area(po);
-  ort *nf = (ort *) fib_get(&po->rtf, &n->n.prefix, n->n.pxlen);
-  struct fib_node *fn = &nf->fn;
-
-  if (!new)
-  {
-    if (fn->x1 != EXT_EXPORT)
-      return;
-
-    flush_ext_lsa(oa, fn, oa_is_nssa(oa));
-
-    /* Old external route might blocked some NSSA translation */
-    if (po->areano > 1)
-      schedule_rtcalc(po);
-
-    return;
-  }
-
-  /* Get route attributes */
-  u32 m1 = ea_get_int(attrs, EA_OSPF_METRIC1, LSINFINITY);
-  u32 m2 = ea_get_int(attrs, EA_OSPF_METRIC2, 10000);
-  u32 metric = (m1 != LSINFINITY) ? m1 : (m2 | LSA_EXT_EBIT);
-  u32 tag = ea_get_int(attrs, EA_OSPF_TAG, 0);
-  ip_addr gw = IPA_NONE;
-  // FIXME check for gw should be per ifa, not per iface
-  if ((new->attrs->dest == RTD_ROUTER) &&
-      ipa_nonzero(new->attrs->gw) &&
-      !ipa_has_link_scope(new->attrs->gw) &&
-      (ospf_iface_find((struct proto_ospf *) p, new->attrs->iface) != NULL))
-    gw = new->attrs->gw;
-
-  originate_ext_lsa(oa, fn, EXT_EXPORT, metric, gw, tag, 1);
-}
+  struct ospf_proto *p = (struct ospf_proto *) P;
 
-static void
-ospf_get_status(struct proto *p, byte * buf)
-{
-  struct proto_ospf *po = (struct proto_ospf *) p;
-
-  if (p->proto_state == PS_DOWN)
+  if (p->p.proto_state == PS_DOWN)
     buf[0] = 0;
   else
   {
@@ -618,7 +517,7 @@ ospf_get_status(struct proto *p, byte * buf)
     struct ospf_neighbor *n;
     int adj = 0;
 
-    WALK_LIST(ifa, po->iface_list)
+    WALK_LIST(ifa, p->iface_list)
       WALK_LIST(n, ifa->neigh_list) if (n->state == NEIGHBOR_FULL)
       adj = 1;
 
@@ -636,18 +535,18 @@ ospf_get_route_info(rte * rte, byte * buf, ea_list * attrs UNUSED)
 
   switch (rte->attrs->source)
   {
-    case RTS_OSPF:
-      type = "I";
-      break;
-    case RTS_OSPF_IA:
-      type = "IA";
-      break;
-    case RTS_OSPF_EXT1:
-      type = "E1";
-      break;
-    case RTS_OSPF_EXT2:
-      type = "E2";
-      break;
+  case RTS_OSPF:
+    type = "I";
+    break;
+  case RTS_OSPF_IA:
+    type = "IA";
+    break;
+  case RTS_OSPF_EXT1:
+    type = "E1";
+    break;
+  case RTS_OSPF_EXT2:
+    type = "E2";
+    break;
   }
 
   buf += bsprintf(buf, " %s", type);
@@ -688,18 +587,24 @@ ospf_get_attr(eattr * a, byte * buf, int buflen UNUSED)
 static void
 ospf_area_reconfigure(struct ospf_area *oa, struct ospf_area_config *nac)
 {
+  struct ospf_proto *p = oa->po;
+  struct ospf_area_config *oac = oa->ac;
+  struct ospf_iface *ifa;
+
   oa->ac = nac;
 
-  // FIXME better area type reconfiguration
-#ifdef OSPFv2
-  oa->options = nac->type;
-#else /* OSPFv3 */
-  oa->options = nac->type | OPT_V6 | (oa->po->stub_router ? 0 : OPT_R);
-#endif
-  if (oa_is_nssa(oa) && (oa->po->areano > 1))
-    oa->po->ebit = 1;
+  if (ospf_is_v2(p))
+    oa->options = nac->type;
+  else
+    oa->options = nac->type | OPT_V6 | (p->stub_router ? 0 : OPT_R);
 
-  ospf_ifaces_reconfigure(oa, nac);
+  if (nac->type != oac->type)
+  {
+    /* Force restart of area interfaces */
+    WALK_LIST(ifa, p->iface_list)
+      if (ifa->oa == oa)
+	ifa->marked = 2;
+  }
 
   /* Handle net_list */
   fib_free(&oa->net_fib);
@@ -709,7 +614,7 @@ ospf_area_reconfigure(struct ospf_area *oa, struct ospf_area_config *nac)
   /* No need to handle stubnet_list */
 
   oa->marked = 0;
-  schedule_rt_lsa(oa);
+  ospf_notify_rt_lsa(oa);
 }
 
 /**
@@ -723,95 +628,99 @@ ospf_area_reconfigure(struct ospf_area *oa, struct ospf_area_config *nac)
  * nonbroadcast network, cost of interface, etc.
  */
 static int
-ospf_reconfigure(struct proto *p, struct proto_config *c)
+ospf_reconfigure(struct proto *P, struct proto_config *c)
 {
-  struct proto_ospf *po = (struct proto_ospf *) p;
-  struct ospf_config *old = (struct ospf_config *) (p->cf);
+  struct ospf_proto *p = (struct ospf_proto *) P;
+  struct ospf_config *old = (struct ospf_config *) (P->cf);
   struct ospf_config *new = (struct ospf_config *) c;
   struct ospf_area_config *nac;
   struct ospf_area *oa, *oax;
   struct ospf_iface *ifa, *ifx;
   struct ospf_iface_patt *ip;
 
-  if (proto_get_router_id(c) != po->router_id)
+  if (proto_get_router_id(c) != p->router_id)
     return 0;
 
-  if (po->rfc1583 != new->rfc1583)
+  if (p->rfc1583 != new->rfc1583)
     return 0;
 
   if (old->abr != new->abr)
     return 0;
 
-  po->stub_router = new->stub_router;
-  po->merge_external = new->merge_external;
-  po->ecmp = new->ecmp;
-  po->tick = new->tick;
-  po->disp_timer->recurrent = po->tick;
-  tm_start(po->disp_timer, 1);
+  p->stub_router = new->stub_router;
+  p->merge_external = new->merge_external;
+  p->asbr = new->asbr;
+  p->ecmp = new->ecmp;
+  p->tick = new->tick;
+  p->disp_timer->recurrent = p->tick;
+  tm_start(p->disp_timer, 1);
 
   /* Mark all areas and ifaces */
-  WALK_LIST(oa, po->area_list)
+  WALK_LIST(oa, p->area_list)
     oa->marked = 1;
 
-  WALK_LIST(ifa, po->iface_list)
+  WALK_LIST(ifa, p->iface_list)
     ifa->marked = 1;
 
   /* Add and update areas */
   WALK_LIST(nac, new->area_list)
   {
-    oa = ospf_find_area(po, nac->areaid);
+    oa = ospf_find_area(p, nac->areaid);
     if (oa)
       ospf_area_reconfigure(oa, nac);
     else
-      ospf_area_add(po, nac, 1);
+      ospf_area_add(p, nac, 1);
   }
 
+  /* Add and update interfaces */
+  ospf_reconfigure_ifaces(p);
+
   /* Add and update vlinks */
   WALK_LIST(ip, new->vlink_list)
   {
-    ifa = ospf_find_vlink(po, ip->voa, ip->vid);
+    ifa = ospf_find_vlink(p, ip->voa, ip->vid);
     if (ifa)
       ospf_iface_reconfigure(ifa, ip);
     else
-      ospf_iface_new_vlink(po, ip);
+      ospf_iface_new_vlink(p, ip);
   }
 
   /* Delete remaining ifaces and areas */
-  WALK_LIST_DELSAFE(ifa, ifx, po->iface_list)
+  WALK_LIST_DELSAFE(ifa, ifx, p->iface_list)
     if (ifa->marked)
     {
       ospf_iface_shutdown(ifa);
       ospf_iface_remove(ifa);
     }
 
-  WALK_LIST_DELSAFE(oa, oax, po->area_list)
+  WALK_LIST_DELSAFE(oa, oax, p->area_list)
     if (oa->marked)
       ospf_area_remove(oa);
 
-  schedule_rtcalc(po);
+  schedule_rtcalc(p);
   
   return 1;
 }
 
 
 void
-ospf_sh_neigh(struct proto *p, char *iff)
+ospf_sh_neigh(struct proto *P, char *iff)
 {
+  struct ospf_proto *p = (struct ospf_proto *) P;
   struct ospf_iface *ifa = NULL;
   struct ospf_neighbor *n;
-  struct proto_ospf *po = (struct proto_ospf *) p;
 
-  if (p->proto_state != PS_UP)
+  if (p->p.proto_state != PS_UP)
   {
-    cli_msg(-1013, "%s: is not up", p->name);
+    cli_msg(-1013, "%s: is not up", p->p.name);
     cli_msg(0, "");
     return;
   }
 
-  cli_msg(-1013, "%s:", p->name);
+  cli_msg(-1013, "%s:", p->p.name);
   cli_msg(-1013, "%-12s\t%3s\t%-15s\t%-5s\t%-10s %-12s", "Router ID", "Pri",
 	  "     State", "DTime", "Interface", "Router IP");
-  WALK_LIST(ifa, po->iface_list)
+  WALK_LIST(ifa, p->iface_list)
     if ((iff == NULL) || patmatch(iff, ifa->ifname))
       WALK_LIST(n, ifa->neigh_list)
 	ospf_sh_neigh_info(n);
@@ -819,37 +728,37 @@ ospf_sh_neigh(struct proto *p, char *iff)
 }
 
 void
-ospf_sh(struct proto *p)
+ospf_sh(struct proto *P)
 {
+  struct ospf_proto *p = (struct ospf_proto *) P;
   struct ospf_area *oa;
-  struct proto_ospf *po = (struct proto_ospf *) p;
   struct ospf_iface *ifa;
   struct ospf_neighbor *n;
   int ifano, nno, adjno, firstfib;
   struct area_net *anet;
 
-  if (p->proto_state != PS_UP)
+  if (p->p.proto_state != PS_UP)
   {
-    cli_msg(-1014, "%s: is not up", p->name);
+    cli_msg(-1014, "%s: is not up", p->p.name);
     cli_msg(0, "");
     return;
   }
 
-  cli_msg(-1014, "%s:", p->name);
-  cli_msg(-1014, "RFC1583 compatibility: %s", (po->rfc1583 ? "enable" : "disabled"));
-  cli_msg(-1014, "Stub router: %s", (po->stub_router ? "Yes" : "No"));
-  cli_msg(-1014, "RT scheduler tick: %d", po->tick);
-  cli_msg(-1014, "Number of areas: %u", po->areano);
-  cli_msg(-1014, "Number of LSAs in DB:\t%u", po->gr->hash_entries);
+  cli_msg(-1014, "%s:", p->p.name);
+  cli_msg(-1014, "RFC1583 compatibility: %s", (p->rfc1583 ? "enable" : "disabled"));
+  cli_msg(-1014, "Stub router: %s", (p->stub_router ? "Yes" : "No"));
+  cli_msg(-1014, "RT scheduler tick: %d", p->tick);
+  cli_msg(-1014, "Number of areas: %u", p->areano);
+  cli_msg(-1014, "Number of LSAs in DB:\t%u", p->gr->hash_entries);
 
-  WALK_LIST(oa, po->area_list)
+  WALK_LIST(oa, p->area_list)
   {
     cli_msg(-1014, "\tArea: %R (%u) %s", oa->areaid, oa->areaid,
 	    oa->areaid == 0 ? "[BACKBONE]" : "");
     ifano = 0;
     nno = 0;
     adjno = 0;
-    WALK_LIST(ifa, po->iface_list)
+    WALK_LIST(ifa, p->iface_list)
     {
       if (oa == ifa->oa)
       {
@@ -907,20 +816,20 @@ ospf_sh(struct proto *p)
 }
 
 void
-ospf_sh_iface(struct proto *p, char *iff)
+ospf_sh_iface(struct proto *P, char *iff)
 {
-  struct proto_ospf *po = (struct proto_ospf *) p;
+  struct ospf_proto *p = (struct ospf_proto *) P;
   struct ospf_iface *ifa = NULL;
 
-  if (p->proto_state != PS_UP)
+  if (p->p.proto_state != PS_UP)
   {
-    cli_msg(-1015, "%s: is not up", p->name);
+    cli_msg(-1015, "%s: is not up", p->p.name);
     cli_msg(0, "");
     return;
   }
 
-  cli_msg(-1015, "%s:", p->name);
-  WALK_LIST(ifa, po->iface_list)
+  cli_msg(-1015, "%s:", p->p.name);
+  WALK_LIST(ifa, p->iface_list)
     if ((iff == NULL) || patmatch(iff, ifa->ifname))
       ospf_iface_info(ifa);
   cli_msg(0, "");
@@ -939,14 +848,12 @@ ospf_sh_iface(struct proto *p, char *iff)
  * values
  */
 
-#ifdef OSPFv3
-
 static struct ospf_lsa_header *
 fake_lsa_from_prefix_lsa(struct ospf_lsa_header *dst, struct ospf_lsa_header *src,
 			 struct ospf_lsa_prefix *px)
 {
   dst->age = src->age;
-  dst->type = px->ref_type;
+  dst->type_raw = px->ref_type;
   dst->id = px->ref_id;
   dst->rt = px->ref_rt;
   dst->sn = src->sn;
@@ -954,49 +861,59 @@ fake_lsa_from_prefix_lsa(struct ospf_lsa_header *dst, struct ospf_lsa_header *sr
   return dst;
 }
 
-#endif
+
+static int lsa_compare_ospf3;
 
 static int
 lsa_compare_for_state(const void *p1, const void *p2)
 {
-  struct top_hash_entry * he1 = * (struct top_hash_entry **) p1;
-  struct top_hash_entry * he2 = * (struct top_hash_entry **) p2;
+  struct top_hash_entry *he1 = * (struct top_hash_entry **) p1;
+  struct top_hash_entry *he2 = * (struct top_hash_entry **) p2;
   struct ospf_lsa_header *lsa1 = &(he1->lsa);
   struct ospf_lsa_header *lsa2 = &(he2->lsa);
+  struct ospf_lsa_header lsatmp1, lsatmp2;
+  u16 lsa1_type = he1->lsa_type;
+  u16 lsa2_type = he2->lsa_type;
 
   if (he1->domain < he2->domain)
     return -1;
   if (he1->domain > he2->domain)
     return 1;
 
-#ifdef OSPFv3
-  struct ospf_lsa_header lsatmp1, lsatmp2;
 
-  int px1 = (lsa1->type == LSA_T_PREFIX);
-  int px2 = (lsa2->type == LSA_T_PREFIX);
+  /* px1 or px2 assumes OSPFv3 */
+  int px1 = (lsa1_type == LSA_T_PREFIX);
+  int px2 = (lsa2_type == LSA_T_PREFIX);
 
   if (px1)
+  {
     lsa1 = fake_lsa_from_prefix_lsa(&lsatmp1, lsa1, he1->lsa_body);
+    lsa1_type = lsa1->type_raw;	/* FIXME: handle unknown ref_type */
+  }
 
   if (px2)
+  {
     lsa2 = fake_lsa_from_prefix_lsa(&lsatmp2, lsa2, he2->lsa_body);
-#endif
+    lsa2_type = lsa2->type_raw;
+  }
+
 
-  int nt1 = (lsa1->type == LSA_T_NET);
-  int nt2 = (lsa2->type == LSA_T_NET);
+  int nt1 = (lsa1_type == LSA_T_NET);
+  int nt2 = (lsa2_type == LSA_T_NET);
 
   if (nt1 != nt2)
     return nt1 - nt2;
 
   if (nt1)
   {
-#ifdef OSPFv3
-    /* In OSPFv3, neworks are named base on ID of DR */
-    if (lsa1->rt < lsa2->rt)
-      return -1;
-    if (lsa1->rt > lsa2->rt)
-      return 1;
-#endif
+    /* In OSPFv3, networks are named based on ID of DR */
+    if (lsa_compare_ospf3)
+    {
+      if (lsa1->rt < lsa2->rt)
+	return -1;
+      if (lsa1->rt > lsa2->rt)
+	return 1;
+    }
 
     /* For OSPFv2, this is IP of the network,
        for OSPFv3, this is interface ID */
@@ -1005,10 +922,8 @@ lsa_compare_for_state(const void *p1, const void *p2)
     if (lsa1->id > lsa2->id)
       return 1;
 
-#ifdef OSPFv3
     if (px1 != px2)
       return px1 - px2;
-#endif
 
     return lsa1->sn - lsa2->sn;
   }
@@ -1019,9 +934,9 @@ lsa_compare_for_state(const void *p1, const void *p2)
     if (lsa1->rt > lsa2->rt)
       return 1;
 
-    if (lsa1->type < lsa2->type)
+    if (lsa1_type < lsa2_type)
       return -1;
-    if (lsa1->type > lsa2->type)
+    if (lsa1_type > lsa2_type)
       return 1;
 
     if (lsa1->id < lsa2->id)
@@ -1029,10 +944,8 @@ lsa_compare_for_state(const void *p1, const void *p2)
     if (lsa1->id > lsa2->id)
       return 1;
 
-#ifdef OSPFv3
     if (px1 != px2)
       return px1 - px2;
-#endif
   
     return lsa1->sn - lsa2->sn;
   }
@@ -1069,79 +982,77 @@ show_lsa_distance(struct top_hash_entry *he)
 }
 
 static inline void
-show_lsa_router(struct proto_ospf *po, struct top_hash_entry *he, int first, int verbose)
+show_lsa_router(struct ospf_proto *p, struct top_hash_entry *he, int verbose)
 {
-  struct ospf_lsa_header *lsa = &(he->lsa);
-  struct ospf_lsa_rt *rt = he->lsa_body;
-  struct ospf_lsa_rt_link *rr = (struct ospf_lsa_rt_link *) (rt + 1);
-  int max = lsa_rt_count(lsa);
-  int i;
-
-  if (first)
-  {
-    cli_msg(-1016, "");
-    cli_msg(-1016, "\trouter %R", he->lsa.rt);
-    show_lsa_distance(he);
-  }
+  struct ospf_lsa_rt_walk rtl;
 
+  cli_msg(-1016, "");
+  cli_msg(-1016, "\trouter %R", he->lsa.rt);
+  show_lsa_distance(he);
 
-  for (i = 0; i < max; i++)
-    if (rr[i].type == LSART_VLNK)
-      cli_msg(-1016, "\t\tvlink %R metric %u", rr[i].id, rr[i].metric);
+  lsa_walk_rt_init(p, he, &rtl);
+  while (lsa_walk_rt(&rtl))
+    if (rtl.type == LSART_VLNK)
+      cli_msg(-1016, "\t\tvlink %R metric %u", rtl.id, rtl.metric);
 
-  for (i = 0; i < max; i++)
-    if (rr[i].type == LSART_PTP)
-      cli_msg(-1016, "\t\trouter %R metric %u", rr[i].id, rr[i].metric);
+  lsa_walk_rt_init(p, he, &rtl);
+  while (lsa_walk_rt(&rtl))
+    if (rtl.type == LSART_PTP)
+      cli_msg(-1016, "\t\trouter %R metric %u", rtl.id, rtl.metric);
 
-  for (i = 0; i < max; i++)
-    if (rr[i].type == LSART_NET)
+  lsa_walk_rt_init(p, he, &rtl);
+  while (lsa_walk_rt(&rtl))
+    if (rtl.type == LSART_NET)
     {
-#ifdef OSPFv2
-      struct top_hash_entry *net_he = ospf_hash_find_net(po->gr, he->domain, rr[i].id);
-
-      if (net_he)
+      if (ospf_is_v2(p))
       {
-	struct ospf_lsa_header *net_lsa = &(net_he->lsa);
-	struct ospf_lsa_net *net_ln = net_he->lsa_body;
+	/* In OSPFv2, we try to find network-LSA to get prefix/pxlen */
+	struct top_hash_entry *net_he = ospf_hash_find_net2(p->gr, he->domain, rtl.id);
 
-	cli_msg(-1016, "\t\tnetwork %I/%d metric %u", 
-		ipa_and(ipa_from_u32(net_lsa->id), net_ln->netmask),
-		ipa_mklen(net_ln->netmask), rr[i].metric);
+	if (net_he)
+	{
+	  struct ospf_lsa_header *net_lsa = &(net_he->lsa);
+	  struct ospf_lsa_net *net_ln = net_he->lsa_body;
+
+	  cli_msg(-1016, "\t\tnetwork %I/%d metric %u", 
+		  ipa_from_u32(net_lsa->id & net_ln->optx),
+		  u32_masklen(net_ln->optx), rtl.metric);
+	}
+	else
+	  cli_msg(-1016, "\t\tnetwork [%R] metric %u", rtl.id, rtl.metric);
       }
       else
-	cli_msg(-1016, "\t\tnetwork [%R] metric %u", rr[i].id, rr[i].metric);
-
-#else /* OSPFv3 */
-      cli_msg(-1016, "\t\tnetwork [%R-%u] metric %u", rr[i].id, rr[i].nif, rr[i].metric);
-#endif
+	cli_msg(-1016, "\t\tnetwork [%R-%u] metric %u", rtl.id, rtl.nif, rtl.metric);
     }
 
-#ifdef OSPFv2
-  if (!verbose)
-    return;
-
-  for (i = 0; i < max; i++)
-    if (rr[i].type == LSART_STUB)
-      cli_msg(-1016, "\t\tstubnet %I/%d metric %u", ipa_from_u32(rr[i].id),
-	      ipa_mklen(ipa_from_u32(rr[i].data)), rr[i].metric);
-#endif
+  if (ospf_is_v2(p) && verbose)
+  {
+    lsa_walk_rt_init(p, he, &rtl);
+    while (lsa_walk_rt(&rtl))
+      if (rtl.type == LSART_STUB)
+	cli_msg(-1016, "\t\tstubnet %I/%d metric %u",
+		ipa_from_u32(rtl.id), u32_masklen(rtl.data), rtl.metric);
+  }
 }
 
 static inline void
-show_lsa_network(struct top_hash_entry *he)
+show_lsa_network(struct top_hash_entry *he, int ospf2)
 {
   struct ospf_lsa_header *lsa = &(he->lsa);
   struct ospf_lsa_net *ln = he->lsa_body;
   u32 i;
 
-#ifdef OSPFv2
-  cli_msg(-1016, "");
-  cli_msg(-1016, "\tnetwork %I/%d", ipa_and(ipa_from_u32(lsa->id), ln->netmask), ipa_mklen(ln->netmask));
-  cli_msg(-1016, "\t\tdr %R", lsa->rt);
-#else /* OSPFv3 */
-  cli_msg(-1016, "");
-  cli_msg(-1016, "\tnetwork [%R-%u]", lsa->rt, lsa->id);
-#endif
+  if (ospf2)
+  {
+    cli_msg(-1016, "");
+    cli_msg(-1016, "\tnetwork %I/%d", ipa_from_u32(lsa->id & ln->optx), u32_masklen(ln->optx));
+    cli_msg(-1016, "\t\tdr %R", lsa->rt);
+  }
+  else
+  {
+    cli_msg(-1016, "");
+    cli_msg(-1016, "\tnetwork [%R-%u]", lsa->rt, lsa->id);
+  }
 
   show_lsa_distance(he);
 
@@ -1150,97 +1061,54 @@ show_lsa_network(struct top_hash_entry *he)
 }
 
 static inline void
-show_lsa_sum_net(struct top_hash_entry *he)
+show_lsa_sum_net(struct top_hash_entry *he, int ospf2)
 {
   ip_addr ip;
   int pxlen;
-
-#ifdef OSPFv2
-  struct ospf_lsa_sum *ls = he->lsa_body;
-  pxlen = ipa_mklen(ls->netmask);
-  ip = ipa_and(ipa_from_u32(he->lsa.id), ls->netmask);
-#else /* OSPFv3 */
   u8 pxopts;
-  u16 rest;
-  struct ospf_lsa_sum_net *ls = he->lsa_body;
-  lsa_get_ipv6_prefix(ls->prefix, &ip, &pxlen, &pxopts, &rest);
-#endif
+  u32 metric;
 
-  cli_msg(-1016, "\t\txnetwork %I/%d metric %u", ip, pxlen, ls->metric);
+  lsa_parse_sum_net(he, ospf2, &ip, &pxlen, &pxopts, &metric);
+  cli_msg(-1016, "\t\txnetwork %I/%d metric %u", ip, pxlen, metric);
 }
 
 static inline void
-show_lsa_sum_rt(struct top_hash_entry *he)
+show_lsa_sum_rt(struct top_hash_entry *he, int ospf2)
 {
+  u32 metric;
   u32 dst_rid;
+  u32 options;
 
-#ifdef OSPFv2
-  struct ospf_lsa_sum *ls = he->lsa_body;
-  dst_rid = he->lsa.id;
-  // options = 0;
-#else /* OSPFv3 */
-  struct ospf_lsa_sum_rt *ls = he->lsa_body;
-  dst_rid = ls->drid; 
-  // options = ls->options & OPTIONS_MASK;
-#endif
-
-  cli_msg(-1016, "\t\txrouter %R metric %u", dst_rid, ls->metric);
+  lsa_parse_sum_rt(he, ospf2, &dst_rid, &metric, &options);
+  cli_msg(-1016, "\t\txrouter %R metric %u", dst_rid, metric);
 }
 
 
 static inline void
-show_lsa_external(struct top_hash_entry *he)
+show_lsa_external(struct top_hash_entry *he, int ospf2)
 {
-  struct ospf_lsa_ext *ext = he->lsa_body;
+  struct ospf_lsa_ext_local rt;
   char str_via[STD_ADDRESS_P_LENGTH + 8] = "";
   char str_tag[16] = "";
-  ip_addr ip, rt_fwaddr;
-  int pxlen, ebit, rt_fwaddr_valid;
-  u32 rt_tag, rt_metric;
 
-  if (he->lsa.type == LSA_T_EXT)
+  if (he->lsa_type == LSA_T_EXT)
     he->domain = 0; /* Unmark the LSA */
 
-  rt_metric = ext->metric & METRIC_MASK;
-  ebit = ext->metric & LSA_EXT_EBIT;
-#ifdef OSPFv2
-  ip = ipa_and(ipa_from_u32(he->lsa.id), ext->netmask);
-  pxlen = ipa_mklen(ext->netmask);
-  rt_fwaddr = ext->fwaddr;
-  rt_fwaddr_valid = !ipa_equal(rt_fwaddr, IPA_NONE);
-  rt_tag = ext->tag;
-#else /* OSPFv3 */
-  u8 pxopts;
-  u16 rest;
-  u32 *buf = ext->rest;
-  buf = lsa_get_ipv6_prefix(buf, &ip, &pxlen, &pxopts, &rest);
-
-  rt_fwaddr_valid = ext->metric & LSA_EXT_FBIT;
-  if (rt_fwaddr_valid)
-    buf = lsa_get_ipv6_addr(buf, &rt_fwaddr);
-  else 
-    rt_fwaddr = IPA_NONE;
-
-  if (ext->metric & LSA_EXT_TBIT)
-    rt_tag = *buf++;
-  else
-    rt_tag = 0;
-#endif
+  lsa_parse_ext(he, ospf2, &rt);
   
-  if (rt_fwaddr_valid)
-    bsprintf(str_via, " via %I", rt_fwaddr);
+  if (rt.fbit)
+    bsprintf(str_via, " via %I", rt.fwaddr);
 
-  if (rt_tag)
-    bsprintf(str_tag, " tag %08x", rt_tag);
+  if (rt.tag)
+    bsprintf(str_tag, " tag %08x", rt.tag);
 
   cli_msg(-1016, "\t\t%s %I/%d metric%s %u%s%s",
-	  (he->lsa.type == LSA_T_NSSA) ? "nssa-ext" : "external",
-	  ip, pxlen, ebit ? "2" : "", rt_metric, str_via, str_tag);
+	  (he->lsa_type == LSA_T_NSSA) ? "nssa-ext" : "external",
+	  rt.ip, rt.pxlen, rt.ebit ? "2" : "", rt.metric, str_via, str_tag);
 }
 
-#ifdef OSPFv3
 static inline void
-show_lsa_prefix(struct top_hash_entry *he, struct ospf_lsa_header *cnode)
+show_lsa_prefix(struct top_hash_entry *he, struct top_hash_entry *cnode)
 {
   struct ospf_lsa_prefix *px = he->lsa_body;
   ip_addr pxa;
@@ -1251,13 +1119,13 @@ show_lsa_prefix(struct top_hash_entry *he, struct ospf_lsa_header *cnode)
   int i;
 
   /* We check whether given prefix-LSA is related to the current node */
-  if ((px->ref_type != cnode->type) || (px->ref_rt != cnode->rt))
+  if ((px->ref_type != cnode->lsa.type_raw) || (px->ref_rt != cnode->lsa.rt))
     return;
 
   if ((px->ref_type == LSA_T_RT) && (px->ref_id != 0))
     return;
 
-  if ((px->ref_type == LSA_T_NET) && (px->ref_id != cnode->id))
+  if ((px->ref_type == LSA_T_NET) && (px->ref_id != cnode->lsa.id))
     return;
 
   buf = px->rest;
@@ -1271,19 +1139,18 @@ show_lsa_prefix(struct top_hash_entry *he, struct ospf_lsa_header *cnode)
 	cli_msg(-1016, "\t\taddress %I/%d", pxa, pxlen);
     }
 }
-#endif
 
 void
-ospf_sh_state(struct proto *p, int verbose, int reachable)
+ospf_sh_state(struct proto *P, int verbose, int reachable)
 {
-  struct proto_ospf *po = (struct proto_ospf *) p;
-  struct ospf_lsa_header *cnode = NULL;
-  unsigned int i, ix, j1, j2, jx;
+  struct ospf_proto *p = (struct ospf_proto *) P;
+  int ospf2 = ospf_is_v2(p);
+  uint i, ix, j1, jx;
   u32 last_area = 0xFFFFFFFF;
 
-  if (p->proto_state != PS_UP)
+  if (p->p.proto_state != PS_UP)
   {
-    cli_msg(-1016, "%s: is not up", p->name);
+    cli_msg(-1016, "%s: is not up", p->p.name);
     cli_msg(0, "");
     return;
   }
@@ -1291,51 +1158,51 @@ ospf_sh_state(struct proto *p, int verbose, int reachable)
   /* We store interesting area-scoped LSAs in array hea and 
      global-scoped (LSA_T_EXT) LSAs in array hex */
 
-  int num = po->gr->hash_entries;
+  int num = p->gr->hash_entries;
   struct top_hash_entry *hea[num];
   struct top_hash_entry *hex[verbose ? num : 0];
   struct top_hash_entry *he;
+  struct top_hash_entry *cnode = NULL;
 
-  j1 = j2 = jx = 0;
-  WALK_SLIST(he, po->lsal)
+  j1 = jx = 0;
+  WALK_SLIST(he, p->lsal)
   {
     int accept;
 
-    switch (he->lsa.type)
-      {
-      case LSA_T_RT:
-      case LSA_T_NET:
-	accept = 1;
-	break;
+    if (he->lsa.age == LSA_MAXAGE)
+      continue;
 
-      case LSA_T_SUM_NET:
-      case LSA_T_SUM_RT:
-      case LSA_T_NSSA:
-#ifdef OSPFv3
-      case LSA_T_PREFIX:
-#endif
-	accept = verbose;
-	break;
+    switch (he->lsa_type)
+    {
+    case LSA_T_RT:
+    case LSA_T_NET:
+      accept = 1;
+      break;
 
-      case LSA_T_EXT:
-	if (verbose)
-	{
-	  he->domain = 1; /* Abuse domain field to mark the LSA */
-	  hex[jx++] = he;
-	}
-      default:
-	accept = 0;
+    case LSA_T_SUM_NET:
+    case LSA_T_SUM_RT:
+    case LSA_T_NSSA:
+    case LSA_T_PREFIX:
+      accept = verbose;
+      break;
+
+    case LSA_T_EXT:
+      if (verbose)
+      {
+	he->domain = 1; /* Abuse domain field to mark the LSA */
+	hex[jx++] = he;
       }
+    default:
+      accept = 0;
+    }
 
     if (accept)
       hea[j1++] = he;
-    else
-      j2++;
   }
 
-  if ((j1 + j2) != num)
-    die("Fatal mismatch");
+  ASSERT(j1 <= num && jx <= num);
 
+  lsa_compare_ospf3 = !ospf2;
   qsort(hea, j1, sizeof(struct top_hash_entry *), lsa_compare_for_state);
   qsort(hex, jx, sizeof(struct top_hash_entry *), ext_compare_for_state);
 
@@ -1366,10 +1233,10 @@ ospf_sh_state(struct proto *p, int verbose, int reachable)
     /* If there is no opened node, we open the LSA (if appropriate) or skip to the next one */
     if (!cnode)
     {
-      if (((he->lsa.type == LSA_T_RT) || (he->lsa.type == LSA_T_NET))
+      if (((he->lsa_type == LSA_T_RT) || (he->lsa_type == LSA_T_NET))
 	  && ((he->color == INSPF) || !reachable))
       {
-	cnode = &(he->lsa);
+	cnode = he;
 
 	if (he->domain != last_area)
 	{
@@ -1383,51 +1250,50 @@ ospf_sh_state(struct proto *p, int verbose, int reachable)
 	continue;
     }
 
-    ASSERT(cnode && (he->domain == last_area) && (he->lsa.rt == cnode->rt));
+    ASSERT(cnode && (he->domain == last_area) && (he->lsa.rt == cnode->lsa.rt));
 
-    switch (he->lsa.type)
+    switch (he->lsa_type)
     {
-      case LSA_T_RT:
-	show_lsa_router(po, he, he->lsa.id == cnode->id, verbose);
-	break;
+    case LSA_T_RT:
+      if (he->lsa.id == cnode->lsa.id)
+	show_lsa_router(p, he, verbose);
+      break;
 
-      case LSA_T_NET:
-	show_lsa_network(he);
-	break;
+    case LSA_T_NET:
+      show_lsa_network(he, ospf2);
+      break;
 
-      case LSA_T_SUM_NET:
-	if (cnode->type == LSA_T_RT)
-	  show_lsa_sum_net(he);
-	break;
+    case LSA_T_SUM_NET:
+      if (cnode->lsa_type == LSA_T_RT)
+	show_lsa_sum_net(he, ospf2);
+      break;
 
-      case LSA_T_SUM_RT:
-	if (cnode->type == LSA_T_RT)
-	  show_lsa_sum_rt(he);
-	break;
+    case LSA_T_SUM_RT:
+      if (cnode->lsa_type == LSA_T_RT)
+	show_lsa_sum_rt(he, ospf2);
+      break;
 
-#ifdef OSPFv3
-      case LSA_T_PREFIX:
-	show_lsa_prefix(he, cnode);
-	break;
-#endif
+    case LSA_T_EXT:
+    case LSA_T_NSSA:
+      show_lsa_external(he, ospf2);
+      break;
 
-      case LSA_T_EXT:
-      case LSA_T_NSSA:
-	show_lsa_external(he);
-	break;
+    case LSA_T_PREFIX:
+      show_lsa_prefix(he, cnode);
+      break;
     }
 
     /* In these cases, we close the current node */
     if ((i+1 == j1)
 	|| (hea[i+1]->domain != last_area)
-	|| (hea[i+1]->lsa.rt != cnode->rt)
-	|| (hea[i+1]->lsa.type == LSA_T_NET))
+	|| (hea[i+1]->lsa.rt != cnode->lsa.rt)
+	|| (hea[i+1]->lsa_type == LSA_T_NET))
     {
-      while ((ix < jx) && (hex[ix]->lsa.rt < cnode->rt))
+      while ((ix < jx) && (hex[ix]->lsa.rt < cnode->lsa.rt))
 	ix++;
 
-      while ((ix < jx) && (hex[ix]->lsa.rt == cnode->rt))
-	show_lsa_external(hex[ix++]);
+      while ((ix < jx) && (hex[ix]->lsa.rt == cnode->lsa.rt))
+	show_lsa_external(hex[ix++], ospf2);
 
       cnode = NULL;
     }
@@ -1461,7 +1327,7 @@ ospf_sh_state(struct proto *p, int verbose, int reachable)
 	last_rt = he->lsa.rt;
       }
 
-      show_lsa_external(he);
+      show_lsa_external(he, ospf2);
     }
   }
 
@@ -1476,8 +1342,8 @@ lsa_compare_for_lsadb(const void *p1, const void *p2)
   struct top_hash_entry * he2 = * (struct top_hash_entry **) p2;
   struct ospf_lsa_header *lsa1 = &(he1->lsa);
   struct ospf_lsa_header *lsa2 = &(he2->lsa);
-  int sc1 = LSA_SCOPE(lsa1);
-  int sc2 = LSA_SCOPE(lsa2);
+  int sc1 = LSA_SCOPE(he1->lsa_type);
+  int sc2 = LSA_SCOPE(he2->lsa_type);
 
   if (sc1 != sc2)
     return sc2 - sc1;
@@ -1491,8 +1357,8 @@ lsa_compare_for_lsadb(const void *p1, const void *p2)
   if (lsa1->id != lsa2->id)
     return lsa1->id - lsa2->id;
 
-  if (lsa1->type != lsa2->type)
-    return lsa1->type - lsa2->type;
+  if (he1->lsa_type != he2->lsa_type)
+    return he1->lsa_type - he2->lsa_type;
 
   return lsa1->sn - lsa2->sn;
 }
@@ -1500,48 +1366,50 @@ lsa_compare_for_lsadb(const void *p1, const void *p2)
 void
 ospf_sh_lsadb(struct lsadb_show_data *ld)
 {
-  struct proto *p = proto_get_named(ld->name, &proto_ospf);
-  struct proto_ospf *po = (struct proto_ospf *) p;
-  int num = po->gr->hash_entries;
+  struct ospf_proto *p = (struct ospf_proto *) proto_get_named(ld->name, &proto_ospf);
+  int num = p->gr->hash_entries;
   unsigned int i, j;
   int last_dscope = -1;
   u32 last_domain = 0;
+  u16 type_mask = ospf_is_v2(p) ?  0x00ff : 0xffff;	/* see lsa_etype() */
 
-  if (p->proto_state != PS_UP)
+  if (p->p.proto_state != PS_UP)
   {
-    cli_msg(-1017, "%s: is not up", p->name);
+    cli_msg(-1017, "%s: is not up", p->p.name);
     cli_msg(0, "");
     return;
   }
 
   if (ld->router == SH_ROUTER_SELF)
-    ld->router = po->router_id;
+    ld->router = p->router_id;
 
   struct top_hash_entry *hea[num];
   struct top_hash_entry *he;
 
   j = 0;
-  WALK_SLIST(he, po->lsal)
-    hea[j++] = he;
+  WALK_SLIST(he, p->lsal)
+    if (he->lsa_body)
+      hea[j++] = he;
 
-  if (j != num)
-    die("Fatal mismatch");
+  ASSERT(j <= num);
 
   qsort(hea, j, sizeof(struct top_hash_entry *), lsa_compare_for_lsadb);
 
   for (i = 0; i < j; i++)
   {
     struct ospf_lsa_header *lsa = &(hea[i]->lsa);
-    int dscope = LSA_SCOPE(lsa);
-
+    u16 lsa_type = lsa->type_raw & type_mask;
+    u16 dscope = LSA_SCOPE(hea[i]->lsa_type);
+    
+    /* Hack: 1 is used for LSA_SCOPE_LINK, fixed by & 0xf000 */
     if (ld->scope && (dscope != (ld->scope & 0xf000)))
       continue;
 
     if ((ld->scope == LSA_SCOPE_AREA) && (hea[i]->domain != ld->area))
       continue;
 
-    /* Ignore high nibble */
-    if (ld->type && ((lsa->type & 0x0fff) != (ld->type & 0x0fff)))
+    /* For user convenience ignore high nibble */
+    if (ld->type && ((lsa_type & 0x0fff) != (ld->type & 0x0fff)))
       continue;
 
     if (ld->lsid && (lsa->id != ld->lsid))
@@ -1555,20 +1423,20 @@ ospf_sh_lsadb(struct lsadb_show_data *ld)
       cli_msg(-1017, "");
       switch (dscope)
       {
-	case LSA_SCOPE_AS:
-	  cli_msg(-1017, "Global");
-	  break;
-	case LSA_SCOPE_AREA:
-	  cli_msg(-1017, "Area %R", hea[i]->domain);
-	  break;
-#ifdef OSPFv3
-	case LSA_SCOPE_LINK:
-	  {
-	    struct iface *ifa = if_find_by_index(hea[i]->domain);
-	    cli_msg(-1017, "Link %s", (ifa != NULL) ? ifa->name : "?");
-	  }
-	  break;
-#endif
+      case LSA_SCOPE_AS:
+	cli_msg(-1017, "Global");
+	break;
+
+      case LSA_SCOPE_AREA:
+	cli_msg(-1017, "Area %R", hea[i]->domain);
+	break;
+
+      case LSA_SCOPE_LINK:
+	{
+	  struct iface *ifa = if_find_by_index(hea[i]->domain);
+	  cli_msg(-1017, "Link %s", (ifa != NULL) ? ifa->name : "?");
+	}
+	break;
       }
       cli_msg(-1017, "");
       cli_msg(-1017," Type   LS ID           Router           Age  Sequence  Checksum");
@@ -1577,26 +1445,25 @@ ospf_sh_lsadb(struct lsadb_show_data *ld)
       last_domain = hea[i]->domain;
     }
 
-
     cli_msg(-1017," %04x  %-15R %-15R %5u  %08x    %04x",
-	    lsa->type, lsa->id, lsa->rt, lsa->age, lsa->sn, lsa->checksum);
+	    lsa_type, lsa->id, lsa->rt, lsa->age, lsa->sn, lsa->checksum);
   }
   cli_msg(0, "");
 }
 
 
 struct protocol proto_ospf = {
-  name:			"OSPF",
-  template:		"ospf%d",
-  attr_class:		EAP_OSPF,
-  preference:		DEF_PREF_OSPF,
-  init:			ospf_init,
-  dump:			ospf_dump,
-  start:		ospf_start,
-  shutdown:		ospf_shutdown,
-  reconfigure:		ospf_reconfigure,
-  get_status:		ospf_get_status,
-  get_attr:		ospf_get_attr,
-  get_route_info:	ospf_get_route_info
-  // show_proto_info:	ospf_sh
+  .name =		"OSPF",
+  .template =		"ospf%d",
+  .attr_class =		EAP_OSPF,
+  .preference =		DEF_PREF_OSPF,
+  .init =		ospf_init,
+  .dump =		ospf_dump,
+  .start =		ospf_start,
+  .shutdown =		ospf_shutdown,
+  .reconfigure =	ospf_reconfigure,
+  .get_status =		ospf_get_status,
+  .get_attr =		ospf_get_attr,
+  .get_route_info =	ospf_get_route_info
 };
+