zebra: Suppress 'ip forwarding' in configuration output

Since IP forwarding is enabled by default on Quagga startup, it
makes more sense to only explicitly report the state of this
setting when it is disabled. Inverted the relevant printouts.

Ticket: CM-11462

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2016-06-21 19:57:22 +00:00
parent 556b904e5d
commit f40dd648c9

View File

@ -2670,11 +2670,11 @@ config_write_forwarding (struct vty *vty)
/* FIXME: Find better place for that. */
router_id_write (vty);
if (ipforward ())
vty_out (vty, "ip forwarding%s", VTY_NEWLINE);
if (!ipforward ())
vty_out (vty, "no ip forwarding%s", VTY_NEWLINE);
#ifdef HAVE_IPV6
if (ipforward_ipv6 ())
vty_out (vty, "ipv6 forwarding%s", VTY_NEWLINE);
if (!ipforward_ipv6 ())
vty_out (vty, "no ipv6 forwarding%s", VTY_NEWLINE);
#endif /* HAVE_IPV6 */
vty_out (vty, "!%s", VTY_NEWLINE);
return 0;