bird2/patches/0008-Filter-Add-support-for-src-filter-op-to-access-SADR-.patch

   1 From b24b781117179f301116837f0a39468343e4805b Mon Sep 17 00:00:00 2001
   2 From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
   3 Date: Wed, 16 May 2018 11:19:29 +0200
   4 Subject: [PATCH] Filter: Add support for src filter op to access SADR source
   5  prefix
   6
   7 The patch allows to use 'net.src' to access SADR source prefix
   8 from filters.
   9
  10 Thanks to Toke Hoiland-Jorgensen for the original patch for srclen.
  11 ---
  12  filter/config.Y |  3 ++-
  13  filter/filter.c | 15 +++++++++++++++
  14  filter/filter.h |  1 +
  15  lib/net.h       |  2 ++
  16  4 files changed, 20 insertions(+), 1 deletion(-)
  17
  18 diff --git a/filter/config.Y b/filter/config.Y
  19 index f8170a83..e01e02ef 100644
  20 --- a/filter/config.Y
  21 +++ b/filter/config.Y
  22 @@ -411,7 +411,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
  23         TRUE, FALSE, RT, RO, UNKNOWN, GENERIC,
  24         FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, DEST, IFNAME, IFINDEX,
  25         PREFERENCE,
  26 -       ROA_CHECK, ASN,
  27 +       ROA_CHECK, ASN, SRC,
  28         IS_V4, IS_V6,
  29         LEN, MAXLEN,
  30         DEFINED,
  31 @@ -898,6 +898,7 @@ term:
  32   | term '.' LEN { $$ = f_new_inst(FI_LENGTH); $$->a1.p = $1; }
  33   | term '.' MAXLEN { $$ = f_new_inst(FI_ROA_MAXLEN); $$->a1.p = $1; }
  34   | term '.' ASN { $$ = f_new_inst(FI_ROA_ASN); $$->a1.p = $1; }
  35 + | term '.' SRC { $$ = f_new_inst(FI_SADR_SRC); $$->a1.p = $1; }
  36   | term '.' MASK '(' term ')' { $$ = f_new_inst(FI_IP_MASK); $$->a1.p = $1; $$->a2.p = $5; }
  37   | term '.' FIRST { $$ = f_new_inst(FI_AS_PATH_FIRST); $$->a1.p = $1; }
  38   | term '.' LAST  { $$ = f_new_inst(FI_AS_PATH_LAST); $$->a1.p = $1; }
  39 diff --git a/filter/filter.c b/filter/filter.c
  40 index 881ba420..3d7b5c9f 100644
  41 --- a/filter/filter.c
  42 +++ b/filter/filter.c
  43 @@ -1241,6 +1241,20 @@ interpret(struct f_inst *what)
  44      default: runtime( "Prefix, path, clist or eclist expected" );
  45      }
  46      break;
  47 +  case FI_SADR_SRC:    /* Get SADR src prefix */
  48 +    ONEARG;
  49 +    if (v1.type != T_NET || !net_is_sadr(v1.val.net))
  50 +      runtime( "SADR expected" );
  51 +
  52 +    {
  53 +      net_addr_ip6_sadr *net = (void *) v1.val.net;
  54 +      net_addr *src = lp_alloc(f_pool, sizeof(net_addr_ip6));
  55 +      net_fill_ip6(src, net->src_prefix, net->src_pxlen);
  56 +
  57 +      res.type = T_NET;
  58 +      res.val.net = src;
  59 +    }
  60 +    break;
  61    case FI_ROA_MAXLEN:  /* Get ROA max prefix length */
  62      ONEARG;
  63      if (v1.type != T_NET || !net_is_roa(v1.val.net))
  64 @@ -1714,6 +1728,7 @@ i_same(struct f_inst *f1, struct f_inst *f2)
  65    case FI_RETURN: ONEARG; break;
  66    case FI_ROA_MAXLEN: ONEARG; break;
  67    case FI_ROA_ASN: ONEARG; break;
  68 +  case FI_SADR_SRC: ONEARG; break;
  69    case FI_IP: ONEARG; break;
  70    case FI_IS_V4: ONEARG; break;
  71    case FI_ROUTE_DISTINGUISHER: ONEARG; break;
  72 diff --git a/filter/filter.h b/filter/filter.h
  73 index d347924a..982276f0 100644
  74 --- a/filter/filter.h
  75 +++ b/filter/filter.h
  76 @@ -55,6 +55,7 @@
  77    F(FI_LENGTH,                   0, 'L') \
  78    F(FI_ROA_MAXLEN,             'R', 'M') \
  79    F(FI_ROA_ASN,                        'R', 'A') \
  80 +  F(FI_SADR_SRC,               'n', 's') \
  81    F(FI_IP,                     'c', 'p') \
  82    F(FI_ROUTE_DISTINGUISHER,    'R', 'D') \
  83    F(FI_AS_PATH_FIRST,          'a', 'f') \
  84 diff --git a/lib/net.h b/lib/net.h
  85 index ad4000fd..0cd5f735 100644
  86 --- a/lib/net.h
  87 +++ b/lib/net.h
  88 @@ -268,6 +268,8 @@ static inline int net_is_roa(const net_addr *a)
  89  static inline int net_is_flow(const net_addr *a)
  90  { return (a->type == NET_FLOW4) || (a->type == NET_FLOW6); }
  91
  92 +static inline int net_is_sadr(const net_addr *a)
  93 +{ return (a->type == NET_IP6_SADR); }
  94
  95  static inline ip4_addr net4_prefix(const net_addr *a)
  96  { return ((net_addr_ip4 *) a)->prefix; }
  97 --
  98 2.17.0
  99