From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sat, 28 Apr 2012 11:03:48 +0000 (+0200)
Subject: Changes keyword 'exceed' to 'action'.
X-Git-Tag: v1.3.8~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf42207332e8e502d636038f1ec44aaea6ec50e0;p=thirdparty%2Fbird.git

Changes keyword 'exceed' to 'action'.
---

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 91cad0851..a94fb9e14 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -426,21 +426,28 @@ to zero to disable it. An empty <cf><m/switch/</cf> is equivalent to <cf/on/
 	uses global router id.
 
 	<tag>import all | none | filter <m/name/ | filter { <m/filter commands/ } | where <m/filter expression/</tag> 
-	Specify a filter to be used for filtering routes coming from the protocol to the routing table. <cf/all/ is shorthand for <cf/where true/ and <cf/none/ is shorthand for <cf/where false/. Default: <cf/all/.
+	Specify a filter to be used for filtering routes coming from
+	the protocol to the routing table. <cf/all/ is shorthand for
+	<cf/where true/ and <cf/none/ is shorthand for
+	<cf/where false/. Default: <cf/all/.
 
-	<tag>export <m/filter/</tag> This is similar to the <cf>import</cf> keyword, except that it
-	works in the direction from the routing table to the protocol. Default: <cf/none/.
+	<tag>export <m/filter/</tag>
+	This is similar to the <cf>import</cf> keyword, except that it
+	works in the direction from the routing table to the protocol.
+	Default: <cf/none/.
 
-	<tag>import limit <m/number/ [exceed warn | block | restart | disable]</tag>
+	<tag>import limit <m/number/ [action warn | block | restart | disable]</tag>
 	Specify an import route limit (a maximum number of routes
 	imported from the protocol) and optionally the action to be
 	taken when the limit is hit. Warn action just prints warning
 	log message. Block action ignores new routes coming from the
 	protocol. Restart and disable actions shut the protocol down
 	like appropriate commands. Disable is the default action if an
-	action is not explicitly specified.  Default: <cf/none/.
+	action is not explicitly specified. Note that limits are reset
+	during protocol reconfigure, reload or restart.
+	Default: <cf/none/.
 
-	<tag>export limit <m/number/ [exceed warn | block | restart | disable]</tag>
+	<tag>export limit <m/number/ [action warn | block | restart | disable]</tag>
 	Specify an export route limit, works similarly to
 	the <cf>import limit</cf> option, but for the routes exported
 	to the protocol. This option is experimental, there are some
diff --git a/nest/config.Y b/nest/config.Y
index c59319cb7..14cff10a4 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -44,7 +44,7 @@ CF_DECLS
 
 CF_KEYWORDS(ROUTER, ID, PROTOCOL, TEMPLATE, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)
 CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILTERS)
-CF_KEYWORDS(EXCEED, LIMIT, WARN, BLOCK, RESTART, DISABLE)
+CF_KEYWORDS(LIMIT, ACTION, WARN, BLOCK, RESTART, DISABLE)
 CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
 CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREEXPORT, GENERATE, ROA, MAX, FLUSH)
 CF_KEYWORDS(LISTEN, BGP, V6ONLY, DUAL, ADDRESS, PORT, PASSWORDS, DESCRIPTION)
@@ -194,10 +194,10 @@ imexport:
 
 limit_action:
    /* default */ { $$ = PLA_DISABLE; }
- | EXCEED WARN { $$ = PLA_WARN; }
- | EXCEED BLOCK { $$ = PLA_BLOCK; }
- | EXCEED RESTART { $$ = PLA_RESTART; }
- | EXCEED DISABLE { $$ = PLA_DISABLE; }
+ | ACTION WARN { $$ = PLA_WARN; }
+ | ACTION BLOCK { $$ = PLA_BLOCK; }
+ | ACTION RESTART { $$ = PLA_RESTART; }
+ | ACTION DISABLE { $$ = PLA_DISABLE; }
  ;
 
 limit_spec: