Commit adaa289c authored by Ondrej Zajicek's avatar Ondrej Zajicek
Browse files

Removes usage of x0, x1 fields from OSPF. 

The patch is based on one from Alexander V. Chernikov.
parent c90fc30e

proto/ospf/ospf.c

+2 −2
Original line number Diff line number Diff line
@@ -572,10 +572,10 @@ ospf_rt_notify(struct proto *p, rtable *tbl UNUSED, net * n, rte * new, rte * ol 


  if (!new)

  {

    if (fn->x1 != EXT_EXPORT)

    if (! (fn->flags & OSPF_RT_EXPORT))

      return;



    flush_ext_lsa(oa, fn);

    flush_ext_lsa(oa, fn, 1);



    /* Old external route might blocked some NSSA translation */

    if (po->areano > 1)

proto/ospf/rt.c

+15 −15
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ospf_rt_initort(struct fib_node *fn) 
  ort *ri = (ort *) fn;

  reset_ri(ri);

  ri->old_rta = NULL;

  ri->fn.x0 = ri->fn.x1 = 0;

  ri->fn.flags = 0;

}



static inline int
@@ -938,7 +938,7 @@ check_sum_net_lsa(struct proto_ospf *po, ort *nf) 
  struct ospf_area *anet_oa = NULL;



  /* RT entry marked as area network */

  if (nf->fn.x0)

  if (nf->fn.flags & OSPF_RT_PERSISTENT)

  {

    /* It is a default route for stub areas, handled entirely in ospf_rt_abr() */

    if (nf->fn.pxlen == 0)
@@ -989,7 +989,7 @@ decide_nssa_lsa(ort *nf, u32 *rt_metric, ip_addr *rt_fwaddr, u32 *rt_tag) 
    return 0;



  /* Condensed area network found */ 

  if (fib_route(&oa->enet_fib, nf->fn.prefix, nf->fn.pxlen))

  if (fib_route(&oa->enet_fib, &nf->fn.prefix, nf->fn.pxlen))

    return 0;



  if (!en || (en->lsa.type != LSA_T_NSSA))
@@ -1042,11 +1042,11 @@ check_nssa_lsa(struct proto_ospf *po, ort *nf) 
  ip_addr rt_fwaddr;



  /* Do not translate LSA if there is already the external LSA from route export */

  if (fn->x1 == EXT_EXPORT)

  if (fn->flags & OSPF_RT_EXPORT)

    return;



  /* RT entry marked as area network */

  if (fn->x0)

  if (fn->flags & OSPF_RT_PERSISTENT)

  {

    /* Find that area network */

    WALK_LIST(oa, po->area_list)
@@ -1065,8 +1065,8 @@ check_nssa_lsa(struct proto_ospf *po, ort *nf) 
  else if (decide_nssa_lsa(nf, &rt_metric, &rt_fwaddr, &rt_tag))

    originate_ext_lsa(po->backbone, fn, EXT_NSSA, rt_metric, rt_fwaddr, rt_tag, 0);



  else if (fn->x1 == EXT_NSSA)

    flush_ext_lsa(po->backbone, fn);

  else if (fn->flags & OSPF_RT_NSSA)

    flush_ext_lsa(po->backbone, fn, 1);

}



/* RFC 2328 16.7. p2 - find new/lost vlink endpoints */
@@ -1149,7 +1149,7 @@ ospf_rt_abr1(struct proto_ospf *po) 


	  /* Get a RT entry and mark it to know that it is an area network */

	  ort *nfi = (ort *) fib_get(&po->rtf, &anet->fn.prefix, anet->fn.pxlen);

	  nfi->fn.x0 = 1; /* mark and keep persistent, to have stable UID */

	  nfi->fn.flags |= OSPF_RT_PERSISTENT; /* mark persistent, to have stable UID */



	  /* 16.2. (3) */

	  if (nfi->n.type == RTS_OSPF_IA)
@@ -1165,7 +1165,7 @@ ospf_rt_abr1(struct proto_ospf *po) 


  ip_addr addr = IPA_NONE;

  default_nf = (ort *) fib_get(&po->rtf, &addr, 0);

  default_nf->fn.x0 = 1; /* keep persistent */

  default_nf->fn.flags |= OSPF_RT_PERSISTENT; /* keep persistent */



  struct ospf_area *oa;

  WALK_LIST(oa, po->area_list)
@@ -1189,7 +1189,7 @@ ospf_rt_abr1(struct proto_ospf *po) 
    if (oa_is_nssa(oa) && oa->ac->default_nssa)

      originate_ext_lsa(oa, &default_nf->fn, 0, oa->ac->default_cost, IPA_NONE, 0, 0);

    else

      flush_ext_lsa(oa, &default_nf->fn);

      flush_ext_lsa(oa, &default_nf->fn, 0);





    /* RFC 2328 16.4. (3) - precompute preferred ASBR entries */
@@ -1301,7 +1301,7 @@ ospf_rt_abr2(struct proto_ospf *po) 
    if (rt_is_nssa(nf) && (nf->n.options & ORTA_PROP))

    {

      struct area_net *anet = (struct area_net *)

	fib_route(&nf->n.oa->enet_fib, nf->fn.prefix, nf->fn.pxlen);

	fib_route(&nf->n.oa->enet_fib, &nf->fn.prefix, nf->fn.pxlen);



      if (anet)

      {
@@ -1311,7 +1311,7 @@ ospf_rt_abr2(struct proto_ospf *po) 


	  /* Get a RT entry and mark it to know that it is an area network */

	  nf2 = (ort *) fib_get(&po->rtf, &anet->fn.prefix, anet->fn.pxlen);

	  nf2->fn.x0 = 1;

	  nf2->fn.flags |= OSPF_RT_PERSISTENT; /* keep persistent */

	}



	u32 metric = (nf->n.type == RTS_OSPF_EXT1) ?
@@ -1545,7 +1545,7 @@ ospf_rt_reset(struct proto_ospf *po) 
  FIB_WALK(&po->rtf, nftmp)

  {

    ri = (ort *) nftmp;

    ri->fn.x0 = 0;

    ri->fn.flags &= ~OSPF_RT_PERSISTENT;

    reset_ri(ri);

  }

  FIB_WALK_END;
@@ -2041,8 +2041,8 @@ again1: 
      rte_update(p->table, ne, p, p, NULL);

    }



    /* Remove unused rt entry. Entries with fn.x0 == 1 are persistent. */

    if (!nf->n.type && !nf->fn.x0 && !nf->fn.x1)

    /* Remove unused rt entry. Entries with any flags are persistent. */

    if (!nf->n.type && !nf->fn.flags)

    {

      FIB_ITERATE_PUT(&fit, nftmp);

      fib_delete(fib, nftmp);

proto/ospf/rt.h

+15 −6
Original line number Diff line number Diff line
@@ -50,16 +50,25 @@ typedef struct orta 
}

orta;





/* Values for fn.flags in struct ort */

#define OSPF_RT_PERSISTENT	0x01

#define OSPF_RT_EXPORT		0x02

#define OSPF_RT_NSSA		0x04

#define OSPF_RT_SRC		(0x02 | 0x04)



typedef struct ort

{

  /*

   * We use fn.x0 to mark persistent rt entries, that are needed for summary

   * LSAs that don't have 'proper' rt entry (area networks + default to stubs)

   * to keep uid stable (used for LSA ID in OSPFv3 - see fibnode_to_lsaid()).

   * We use OSPF_RT_PERSISTENT to mark persistent rt entries, that are

   * needed for summary LSAs that don't have 'proper' rt entry (area

   * networks + default to stubs) to keep uid stable (used for LSA ID

   * in OSPFv3 - see fibnode_to_lsaid()).

   *

   * We use fn.x1 to note whether the external route was originated

   * from the route export (in ospf_rt_notify()) or from the NSSA

   * route translation (in check_nssa_lsa()).

   * We use ORT_RT_EXPORT and ORT_RT_NSSA to note whether the

   * external/NSSA route was originated from the route export (in

   * ospf_rt_notify()) or from the NSSA route translation (in

   * check_nssa_lsa()).

   *

   * old_* values are here to represent the last route update. old_rta

   * is cached (we keep reference), mainly for multipath nexthops.

proto/ospf/topology.c

+9 −4
Original line number Diff line number Diff line
@@ -1115,7 +1115,10 @@ originate_ext_lsa(struct ospf_area *oa, struct fib_node *fn, int src, 
  lsasum_calculate(&lsa, body);



  if (src)

    fn->x1 = src;

  {

    fn->flags &= ~OSPF_RT_SRC;    

    fn->flags |= src;

  }



  en = lsa_install_new(po, &lsa, dom, body);

  ospf_lsupd_flood(po, NULL, NULL, &lsa, dom, 1);
@@ -1131,7 +1134,7 @@ originate_ext_lsa(struct ospf_area *oa, struct fib_node *fn, int src, 
}



void

flush_ext_lsa(struct ospf_area *oa, struct fib_node *fn)

flush_ext_lsa(struct ospf_area *oa, struct fib_node *fn, int src)

{

  struct proto_ospf *po = oa->po;

  struct proto *p = &po->proto;
@@ -1154,7 +1157,9 @@ flush_ext_lsa(struct ospf_area *oa, struct fib_node *fn) 
	  return;

	}



      fn->x1 = 0;

      /* Clean up source bits */

      if (src)

	fn->flags &= ~OSPF_RT_SRC;

      ospf_lsupd_flush_nlsa(po, en);

    }

}

proto/ospf/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ void originate_sum_net_lsa(struct ospf_area *oa, struct fib_node *fn, int metric 
void originate_sum_rt_lsa(struct ospf_area *oa, struct fib_node *fn, int metric, u32 options UNUSED);

void flush_sum_lsa(struct ospf_area *oa, struct fib_node *fn, int type);

void originate_ext_lsa(struct ospf_area *oa, struct fib_node *fn, int src, u32 metric, ip_addr fwaddr, u32 tag, int pbit);

void flush_ext_lsa(struct ospf_area *oa, struct fib_node *fn);

void flush_ext_lsa(struct ospf_area *oa, struct fib_node *fn, int src);





#ifdef OSPFv2

CRA Git | Maintained and supported by SUSTech CRA and CCSE