diff options
author | Chris Hall <chris.hall@highwayman.com> | 2011-04-05 14:19:19 +0100 |
---|---|---|
committer | Chris Hall <chris.hall@highwayman.com> | 2011-04-05 14:19:19 +0100 |
commit | af22333d1ffeb1248b2234d7cec7b90d305c2190 (patch) | |
tree | cda8d78bc0f7db8b4727e5c6f30ce30dd12a3708 /lib | |
parent | e20f7ccd9e110fcd5deb945f8d23922efd8b0822 (diff) | |
download | quagga-af22333d1ffeb1248b2234d7cec7b90d305c2190.tar.bz2 quagga-af22333d1ffeb1248b2234d7cec7b90d305c2190.tar.xz |
Fix to include all new show commands from 0.99.18.
A couple of RESTRICTED_NODE entries went astray and have been
brought back into the fold.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/vty.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -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) |