Commit c1b5b7b7 authored by Maria Matejka's avatar Maria Matejka
Browse files

Nest: Route stores directly the net_addr *, not net *.

parent cb06f129

filter/f-inst.c

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ 
      {

      case SA_FROM:	RESULT(sa.f_type, ip, rta->from); break;

      case SA_GW:	RESULT(sa.f_type, ip, rta->nh.gw); break;

      case SA_NET:	RESULT(sa.f_type, net, (*fs->rte)->net->n.addr); break;

      case SA_NET:	RESULT(sa.f_type, net, (*fs->rte)->net); break;

      case SA_PROTO:	RESULT(sa.f_type, s, rta->src->proto->name); break;

      case SA_SOURCE:	RESULT(sa.f_type, i, rta->source); break;

      case SA_SCOPE:	RESULT(sa.f_type, i, rta->scope); break;
@@ -1098,7 +1098,7 @@ 
    struct rtable *table = rtc->table;

    ACCESS_RTE;

    ACCESS_EATTRS;

    const net_addr *net = (*fs->rte)->net->n.addr;

    const net_addr *net = (*fs->rte)->net;



    /* We ignore temporary attributes, probably not a problem here */

    /* 0x02 is a value of BA_AS_PATH, we don't want to include BGP headers */

nest/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct protocol { 
  struct proto * (*init)(struct proto_config *);		/* Create new instance */

  int (*reconfigure)(struct proto *, struct proto_config *);	/* Try to reconfigure instance, returns success */

  void (*dump)(struct proto *);			/* Debugging dump */

  void (*dump_attrs)(struct rte *);		/* Dump protocol-dependent attributes */

  void (*dump_attrs)(const struct rte *);		/* Dump protocol-dependent attributes */

  int (*start)(struct proto *);			/* Start the instance */

  int (*shutdown)(struct proto *);		/* Stop the instance */

  void (*cleanup)(struct proto *);		/* Called after shutdown when protocol became hungry/down */

nest/route.h

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct hostentry { 


typedef struct rte {

  struct rte *next;

  net *net;				/* Network this RTE belongs to */

  const net_addr *net;			/* Prefix this RTE belongs to. If REF_CACHED, this points to the net_addr stored in FIB. */

  struct channel *sender;		/* Channel used to send the route to the routing table */

  struct rta *attrs;			/* Attributes of this route */

  u32 id;				/* Table specific route id */
@@ -306,7 +306,7 @@ void rt_refresh_begin(rtable *t, struct channel *c); 
void rt_refresh_end(rtable *t, struct channel *c);

void rt_modify_stale(rtable *t, struct channel *c);

void rt_schedule_prune(rtable *t);

void rte_dump(rte *);

void rte_dump(const net *n, const rte *);

void rte_free(rte *);

rte *rte_do_cow(rte *);

static inline rte * rte_cow(rte *r) { return (r->flags & REF_COW) ? rte_do_cow(r) : r; }

nest/rt-show.c

+3 −3
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ rt_show_table(struct cli *c, struct rt_show_data *d) 
}



static void

rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, int primary)

rt_show_rte(struct cli *c, byte *ia, net *n, rte *e, struct rt_show_data *d, int primary)

{

  byte from[IPA_MAX_TEXT_LENGTH+8];

  byte tm[TM_DATETIME_BUFFER_SIZE], info[256];

  rta *a = e->attrs;

  int sync_error = (e->net->n.flags & KRF_SYNC_ERROR);

  int sync_error = (n->n.flags & KRF_SYNC_ERROR);

  void (*get_route_info)(struct rte *, byte *buf);

  struct nexthop *nh;
@@ -174,7 +174,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) 
	goto skip;



      if (d->stats < 2)

	rt_show_rte(c, ia, e, d, (e->net->routes == ee));

	rt_show_rte(c, ia, n, e, d, (n->routes == ee));



      d->show_counter++;

      ia[0] = 0;

nest/rt-table.c

+27 −31
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ rte_mergable(rte *pri, rte *sec) 
static void

rte_trace(struct proto *p, rte *e, int dir, char *msg)

{

  log(L_TRACE "%s %c %s %N %s", p->name, dir, msg, e->net->n.addr, rta_dest_name(e->attrs->dest));

  log(L_TRACE "%s %c %s %N %s", p->name, dir, msg, e->net, rta_dest_name(e->attrs->dest));

}



static inline void
@@ -1002,36 +1002,35 @@ static inline int 
rte_validate(rte *e)

{

  int c;

  net *n = e->net;



  if (!net_validate(n->n.addr))

  if (!net_validate(e->net))

  {

    log(L_WARN "Ignoring bogus prefix %N received via %s",

	n->n.addr, e->sender->proto->name);

	e->net, e->sender->proto->name);

    return 0;

  }



  /* FIXME: better handling different nettypes */

  c = !net_is_flow(n->n.addr) ?

    net_classify(n->n.addr): (IADDR_HOST | SCOPE_UNIVERSE);

  c = !net_is_flow(e->net) ?

    net_classify(e->net): (IADDR_HOST | SCOPE_UNIVERSE);

  if ((c < 0) || !(c & IADDR_HOST) || ((c & IADDR_SCOPE_MASK) <= SCOPE_LINK))

  {

    log(L_WARN "Ignoring bogus route %N received via %s",

	n->n.addr, e->sender->proto->name);

	e->net, e->sender->proto->name);

    return 0;

  }



  if (net_type_match(n->n.addr, NB_DEST) == !e->attrs->dest)

  if (net_type_match(e->net, NB_DEST) == !e->attrs->dest)

  {

    log(L_WARN "Ignoring route %N with invalid dest %d received via %s",

	n->n.addr, e->attrs->dest, e->sender->proto->name);

	e->net, e->attrs->dest, e->sender->proto->name);

    return 0;

  }



  if ((e->attrs->dest == RTD_UNICAST) && !nexthop_is_sorted(&(e->attrs->nh)))

  {

    log(L_WARN "Ignoring unsorted multipath route %N received via %s",

	n->n.addr, e->sender->proto->name);

	e->net, e->sender->proto->name);

    return 0;

  }
