Commit 9d798cd8 authored by Maria Matejka's avatar Maria Matejka Committed by Maria Matejka
Browse files

Nest: Changed struct network * in struct rte to const net_addr *. [WIP] 

This allows filtering the route without even touching the table on
import. Therefore rejected routes don't mess with the table in any way.
Only accepted routes are linked to the table.

Kernel protocol still uses a dirty hack to get routes synchronized. This
should be sanitized in future to allow proper concurrency.
parent 4b7f14aa

filter/filter.c

+2 −2
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ interpret(struct f_inst *what) 
      {

      case SA_FROM:	res.val.ip = rta->from; break;

      case SA_GW:	res.val.ip = rta->nh.gw; break;

      case SA_NET:	res.val.net = (*f_rte)->net->n.addr; break;

      case SA_NET:	res.val.net = (*f_rte)->netA; break;

      case SA_PROTO:	res.val.s = rta->src->proto->name; break;

      case SA_SOURCE:	res.val.i = rta->source; break;

      case SA_SCOPE:	res.val.i = rta->scope; break;
@@ -1531,7 +1531,7 @@ interpret(struct f_inst *what) 
    {

      ACCESS_RTE;

      ACCESS_EATTRS;

      v1.val.net = (*f_rte)->net->n.addr;

      v1.val.net = (*f_rte)->netA;



      /* 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/route.h

+3 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ struct hostentry { 


typedef struct rte {

  struct rte *next;

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

  const net_addr *netA;			/* Network this RTE belongs to */

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

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

  byte flags;				/* Flags (REF_...) */
@@ -258,6 +258,8 @@ typedef struct rte { 
#define REF_DISCARD	8		/* Route is scheduled for discard */

#define REF_MODIFY	16		/* Route is scheduled for modify */



#define RTE_NET(e)	(((e)->flags & REF_COW) ? SKIP_BACK(struct network, n, SKIP_BACK(struct fib_node, addr, (e)->netA)) : NULL)



/* Route is valid for propagation (may depend on other flags in the future), accepts NULL */

static inline int rte_is_valid(rte *r) { return r && !(r->flags & REF_FILTERED); }

nest/rt-show.c

+3 −2
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d) 
  byte from[IPA_MAX_TEXT_LENGTH+8];

  byte tm[TM_DATETIME_BUFFER_SIZE], info[256];

  rta *a = e->attrs;

  int primary = (e->net->routes == e);

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

  net *nn = RTE_NET(e);

  int primary = nn && (nn->routes == e);

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

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

  struct nexthop *nh;

nest/rt-table.c

+33 −24
Original line number Diff line number Diff line
@@ -376,7 +376,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->netA, rta_dest_name(e->attrs->dest));

}



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

{

  int c;

  net *n = e->net;

  const net_addr *n = e->netA;



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

  if (!net_validate(n))

  {

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

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

	n, 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(n) ?

    net_classify(n): (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);

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

    return 0;

  }



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

  if (net_type_match(n, 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);

	n, 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);

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

    return 0;

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

  if (new)

    {

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



      new->net = nn;

      new->netA = n;

      new->sender = c;



      if (!new->pref)
@@ -1397,6 +1395,8 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src) 
      if (!rta_is_cached(new->attrs)) /* Need to copy attributes */

	new->attrs = rta_lookup(new->attrs);

      new->flags |= REF_COW;



      new->netA = (nn = net_get(c->table, n))->n.addr;

    }

  else

    {
@@ -1420,7 +1420,12 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src) 
 drop:

  rte_free(new);

  new = NULL;



  if ((nn = net_find(c->table, n)) && src)

    goto recalc;



  rte_update_unlock();

  return;

}



/* Independent call to rte_announce(), used from next hop
@@ -1435,16 +1440,16 @@ rte_announce_i(rtable *tab, unsigned 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 *n, 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, n, 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 *n, rte *old)

{

  rte_update_lock();
@@ -1458,7 +1463,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, n, new, old->attrs->src);

  }



  rte_update_unlock();
@@ -1580,9 +1585,13 @@ rt_modify_stale(rtable *t, struct channel *c) 
void

rte_dump(rte *e)

{

  net *n = e->net;

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

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

  net *n = RTE_NET(e);

  if (n)

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

  else

    debug("outside fib, 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);
@@ -1769,7 +1778,7 @@ again: 
		return;

	      }



	    rte_discard(e);

	    rte_discard(n, e);

	    limit--;



	    goto rescan;
@@ -1784,7 +1793,7 @@ again: 
		return;

	      }



	    rte_modify(e);

	    rte_modify(n, e);

	    limit--;



	    goto rescan;
@@ -2360,7 +2369,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->netA = net->n.addr;

  e->sender = c;

  e->lastmod = current_time();

  e->next = *pos;

proto/bgp/attrs.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ bgp_decode_large_community(struct bgp_parse_state *s, uint code UNUSED, uint fla 
static void

bgp_export_mpls_label_stack(struct bgp_export_state *s, eattr *a)

{

  net_addr *n = s->route->net->n.addr;

  const net_addr *n = s->route->netA;

  u32 *labels = (u32 *) a->u.ptr->data;

  uint lnum = a->u.ptr->length / 4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE