mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Fix IPv6 support by not using sysctl

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-11-07 18:48:54 +01:00
parent 6599a5296b
commit 5e74ee695f
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
omr-6in4/files/etc/init.d/omr-6in4
View file

@ -17,9 +17,11 @@ set_shadowsocks_address() {
set_ipv6_state() { set_ipv6_state() {
local disable_ipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)" local disable_ipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)"
[ -z "$disable_ipv6" ] && disable_ipv6="1" [ -z "$disable_ipv6" ] && disable_ipv6="1"
previous=$(sysctl -qn net.ipv6.conf.all.disable_ipv6 | tr -d "\n") #previous=$(sysctl -qn net.ipv6.conf.all.disable_ipv6 | tr -d "\n")
sysctl -qw net.ipv6.conf.all.disable_ipv6=$disable_ipv6 previous="$(uci get network.lan.ipv6)"
sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*:net.ipv6.conf.all.disable_ipv6=$disable_ipv6:" /etc/sysctl.d/zzz_openmptcprouter.conf #sysctl -qw net.ipv6.conf.all.disable_ipv6=$disable_ipv6
#sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*:net.ipv6.conf.all.disable_ipv6=$disable_ipv6:" /etc/sysctl.d/zzz_openmptcprouter.conf
sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*::" /etc/sysctl.d/zzz_openmptcprouter.conf
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set firewall.@defaults[0].disable_ipv6=$disable_ipv6 set firewall.@defaults[0].disable_ipv6=$disable_ipv6
@ -82,14 +84,14 @@ set_ipv6_state() {
commit shadowsocks-libev commit shadowsocks-libev
EOF EOF
/etc/init.d/odhcpd restart /etc/init.d/odhcpd restart
if [ "$previous" != "$disable_ipv6" ]; then if [ "$previous" != "1" ]; then
env -i /bin/ubus call network reload env -i /bin/ubus call network reload
fi fi
} }
start_service() { start_service() {
[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "$(sysctl -n net.ipv6.conf.all.disable_ipv6)" ] && set_ipv6_state [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get network.lan.ipv6)" != "1" ] && set_ipv6_state
[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "1" ] && { [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "1" ] && {
ifdown omr6in4 ifdown omr6in4
return return