Commit 83d9920f authored by Maria Matejka's avatar Maria Matejka
Browse files

Merge commit '5cff1d5f' into haugesund 

Conflicts:
      proto/bgp/attrs.c
      proto/pipe/pipe.c
parents ff47cd80 5cff1d5f

filter/config.Y

+1 −10
Original line number Diff line number Diff line
@@ -248,10 +248,6 @@ assert_assign(struct f_lval *lval, struct f_inst *expr, const char *start, const 
      setter = f_new_inst(FI_VAR_SET, expr, lval->sym);

      getter = f_new_inst(FI_VAR_GET, lval->sym);

      break;

    case F_LVAL_PREFERENCE:

      setter = f_new_inst(FI_PREF_SET, expr);

      getter = f_new_inst(FI_PREF_GET);

      break;

    case F_LVAL_SA:

      setter = f_new_inst(FI_RTA_SET, expr, lval->sa);

      getter = f_new_inst(FI_RTA_GET, lval->sa);
@@ -759,6 +755,7 @@ static_attr: 
 | IFNAME  { $$ = f_new_static_attr(T_STRING,     SA_IFNAME,	0); }

 | IFINDEX { $$ = f_new_static_attr(T_INT,        SA_IFINDEX,	1); }

 | WEIGHT  { $$ = f_new_static_attr(T_INT,        SA_WEIGHT,	0); }

 | PREFERENCE { $$ = f_new_static_attr(T_INT,	  SA_PREF,	0); }

 | GW_MPLS { $$ = f_new_static_attr(T_INT,        SA_GW_MPLS,	0); }

 ;
@@ -785,8 +782,6 @@ term: 
 | constant { $$ = $1; }

 | constructor { $$ = $1; }



 | PREFERENCE { $$ = f_new_inst(FI_PREF_GET); }



 | static_attr { $$ = f_new_inst(FI_RTA_GET, $1); }



 | dynamic_attr { $$ = f_new_inst(FI_EA_GET, $1); }
@@ -884,9 +879,6 @@ cmd: 
       cf_error( "This static attribute is read-only.");

     $$ = f_new_inst(FI_RTA_SET, $3, $1);

   }

 | PREFERENCE '=' term ';' {

     $$ = f_new_inst(FI_PREF_SET, $3);

   }

 | UNSET '(' dynamic_attr ')' ';' {

     $$ = f_new_inst(FI_EA_UNSET, $3);

   }
@@ -929,7 +921,6 @@ get_cf_position: 


lvalue:

   CF_SYM_KNOWN { cf_assert_symbol($1, SYM_VARIABLE); $$ = (struct f_lval) { .type = F_LVAL_VARIABLE, .sym = $1 }; }

 | PREFERENCE { $$ = (struct f_lval) { .type = F_LVAL_PREFERENCE }; }

 | static_attr { $$ = (struct f_lval) { .type = F_LVAL_SA, .sa = $1 }; }

 | dynamic_attr { $$ = (struct f_lval) { .type = F_LVAL_EA, .da = $1 }; };

filter/data.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ enum f_sa_code { 
  SA_IFNAME,

  SA_IFINDEX,

  SA_WEIGHT,

  SA_PREF,

  SA_GW_MPLS,

} PACKED;

filter/f-inst.c

