summaryrefslogtreecommitdiff
path: root/zebra
diff options
context:
space:
mode:
authorpaul <paul>2004-08-23 18:58:32 +0000
committerpaul <paul>2004-08-23 18:58:32 +0000
commit3e0b3a56217dab13b26e7f7fd634e7450dde55e2 (patch)
treed62322ccbe368d643300ae71a6a53db21ebe4c94 /zebra
parent0b7787c542aa8470797a473c5dae8a8fb2b3cfcb (diff)
2004-08-23 Paul Jakma <paul@dishone.st>
* zebra/zserv.c: (zebra_init) remove implicit ip forward enabling * NEWS: warn about forwarding change
Diffstat (limited to 'zebra')
-rw-r--r--zebra/ChangeLog4
-rw-r--r--zebra/zserv.c14
2 files changed, 8 insertions, 10 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 0b54f29a..82cc951b 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-23 Paul Jakma <paul@dishone.st>
+
+ * zserv.c: (zebra_init) remove implicit ip forward enabling
+
2004-08-19 Paul Jakma <paul@dishone.st>
* irdp_main.c: update to match sockopt renames.
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 3c582afb..4779b643 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1676,11 +1676,11 @@ DEFUN (no_ipv6_forwarding,
int
config_write_forwarding (struct vty *vty)
{
- if (! ipforward ())
- vty_out (vty, "no ip forwarding%s", VTY_NEWLINE);
+ if (ipforward ())
+ vty_out (vty, "ip forwarding%s", VTY_NEWLINE);
#ifdef HAVE_IPV6
- if (! ipforward_ipv6 ())
- vty_out (vty, "no ipv6 forwarding%s", VTY_NEWLINE);
+ if (ipforward_ipv6 ())
+ vty_out (vty, "ipv6 forwarding%s", VTY_NEWLINE);
#endif /* HAVE_IPV6 */
vty_out (vty, "!%s", VTY_NEWLINE);
return 0;
@@ -1702,12 +1702,6 @@ zebra_init ()
/* Client list init. */
zebrad.client_list = list_new ();
- /* Forwarding is on by default. */
- ipforward_on ();
-#ifdef HAVE_IPV6
- ipforward_ipv6_on ();
-#endif /* HAVE_IPV6 */
-
/* Make zebra server socket. */
#ifdef HAVE_TCP_ZEBRA
zebra_serv ();