From: Ondrej Filip <feela@network.cz>
Date: Mon, 7 Jun 2004 10:42:24 +0000 (+0000)
Subject: Cleanup in show route import <p>.
X-Git-Tag: v1.2.0~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90ac711bc5d1989dcb093088c74d062b43e9914;p=thirdparty%2Fbird.git

Cleanup in show route import <p>.
---

diff --git a/doc/bird.sgml b/doc/bird.sgml
index dc117acb3..6680c1efa 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -350,7 +350,7 @@ BIRD and <file/birdc/ is stable (see the programmer's documentation).
 	<tag>show symbols</tag>
 	Show the list of symbols defined in the configuration (names of protocols, routing tables etc.).
 
-	<tag>show route [[for] <m/prefix/|<m/IP/] [table <m/sym/] [filter <m/f/|where <m/c/] [(import|proto) <m/p/] [<m/options/]</tag>
+	<tag>show route [[for] <m/prefix/|<m/IP/] [table <m/sym/] [filter <m/f/|where <m/c/] [(import|preimport) <m/p/] [<m/options/]</tag>
 	Show contents of a routing table (by default of the main one),
 	that is routes, their metrics and (in case the <cf/all/ switch is given)
 	all their attributes.
@@ -365,9 +365,9 @@ BIRD and <file/birdc/ is stable (see the programmer's documentation).
 	<p>You can also ask for printing only routes processed and accepted by
 	a given filter (<cf>filter <m/name/</cf> or <cf>filter { <m/filter/ }
 	</cf> or matching a given condition (<cf>where <m/condition/</cf>).
-	The <cf/import/ and <cf/proto/ switches ask for printing of entries as
-	they would be seen by the specified protocol. With <cf/import/, the
-	export filter of the protocol is skipped.
+	The <cf/import/ and <cf/preimport/ switches ask for printing of entries
+        that are imported to the specified protocol. With <cf/preimport/, the
+	import filter of the protocol is skipped.
 
 	<p>The <cf/stats/ switch requests showing of route statistics (the
 	number of networks, number of routes before and after filtering). If
diff --git a/nest/config.Y b/nest/config.Y
index 1c5cf92da..ae673aeba 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -22,7 +22,7 @@ CF_DECLS
 CF_KEYWORDS(ROUTER, ID, PROTOCOL, PREFERENCE, DISABLED, DEBUG, ALL, OFF, DIRECT)
 CF_KEYWORDS(INTERFACE, IMPORT, EXPORT, FILTER, NONE, TABLE, STATES, ROUTES, FILTERS)
 CF_KEYWORDS(PASSWORD, FROM, PASSIVE, TO, ID, EVENTS, PACKETS, PROTOCOLS, INTERFACES)
-CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS)
+CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, COMMANDS, PREIMPORT)
 
 CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,
 	RIP, OSPF, OSPF_EXT, OSPF_IA, OSPF_BOUNDARY, BGP, PIPE)
@@ -312,8 +312,8 @@ r_args:
  ;
 
 import_or_proto:
-   IMPORT { $$ = 1; }
- | PROTOCOL { $$ = 2; }
+   PREIMPORT { $$ = 1; }
+ | IMPORT { $$ = 2; }
  ;
 
 CF_CLI(SHOW SYMBOLS, optsym, [<symbol>], [[Show all known symbolic names]])