]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Static: removing forgotten stupid jokes on flowspec config show-route
authorJan Maria Matejka <mq@ucw.cz>
Wed, 27 Jun 2018 11:51:05 +0000 (13:51 +0200)
committerJan Maria Matejka <mq@ucw.cz>
Wed, 27 Jun 2018 11:51:05 +0000 (13:51 +0200)
proto/static/config.Y

index 5ca9d2b9bcb2a6e1080705b7f0b297a7596579ee..0d4e27db74df371082ccc4239a5adce27c8747f1 100644 (file)
@@ -55,6 +55,9 @@ static_route_finish(void)
 static void
 static_flow_action(u64 ec)
 {
+  if (!net_type_match(this_srt->net, NB_FLOW))
+    cf_error("Unexpected action block");
+
   NEW_F_VAL;
 
   val->type = T_EC; val->val.ec = ec;
@@ -136,8 +139,6 @@ stat_nexthops:
 ;
 
 stat_route0: ROUTE net_any {
-     if (net_type_match($2, NB_FLOW))
-       cf_error("Flowspec rules are not routes. Apologize!");
      static_route_start($2);
   }
  ;
@@ -159,7 +160,7 @@ stat_route:
  | stat_route0 BLACKHOLE       { this_srt->dest = RTD_BLACKHOLE; }
  | stat_route0 UNREACHABLE     { this_srt->dest = RTD_UNREACHABLE; }
  | stat_route0 PROHIBIT                { this_srt->dest = RTD_PROHIBIT; }
- | net_flow_ { static_route_start($1); } flowspec_action
+ | stat_route0 flowspec_action { this_srt->dest = RTD_NONE; }
  ;
 
 stat_route_item: