diff options
| author | Denis Ovsienko <infrastation@yandex.ru> | 2012-02-14 12:12:03 +0100 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2012-03-25 18:06:54 +0200 |
| commit | cbde15513ba47f6e7f6d02fcafcfb12cd5b1df77 (patch) | |
| tree | 97c9fbd49c65207ca878237d7668ba51cb472f9d | |
| parent | babeld: consolidate zebra interface into fewer functions. (diff) | |
| download | frr-cbde15513ba47f6e7f6d02fcafcfb12cd5b1df77.tar.xz frr-cbde15513ba47f6e7f6d02fcafcfb12cd5b1df77.zip | |
babeld: 3 more timing statements in config text
This commit makes the following lines visible in running-config text,
when respective intervals are configured to non-default values:
* babel hello-interval
* babel update-interval
* babel resend-delay
| -rw-r--r-- | babeld/babel_interface.c | 10 | ||||
| -rw-r--r-- | babeld/babel_main.c | 2 | ||||
| -rw-r--r-- | babeld/babeld.c | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index 00d53bc67..958b1b984 100644 --- a/babeld/babel_interface.c +++ b/babeld/babel_interface.c @@ -986,6 +986,16 @@ interface_config_write (struct vty *vty) vty_out (vty, " babel split-horizon%s", VTY_NEWLINE); write++; } + if (babel_ifp->hello_interval != BABEL_DEFAULT_HELLO_INTERVAL) + { + vty_out (vty, " babel hello-interval %u%s", babel_ifp->hello_interval, VTY_NEWLINE); + write++; + } + if (babel_ifp->update_interval != BABEL_DEFAULT_UPDATE_INTERVAL) + { + vty_out (vty, " babel update-interval %u%s", babel_ifp->update_interval, VTY_NEWLINE); + write++; + } } vty_out (vty, "!%s", VTY_NEWLINE); write++; diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 0fcba749d..003d746b0 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -521,7 +521,6 @@ show_babel_main_configuration (struct vty *vty) "vty port = %d%s" "id = %s%s" "parasitic = %s%s" - "resend-delay = %d%s" "allow_duplicates = %s%s" "kernel_metric = %d%s", pidfile, VTY_NEWLINE, @@ -536,7 +535,6 @@ show_babel_main_configuration (struct vty *vty) babel_vty_port, VTY_NEWLINE, format_eui64(myid), VTY_NEWLINE, format_bool(parasitic), VTY_NEWLINE, - resend_delay, VTY_NEWLINE, format_bool(allow_duplicates), VTY_NEWLINE, kernel_metric, VTY_NEWLINE); } diff --git a/babeld/babeld.c b/babeld/babeld.c index 9fea2e101..1ae3f042c 100644 --- a/babeld/babeld.c +++ b/babeld/babeld.c @@ -102,6 +102,11 @@ babel_config_write (struct vty *vty) if (!babel_routing_process) return lines; vty_out (vty, "router babel%s", VTY_NEWLINE); + if (resend_delay != BABEL_DEFAULT_RESEND_DELAY) + { + vty_out (vty, " babel resend-delay %u%s", resend_delay, VTY_NEWLINE); + lines++; + } /* list enabled interfaces */ lines = 1 + babel_enable_if_config_write (vty); /* list redistributed protocols */ |