Merge branch 'master' into dev

3 files changed, 15 insertions, 4 deletions

diff --git a/nest/config.Y b/nest/config.Y
index 1d2f0150..efff1313 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -56,7 +56,7 @@ CF_ENUM(T_ENUM_RTD, RTD_, ROUTER, DEVICE, BLACKHOLE, UNREACHABLE, PROHIBIT)
 %type <r> rtable
 %type <s> optsym
 %type <ra> r_args
-%type <i> echo_mask echo_size debug_mask debug_list debug_flag import_or_proto
+%type <i> echo_mask echo_size debug_mask debug_list debug_flag import_or_preimport
 %type <t> proto_patt
 
 CF_GRAMMAR
@@ -298,7 +298,7 @@ CF_CLI(SHOW INTERFACES,,, [[Show network interfaces]])
 CF_CLI(SHOW INTERFACES SUMMARY,,, [[Show summary of network interfaces]])
 { if_show_summary(); } ;
 
-CF_CLI(SHOW ROUTE, r_args, [[[<prefix>|for <prefix>|for <ip>] [table <t>] [filter <f>|where <cond>] [all] [primary] [(import|protocol) <p>] [stats|count]]], [[Show routing table]])
+CF_CLI(SHOW ROUTE, r_args, [[[<prefix>|for <prefix>|for <ip>] [table <t>] [filter <f>|where <cond>] [all] [primary] [(import|preimport) <p>] [protocol <p>] [stats|count]]], [[Show routing table]])
 { rt_show($3); } ;
 
 r_args:
@@ -344,7 +344,7 @@ r_args:
      $$ = $1;
      $$->primary_only = 1;
    }
- | r_args import_or_proto SYM {
+ | r_args import_or_preimport SYM {
      struct proto_config *c = (struct proto_config *) $3->def;
      $$ = $1;
      if ($$->import_mode) cf_error("Protocol specified twice");
@@ -354,6 +354,14 @@ r_args:
      $$->import_protocol = c->proto;
      $$->running_on_config = c->proto->cf->global;
    }
+ | r_args PROTOCOL SYM {
+     struct proto_config *c = (struct proto_config *) $3->def;
+     $$ = $1;
+     if ($$->show_protocol) cf_error("Protocol specified twice");
+     if ($3->class != SYM_PROTO || !c->proto) cf_error("%s is not a protocol", $3->name);
+     $$->show_protocol = c->proto;
+     $$->running_on_config = c->proto->cf->global;
+   }
  | r_args STATS {
      $$ = $1;
      $$->stats = 1;
@@ -364,7 +372,7 @@ r_args:
    }
  ;
 
-import_or_proto:
+import_or_preimport:
    PREIMPORT { $$ = 1; }
  | IMPORT { $$ = 2; }
  ;
diff --git a/nest/route.h b/nest/route.h
index 0de0e0f7..08df881f 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -211,6 +211,7 @@ struct rt_show_data {
   struct filter *filter;
   int verbose;
   struct fib_iterator fit;
+  struct proto *show_protocol;
   struct proto *import_protocol;
   int import_mode, primary_only;
   struct config *running_on_config;
diff --git a/nest/rt-table.c b/nest/rt-table.c
index 3fa52676..4a04a0ae 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -979,11 +979,13 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
       struct ea_list *tmpa, *old_tmpa;
       struct proto *p0 = e->attrs->proto;
       struct proto *p1 = d->import_protocol;
+      struct proto *p2 = d->show_protocol;
       d->rt_counter++;
       ee = e;
       rte_update_lock();		/* We use the update buffer for filtering */
       old_tmpa = tmpa = p0->make_tmp_attrs ? p0->make_tmp_attrs(e, rte_update_pool) : NULL;
       ok = (d->filter == FILTER_ACCEPT || f_run(d->filter, &e, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) <= F_ACCEPT);
+      if (p2 && p2 != p0) ok = 0;
       if (ok && d->import_mode)
 	{
 	  int ic = (p1->import_control ? p1->import_control(p1, &e, &tmpa, rte_update_pool) : 0);