+7 −16
Original line number Diff line number Diff line
@@ -526,13 +526,14 @@ 
      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_PROTO:	RESULT(sa.f_type, s, rta->src->proto->name); break;

      case SA_PROTO:	RESULT(sa.f_type, s, (*fs->rte)->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;

      case SA_DEST:	RESULT(sa.f_type, i, rta->dest); break;

      case SA_IFNAME:	RESULT(sa.f_type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;

      case SA_IFINDEX:	RESULT(sa.f_type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;

      case SA_WEIGHT:	RESULT(sa.f_type, i, rta->nh.weight + 1); break;

      case SA_PREF:	RESULT(sa.f_type, i, rta->pref); break;

      case SA_GW_MPLS:	RESULT(sa.f_type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;



      default:
@@ -561,7 +562,7 @@ 
	{

	  ip_addr ip = v1.val.ip;

	  struct iface *ifa = ipa_is_link_local(ip) ? rta->nh.iface : NULL;

	  neighbor *n = neigh_find(rta->src->proto, ip, ifa, 0);

	  neighbor *n = neigh_find((*fs->rte)->src->proto, ip, ifa, 0);

	  if (!n || (n->scope == SCOPE_HOST))

	    runtime( "Invalid gw address" );
@@ -637,6 +638,10 @@ 
        }

	break;



      case SA_PREF:

	rta->pref = v1.val.i;

	break;



      default:

	bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);

      }
@@ -804,20 +809,6 @@ 
    }

  }



  INST(FI_PREF_GET, 0, 1) {

    ACCESS_RTE;

    RESULT(T_INT, i, (*fs->rte)->pref);

  }



  INST(FI_PREF_SET, 1, 0) {

    ACCESS_RTE;

    ARG(1,T_INT);

    if (v1.val.i > 0xFFFF)

      runtime( "Setting preference value out of bounds" );

    f_rte_cow(fs);

    (*fs->rte)->pref = v1.val.i;

  }



  INST(FI_LENGTH, 1, 1) {	/* Get length of */

    ARG_ANY(1);

    switch(v1.type) {

lib/hash.h

+6 −0
Original line number Diff line number Diff line
@@ -215,6 +215,12 @@ mem_hash_mix(u64 *h, const void *p, uint s) 
    *h = *h * multiplier + pp[i];

}



static inline void

mem_hash_mix_num(u64 *h, u64 val)

{

  mem_hash_mix(h, &val, sizeof(val));

}



static inline uint

mem_hash_value(u64 *h)

{

nest/route.h

+8 −15
Original line number Diff line number Diff line
@@ -255,12 +255,12 @@ struct hostentry { 
typedef struct rte {

  struct rte *next;

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

  struct rte_src *src;			/* Route source that created the route */

  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 */

  byte flags;				/* Flags (REF_...) */

  byte pflags;				/* Protocol-specific flags */

  word pref;				/* Route preference */

  btime lastmod;			/* Last modified */

  union {				/* Protocol-dependent data (metrics etc.) */

#ifdef CONFIG_RIP
@@ -352,7 +352,7 @@ net *net_get(rtable *tab, const net_addr *addr); 
net *net_route(rtable *tab, const net_addr *n);

int net_roa_check(rtable *tab, const net_addr *n, u32 asn);

rte *rte_find(net *net, struct rte_src *src);

rte *rte_get_temp(struct rta *);

rte *rte_get_temp(struct rta *, struct rte_src *src);

void rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src);

/* rte_update() moved to protocol.h to avoid dependency conflicts */

int rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter);
@@ -487,14 +487,14 @@ typedef struct rta { 
  u32 uc;				/* Use count */

  u32 hash_key;				/* Hash over important fields */

  struct ea_list *eattrs;		/* Extended Attribute chain */

  struct rte_src *src;			/* Route source that created the route */

  struct hostentry *hostentry;		/* Hostentry for recursive next-hops */

  ip_addr from;				/* Advertising router */

  u32 igp_metric;			/* IGP metric to next hop (for iBGP routes) */

  u8 source;				/* Route source (RTS_...) */

  u8 scope;				/* Route scope (SCOPE_... -- see ip.h) */

  u8 dest;				/* Route destination type (RTD_...) */

  u8 aflags;

  u16 cached:1;				/* Are attributes cached? */

  u16 source:7;				/* Route source (RTS_...) */

  u16 scope:4;				/* Route scope (SCOPE_... -- see ip.h) */

  u16 dest:4;				/* Route destination type (RTD_...) */

  word pref;

  struct nexthop nh;			/* Next hop */

} rta;
@@ -516,11 +516,6 @@ typedef struct rta { 
#define RTS_PERF 15			/* Perf checker */

#define RTS_MAX 16



#define RTC_UNICAST 0

#define RTC_BROADCAST 1

#define RTC_MULTICAST 2

#define RTC_ANYCAST 3			/* IPv6 Anycast */



#define RTD_NONE 0			/* Undefined next hop */

#define RTD_UNICAST 1			/* Next hop is neighbor router */

#define RTD_BLACKHOLE 2			/* Silently drop packets */
@@ -528,8 +523,6 @@ typedef struct rta { 
#define RTD_PROHIBIT 4			/* Administratively prohibited */

#define RTD_MAX 5



#define RTAF_CACHED 1			/* This is a cached rta */



#define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other

					   protocol-specific metric is availabe */
@@ -718,7 +711,7 @@ void rta_init(void); 
static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a->nh.labels; }

#define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)

rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */

static inline int rta_is_cached(rta *r) { return r->aflags & RTAF_CACHED; }

static inline int rta_is_cached(rta *r) { return r->cached; }

static inline rta *rta_clone(rta *r) { r->uc++; return r; }

void rta__free(rta *r);

static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }

CRA Git | Maintained and supported by SUSTech CRA and CCSE