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

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

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

Todo: Should be described in user docs
parent f6e8e141

filter/config.Y

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, 
	TRUE, FALSE, RT, RO, UNKNOWN, GENERIC,

	FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, CAST, DEST, IFNAME, IFINDEX,

	PREFERENCE,

	ROA_CHECK,

	ROA_CHECK, ASN,

	LEN,

	DEFINED,

	ADD, DELETE, CONTAINS, RESET,
@@ -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 '.' 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; }

 | term '.' LAST  { $$ = f_new_inst(); $$->code = P('a','l'); $$->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','a'): 	/* Get ROA ASN */

    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)->asn :

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

    break;

  case P('c','p'):	/* Convert prefix to ... */

    ONEARG;

    if (v1.type != T_NET)

lib/net.h

+3 −0
Original line number Diff line number Diff line
@@ -171,6 +171,9 @@ static inline int net_type_match(const net_addr *a, u32 mask) 
static inline int net_is_ip(const net_addr *a)

{ return (a->type == NET_IP4) || (a->type == NET_IP6); }



static inline int net_is_roa(const net_addr *a)

{ return (a->type == NET_ROA4) || (a->type == NET_ROA6); }





static inline ip4_addr net4_prefix(const net_addr *a)

{ return ((net_addr_ip4 *) a)->prefix; }

CRA Git | Maintained and supported by SUSTech CRA and CCSE