* zserv.c: Remove useless warnings "forwarding is already on".

This commit is contained in:
hasso 2004-10-13 12:20:35 +00:00
parent c75105ab6e
commit b71f00f23b
2 changed files with 9 additions and 26 deletions

View File

@ -2,6 +2,7 @@
* zebra_snmp.c: Remove defaults used to initialize smux connection to
snmpd. Connection is initialized only if smux peer is configured.
* zserv.c: Remove useless warnings "forwarding is already on".
2004-10-12 Hasso Tepper <hasso at quagga.net>

View File

@ -1552,14 +1552,9 @@ DEFUN (ip_forwarding,
int ret;
ret = ipforward ();
if (ret == 0)
ret = ipforward_on ();
if (ret != 0)
{
vty_out (vty, "IP forwarding is already on%s", VTY_NEWLINE);
return CMD_ERR_NOTHING_TODO;
}
ret = ipforward_on ();
if (ret == 0)
{
vty_out (vty, "Can't turn on IP forwarding%s", VTY_NEWLINE);
@ -1579,14 +1574,9 @@ DEFUN (no_ip_forwarding,
int ret;
ret = ipforward ();
if (ret != 0)
ret = ipforward_off ();
if (ret == 0)
{
vty_out (vty, "IP forwarding is already off%s", VTY_NEWLINE);
return CMD_ERR_NOTHING_TODO;
}
ret = ipforward_off ();
if (ret != 0)
{
vty_out (vty, "Can't turn off IP forwarding%s", VTY_NEWLINE);
@ -1692,13 +1682,9 @@ DEFUN (ipv6_forwarding,
int ret;
ret = ipforward_ipv6 ();
if (ret != 0)
{
vty_out (vty, "IPv6 forwarding is already on%s", VTY_NEWLINE);
return CMD_ERR_NOTHING_TODO;
}
if (ret == 0)
ret = ipforward_ipv6_on ();
ret = ipforward_ipv6_on ();
if (ret == 0)
{
vty_out (vty, "Can't turn on IPv6 forwarding%s", VTY_NEWLINE);
@ -1718,13 +1704,9 @@ DEFUN (no_ipv6_forwarding,
int ret;
ret = ipforward_ipv6 ();
if (ret == 0)
{
vty_out (vty, "IP forwarding is already off%s", VTY_NEWLINE);
return CMD_ERR_NOTHING_TODO;
}
if (ret != 0)
ret = ipforward_ipv6_off ();
ret = ipforward_ipv6_off ();
if (ret != 0)
{
vty_out (vty, "Can't turn off IPv6 forwarding%s", VTY_NEWLINE);