olsrd: don't mess with the system's ipv4/ipv6 forwarding settings
git-svn-id: svn://svn.openwrt.org/openwrt/packages@15309 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
19047ead01
commit
5e630739ce
34
net/olsrd/patches/100-no_forwarding_override.patch
Normal file
34
net/olsrd/patches/100-no_forwarding_override.patch
Normal file
@ -0,0 +1,34 @@
|
||||
--- a/src/linux/net.c
|
||||
+++ b/src/linux/net.c
|
||||
@@ -106,6 +106,7 @@ bind_socket_to_device(int sock, char *de
|
||||
int
|
||||
enable_ip_forwarding(int version)
|
||||
{
|
||||
+#if 0
|
||||
FILE *proc_fwd;
|
||||
const char *const procfile = version == AF_INET ? "/proc/sys/net/ipv4/ip_forward" : "/proc/sys/net/ipv6/conf/all/forwarding";
|
||||
|
||||
@@ -141,6 +142,7 @@ enable_ip_forwarding(int version)
|
||||
}
|
||||
fclose(proc_fwd);
|
||||
}
|
||||
+#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -267,6 +269,7 @@ restore_settings(int version)
|
||||
OLSR_PRINTF(1, "Restoring network state\n");
|
||||
|
||||
/* Restore IP forwarding to "off" */
|
||||
+#if 0
|
||||
if (orig_fwd_state == '0') {
|
||||
const char *const procfile = version == AF_INET ? "/proc/sys/net/ipv4/ip_forward" : "/proc/sys/net/ipv6/conf/all/forwarding";
|
||||
FILE *proc_fd;
|
||||
@@ -279,6 +282,7 @@ restore_settings(int version)
|
||||
fclose(proc_fd);
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* Restore global ICMP redirect setting */
|
||||
if (orig_global_redirect_state != '0') {
|
Loading…
x
Reference in New Issue
Block a user