Commit 9f3e0983 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Filter: Allow to use set constants / expressions in path masks 

Allow to not only use set literals in path masks, but also existing
set constants or set expressions.
parent ef113c6f

filter/f-inst.c

+12 −0
Original line number Diff line number Diff line
@@ -308,12 +308,24 @@ 
	case T_PATH_MASK_ITEM:

	  pm->item[i] = vv(i).val.pmi;

	  break;



	case T_INT:

	  pm->item[i] = (struct f_path_mask_item) {

	    .asn = vv(i).val.i,

	    .kind = PM_ASN,

	  };

	  break;



	case T_SET:

	  if (vv(i).val.t->from.type != T_INT)

	    runtime("Only integer sets allowed in path mask");



	  pm->item[i] = (struct f_path_mask_item) {

	    .set = vv(i).val.t,

	    .kind = PM_ASN_SET,

	  };

	  break;



	default:

	  runtime( "Error resolving path mask template: value not an integer" );

      }

filter/test.conf

+5 −0
Original line number Diff line number Diff line
@@ -597,11 +597,15 @@ function mkpath(int a; int b) 
	return [= a b 3 2 1 =];

}



define set35 = [3 .. 5];



function t_path()

bgpmask pm1;

bgppath p2;

int set set12;

{

	pm1 = [= 4 3 2 1 =];

	set12 = [1, 2];



	bt_assert(format(pm1) = "[= 4 3 2 1 =]");
@@ -627,6 +631,7 @@ bgppath p2; 
	bt_assert(p2 ~ [= * 4 3 * 1 =]);

	bt_assert(p2 ~ [= (3+2) (2*2) 3 2 1 =]);

	bt_assert(p2 ~ [= 5 [2, 4, 6] 3 [1..2] 1 =]);

	bt_assert(p2 ~ [= 5 set35 3 set12 set12 =]);

	bt_assert(p2 ~ mkpath(5, 4));



	bt_assert(p2.len = 5);

nest/a-path.c

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ pm_match(struct pm_pos *pos, u32 asn, u32 asn2) 
}



static int

pm_match_set(struct pm_pos *pos, struct f_tree *set)

pm_match_set(struct pm_pos *pos, const struct f_tree *set)

{

  struct f_val asn = { .type = T_INT };

nest/attrs.h

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ static inline struct adata *as_path_prepend(struct linpool *pool, const struct a 
struct f_path_mask_item {

  union {

    u32 asn; /* PM_ASN */

    struct f_line *expr; /* PM_ASN_EXPR */

    struct f_tree *set; /* PM_ASN_SET */

    const struct f_line *expr; /* PM_ASN_EXPR */

    const struct f_tree *set; /* PM_ASN_SET */

    struct { /* PM_ASN_RANGE */

      u32 from;

      u32 to;

CRA Git | Maintained and supported by SUSTech CRA and CCSE