@@ -1438,12 +1437,7 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src) 
  rte_update_lock();

  if (new)

    {

      /* Create a temporary table node */

      nn = alloca(sizeof(net) + n->length);

      memset(nn, 0, sizeof(net) + n->length);

      net_copy(nn->n.addr, n);



      new->net = nn;

      new->net = n;

      new->sender = c;



      if (!new->pref)
@@ -1496,7 +1490,7 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src) 


      /* Use the actual struct network, not the dummy one */

      nn = net_get(c->table, n);

      new->net = nn;

      new->net = nn->n.addr;

    }

  else

    {
@@ -1540,16 +1534,16 @@ rte_announce_i(rtable *tab, uint type, net *net, rte *new, rte *old, 
}



static inline void

rte_discard(rte *old)	/* Non-filtered route deletion, used during garbage collection */

rte_discard(net *net, rte *old)	/* Non-filtered route deletion, used during garbage collection */

{

  rte_update_lock();

  rte_recalculate(old->sender, old->net, NULL, old->attrs->src);

  rte_recalculate(old->sender, net, NULL, old->attrs->src);

  rte_update_unlock();

}



/* Modify existing route by protocol hook, used for long-lived graceful restart */

static inline void

rte_modify(rte *old)

rte_modify(net *net, rte *old)

{

  rte_update_lock();
@@ -1563,7 +1557,7 @@ rte_modify(rte *old) 
      new->flags = (old->flags & ~REF_MODIFY) | REF_COW;

    }



    rte_recalculate(old->sender, old->net, new, old->attrs->src);

    rte_recalculate(old->sender, net, new, old->attrs->src);

  }



  rte_update_unlock();
@@ -1683,11 +1677,13 @@ rt_modify_stale(rtable *t, struct channel *c) 
 * This functions dumps contents of a &rte to debug output.

 */

void

rte_dump(rte *e)

rte_dump(const net *n, const rte *e)

{

  net *n = e->net;

  debug("%-1N ", n->n.addr);

  debug("KF=%02x PF=%02x pref=%d ", n->n.flags, e->pflags, e->pref);

  ASSERT((!n) || (n->n.addr == e->net));

  debug("%-1N ", e->net);

  if (n)

    debug("KF=%02x ", n->n.flags);

  debug("PF=%02x pref=%d ", e->pflags, e->pref);

  rta_dump(e->attrs);

  if (e->attrs->src->proto->proto->dump_attrs)

    e->attrs->src->proto->proto->dump_attrs(e);
@@ -1711,7 +1707,7 @@ rt_dump(rtable *t) 
    {

      rte *e;

      for(e=n->routes; e; e=e->next)

	rte_dump(e);

	rte_dump(n, e);

    }

  FIB_WALK_END;

  debug("\n");
@@ -1877,7 +1873,7 @@ again: 
		return;

	      }



	    rte_discard(e);

	    rte_discard(n, e);

	    limit--;



	    goto rescan;
@@ -1892,7 +1888,7 @@ again: 
		return;

	      }



	    rte_modify(e);

	    rte_modify(n, e);

	    limit--;



	    goto rescan;
@@ -2492,7 +2488,7 @@ rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src *sr 
  /* Insert the new rte */

  rte *e = rte_do_cow(new);

  e->flags |= REF_COW;

  e->net = net;

  e->net = net->n.addr;

  e->sender = c;

  e->lastmod = current_time();

  e->next = *pos;
@@ -2537,7 +2533,7 @@ rt_reload_channel(struct channel *c) 
	return 0;

      }



      rte_update2(c, e->net->n.addr, rte_do_cow(e), e->attrs->src);

      rte_update2(c, e->net, rte_do_cow(e), e->attrs->src);

    }



    c->reload_next_rte = NULL;
@@ -2660,7 +2656,7 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int re 
  /* Insert the new rte */

  rte *e = rte_do_cow(new);

  e->flags |= REF_COW;

  e->net = net;

  e->net = net->n.addr;

  e->sender = c;

  e->lastmod = current_time();

  e->next = *pos;

CRA Git | Maintained and supported by SUSTech CRA and CCSE