diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/routemap.c | 22 | ||||
| -rw-r--r-- | lib/routemap.h | 3 |
2 files changed, 12 insertions, 13 deletions
diff --git a/lib/routemap.c b/lib/routemap.c index 55cc33c7..f379a4c7 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -268,6 +268,11 @@ vty_show_route_map (struct vty *vty, const char *name) return CMD_WARNING; } } + else + { + for (map = route_map_master.head; map; map = map->next) + vty_show_route_map_entry (vty, map); + } return CMD_SUCCESS; } @@ -1135,23 +1140,17 @@ ALIAS (no_rmap_onmatch_goto, "Continue on a different entry within the route-map\n" "Route-map entry sequence number\n") -DEFUN (rmap_show, - rmap_show_cmd, - "show route-map", - SHOW_STR - "route-map information\n") -{ - return vty_show_route_map (vty, NULL); -} - DEFUN (rmap_show_name, rmap_show_name_cmd, - "show route-map WORD", + "show route-map [WORD]", SHOW_STR "route-map information\n" "route-map name\n") { - return vty_show_route_map (vty, argv[0]); + char *name = NULL; + if (argc) + name = argv[0]; + return vty_show_route_map (vty, name); } ALIAS (rmap_onmatch_goto, @@ -1322,6 +1321,5 @@ route_map_init_vty (void) install_element (RMAP_NODE, &no_rmap_description_cmd); /* Install show command */ - install_element (ENABLE_NODE, &rmap_show_cmd); install_element (ENABLE_NODE, &rmap_show_name_cmd); } diff --git a/lib/routemap.h b/lib/routemap.h index c9cf4410..321e1927 100644 --- a/lib/routemap.h +++ b/lib/routemap.h @@ -45,7 +45,8 @@ typedef enum RMAP_RIPNG, RMAP_OSPF, RMAP_OSPF6, - RMAP_BGP + RMAP_BGP, + RMAP_ZEBRA } route_map_object_t; typedef enum |