[lib] 'show route-map' should print call action seperate from exit policy

2005-11-12 Paul Jakma <paul.jakma@sun.com>

	* routemap.c: (vty_show_route_map_entry) call action is
	  seperate from exit action, latter should still be printed
	  regardless of whether a call is specified.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index c0c841671caad2b366e9c07d01f5092fde41e8d2..106de4772ccdc110fb82628cb6d538a8aa0a6718 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-12 Paul Jakma <paul.jakma@sun.com>
+
+       * routemap.c: (vty_show_route_map_entry) call action is
+         seperate from exit action, latter should still be printed
+         regardless of whether a call is specified.
+
 2005-11-03 Paul Jakma <paul.jakma@sun.com>
 
        * zebra.h: BSD BYTE_ORDER define isn't available everywhere,

diff --git a/lib/routemap.c b/lib/routemap.c
index 85491ead783581949bb1491548451f55b4b5d297..55cc33c775fa8bd26d7cd6865df21b63e25e4d1e 100644 (file)
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -232,20 +232,17 @@ vty_show_route_map_entry (struct vty *vty, struct route_map *map)
         vty_out (vty, "    %s %s%s",
                  rule->cmd->str, rule->rule_str, VTY_NEWLINE);
       
-      vty_out (vty, "  Action:%s", VTY_NEWLINE);
-      
+      /* Call clause */
+      vty_out (vty, "  Call clause:%s", VTY_NEWLINE);
       if (index->nextrm)
         vty_out (vty, "    Call %s%s", index->nextrm, VTY_NEWLINE);
-      else if (index->exitpolicy == RMAP_GOTO)
+      
+      /* Exit Policy */
+      vty_out (vty, "  Action:%s", VTY_NEWLINE);
+      if (index->exitpolicy == RMAP_GOTO)
         vty_out (vty, "    Goto %d%s", index->nextpref, VTY_NEWLINE);
       else if (index->exitpolicy == RMAP_NEXT)
-        {
-          vty_out (vty, "    Goto next, (entry ");
-          if (index->next)
-            vty_out (vty, " %d)%s", index->next->pref, VTY_NEWLINE);
-          else
-            vty_out (vty, " undefined)%s", VTY_NEWLINE);
-        }
+        vty_out (vty, "    Continue to next entry%s", VTY_NEWLINE);
       else if (index->exitpolicy == RMAP_EXIT)
         vty_out (vty, "    Exit routemap%s", VTY_NEWLINE);
     }