summaryrefslogtreecommitdiffstats
path: root/zebra/ipforward_proc.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-01-13 13:57:57 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-01-13 14:05:50 +0100
commit56c1f7d852de98aa5d752f9c7777ece660c26fdb (patch)
tree7cac20e7ea1d0ec6dd46a5398cd9b43643071b52 /zebra/ipforward_proc.c
parentMerge pull request #55 from donaldsharp/monotonic (diff)
downloadfrr-56c1f7d852de98aa5d752f9c7777ece660c26fdb.tar.xz
frr-56c1f7d852de98aa5d752f9c7777ece660c26fdb.zip
frr: Remove HAVE_IPV6 from code base
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/ipforward_proc.c')
-rw-r--r--zebra/ipforward_proc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/zebra/ipforward_proc.c b/zebra/ipforward_proc.c
index 2876eded3..910fd61d0 100644
--- a/zebra/ipforward_proc.c
+++ b/zebra/ipforward_proc.c
@@ -123,7 +123,6 @@ ipforward_off (void)
return ipforward ();
}
-#ifdef HAVE_IPV6
char proc_ipv6_forwarding[] = "/proc/sys/net/ipv6/conf/all/forwarding";
@@ -152,7 +151,7 @@ ipforward_ipv6_on (void)
FILE *fp;
if ( zserv_privs.change(ZPRIVS_RAISE) )
- zlog_err ("Can't raise privileges, %s", safe_strerror (errno));
+ zlog_err ("Can't raise privileges, %s", safe_strerror (errno));
fp = fopen (proc_ipv6_forwarding, "w");
@@ -172,13 +171,14 @@ ipforward_ipv6_on (void)
return ipforward_ipv6 ();
}
+
int
ipforward_ipv6_off (void)
{
FILE *fp;
if ( zserv_privs.change(ZPRIVS_RAISE) )
- zlog_err ("Can't raise privileges, %s", safe_strerror (errno));
+ zlog_err ("Can't raise privileges, %s", safe_strerror (errno));
fp = fopen (proc_ipv6_forwarding, "w");
@@ -197,4 +197,3 @@ ipforward_ipv6_off (void)
return ipforward_ipv6 ();
}
-#endif /* HAVE_IPV6 */