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

diff --git a/filter/config.Y b/filter/config.Y
index 3e70a63e5afbff44e5dd88f2f4309128c4b187af..6783ea10547225b67cd12717186da1208f091f68 100644 (file)
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -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; }

diff --git a/filter/filter.c b/filter/filter.c
index 47c5e63dc356fa6ed8fb04853c2a2b0eeb785d7d..ba1ba75377a29cc3ac67413ddf3fd118d9afb39e 100644 (file)
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -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)

diff --git a/lib/net.h b/lib/net.h
index d9137c4aa50c2ecb8e1a28d39709e5cf70586e76..3deedb1ffbf464a4ee91e8ac350cce47d026689e 100644 (file)
--- a/lib/net.h
+++ b/lib/net.h
@@ -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; }