diff options
| -rw-r--r-- | bgpd/bgp_route.c | 4 | ||||
| -rw-r--r-- | lib/vty.c | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 89bdef77..14c743b4 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -5039,7 +5039,7 @@ ALIAS_DEPRECATED (bgp_network_mask_natural, ALIAS_DEPRECATED (bgp_network_mask_natural_backdoor, bgp_network_mask_natural_backdoor_ttl_cmd, - "network A.B.C.D backdoor pathlimit (1-255>", + "network A.B.C.D backdoor pathlimit <1-255>", "Specify a network to announce via BGP\n" "Network number\n" "Specify a BGP backdoor route\n" @@ -13463,8 +13463,10 @@ bgp_route_init (void) */ install_element (RESTRICTED_NODE, &show_bgp_route_cmd); install_element (RESTRICTED_NODE, &show_bgp_ipv6_route_cmd); + install_element (RESTRICTED_NODE, &show_bgp_ipv6_safi_route_cmd); install_element (RESTRICTED_NODE, &show_bgp_prefix_cmd); install_element (RESTRICTED_NODE, &show_bgp_ipv6_prefix_cmd); + install_element (RESTRICTED_NODE, &show_bgp_ipv6_safi_prefix_cmd); install_element (RESTRICTED_NODE, &show_bgp_community_cmd); install_element (RESTRICTED_NODE, &show_bgp_ipv6_community_cmd); install_element (RESTRICTED_NODE, &show_bgp_community2_cmd); @@ -1291,6 +1291,7 @@ vty_read_file (FILE *confp, struct cmd_element* first_cmd, bool ignore_warnings) { enum cmd_return_code ret ; struct vty *vty ; + qtime_t taking ; /* Set up configuration file reader VTY -- which buffers all output */ vty = vty_open(VTY_CONFIG_READ); @@ -1302,10 +1303,18 @@ vty_read_file (FILE *confp, struct cmd_element* first_cmd, bool ignore_warnings) qs_need(&vty->vio->clx, VTY_BUFSIZ) ; vty->buf = qs_chars(&vty->vio->clx) ; + taking = qt_get_monotonic() ; + /* Execute configuration file */ ret = config_from_file (vty, confp, first_cmd, &vty->vio->clx, ignore_warnings) ; + taking = (qt_get_monotonic() - taking) / (QTIME_SECOND / 1000) ; + + zlog_info("Finished reading configuration in %d.%dsecs%s", + (int)(taking / 1000), (int)(taking % 1000), + (ret == CMD_SUCCESS) ? "." : " -- FAILED") ; + VTY_LOCK() ; if (ret != CMD_SUCCESS) |