Commit e58f8c28 authored by Pavel Tvrdik's avatar Pavel Tvrdik Committed by Jan Moskyto Matejka
Browse files

Add `.maxlen' operator to all ROA prefixes in filters 

Example:
  bird> eval (1.2.0.0/16 max 20 as 1234).maxlen
  20

Todo: Should be described in user docs
parent 69ae5784

filter/config.Y

+2 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, 
	FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, CAST, DEST, IFNAME, IFINDEX,

	PREFERENCE,

	ROA_CHECK, ASN,

	LEN,

	LEN, MAXLEN,

	DEFINED,

	ADD, DELETE, CONTAINS, RESET,

	PREPEND, FIRST, LAST, LAST_NONAGGREGATED, MATCH,
@@ -740,6 +740,7 @@ term: 


 | term '.' IP { $$ = f_new_inst(); $$->code = P('c','p'); $$->a1.p = $1; $$->aux = T_IP; }

 | term '.' LEN { $$ = f_new_inst(); $$->code = 'L'; $$->a1.p = $1; }

 | term '.' MAXLEN { $$ = f_new_inst(); $$->code = P('R','m'); $$->a1.p = $1; }

 | term '.' ASN { $$ = f_new_inst(); $$->code = P('R','a'); $$->a1.p = $1; }

 | term '.' MASK '(' term ')' { $$ = f_new_inst(); $$->code = P('i','M'); $$->a1.p = $1; $$->a2.p = $5; }

 | term '.' FIRST { $$ = f_new_inst(); $$->code = P('a','f'); $$->a1.p = $1; }

filter/filter.c

+10 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,16 @@ interpret(struct f_inst *what) 
    default: runtime( "Prefix, path, clist or eclist expected" );

    }

    break;

  case P('R','m'): 	/* Get ROA max prefix length */

    ONEARG;

    if (v1.type != T_NET || !net_is_roa(v1.val.net))

      runtime( "ROA expected" );



    res.type = T_INT;

    res.val.i = (v1.val.net->type == NET_ROA4) ?

      ((net_addr_roa4 *) v1.val.net)->max_pxlen :

      ((net_addr_roa6 *) v1.val.net)->max_pxlen;

    break;

  case P('R','a'): 	/* Get ROA ASN */

    ONEARG;

    if (v1.type != T_NET || !net_is_roa(v1.val.net))

CRA Git | Maintained and supported by SUSTech CRA and CCSE