From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Wed, 12 Jul 2017 12:25:55 +0000 (+0200)
Subject: Merge branch 'int-new' into show-route
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2776cfafec3ae2ae3d6ed926fc6895577656d5db;p=thirdparty%2Fbird.git

Merge branch 'int-new' into show-route
---

2776cfafec3ae2ae3d6ed926fc6895577656d5db
diff --cc proto/static/config.Y
index bccd0c4c6,66e5ea4c2..9f092c1fa
--- a/proto/static/config.Y
+++ b/proto/static/config.Y
@@@ -52,30 -41,10 +52,30 @@@ static_route_finish(void
      cf_error("Unexpected or missing nexthop/type");
  }
  
 +static void
 +static_flow_action(u64 ec)
 +{
 +  NEW_F_VAL;
 +
 +  val->type = T_EC; val->val.ec = ec;
 +  struct f_inst *fic = f_new_inst();
 +  fic->code = 'C'; fic->a1.p = val;
 +  *this_srt_last_cmd = f_generate_complex(
 +    P('C','a'), 'a',
 +    f_new_dynamic_attr(EAF_TYPE_EC_SET, T_ECLIST, EA_CODE(EAP_BGP, BA_EXT_COMMUNITY)),
 +    fic
 +  );
 +  this_srt_last_cmd = &((*this_srt_last_cmd)->next);
 +}
 +
  CF_DECLS
  
 +%type <fl> float_rate
 +
  CF_KEYWORDS(STATIC, ROUTE, VIA, DROP, REJECT, PROHIBIT, PREFERENCE, CHECK, LINK)
- CF_KEYWORDS(WEIGHT, RECURSIVE, IGP, TABLE, BLACKHOLE, UNREACHABLE, BFD, MPLS)
+ CF_KEYWORDS(ONLINK, WEIGHT, RECURSIVE, IGP, TABLE, BLACKHOLE, UNREACHABLE, BFD, MPLS)
 +CF_KEYWORDS(RATE, SAMPLE, LAST, DSCP)
 +CF_KEYWORDS_CS(mBps, mbps, Bps, bps, kBps, kbps, MBps, Mbps, GBps, Gbps, TBps, Tbps)
  
  
  CF_GRAMMAR