mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-13 02:51:50 +00:00
Code Issues Releases Wiki Activity

Fix IPv6 NAT66 support

Browse source
This commit is contained in:
Ycarus 2019-03-11 19:35:49 +01:00
parent 0ba9a34100
commit d88541cddc
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -1189,12 +1189,12 @@ function set_ipv6_state(disable_ipv6)
if disable_ipv6 == "1" then if disable_ipv6 == "1" then
ucic:set("dhcp","lan","ra_default","0") ucic:set("dhcp","lan","ra_default","0")
ucic:set("network","lan","ipv6","0") ucic:set("network","lan","ipv6","0")
--else else
-- ucic:set("dhcp","lan","ra_default","1") -- ucic:set("dhcp","lan","ra_default","1")
ucic:set("network","lan","ipv6","1")
ucic:set("network","lan","delegate","0")
end end
ucic:set("network","lan","ipv6","0")
-- Disable/Enable IPv6 DHCP and change Shadowsocks listen address -- Disable/Enable IPv6 DHCP and change Shadowsocks listen address
if disable_ipv6 == "1" then if disable_ipv6 == "1" then
luci.sys.call("uci -q del dhcp.lan.dhcpv6") luci.sys.call("uci -q del dhcp.lan.dhcpv6")

7
luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
View file

@ -29,18 +29,19 @@ set_ipv6_state() {
uci -q set firewall.@defaults[0].disable_ipv6=$disable_ipv6 uci -q set firewall.@defaults[0].disable_ipv6=$disable_ipv6
uci -q commit firewall uci -q commit firewall
if [ "$disable_ipv6" == "1" ]; then if [ "$disable_ipv6" == "1" ]; then
uci -q set dhcp.lan.ra_default="0" uci -q set dhcp.lan.ra_default="0"
uci -q set network.lan.ipv6="0" uci -q set network.lan.ipv6="0"
fi
if [ "$disable_ipv6" == "1" ]; then
uci -q delete network.lan.ipv6 uci -q delete network.lan.ipv6
uci -q delete dhcp.lan.dhcpv6 uci -q delete dhcp.lan.dhcpv6
uci -q delete dhcp.lan.ra uci -q delete dhcp.lan.ra
uci -q delete dhcp.lan.ra_default uci -q delete dhcp.lan.ra_default
uci -q set shadowsocks-libev.hi.local_address="0.0.0.0" uci -q set shadowsocks-libev.hi.local_address="0.0.0.0"
else else
uci -q set dhcp.lan.ra_default="1"
uci -q set network.lan.ipv6="1"
uci -q set network.lan.delegate="0"
uci -q set shadowsocks-libev.hi.local_address="::" uci -q set shadowsocks-libev.hi.local_address="::"
fi fi
uci -q commit shadowsocks-libev uci -q commit shadowsocks-libev

1
openmptcprouter/files/etc/uci-defaults/1920-omr-network
View file

@ -96,6 +96,7 @@ set network.lan.ipaddr=192.168.100.1
set network.lan.netmask=255.255.255.0 set network.lan.netmask=255.255.255.0
set network.lan.ifname=${lanif} set network.lan.ifname=${lanif}
set network.lan.metric=2048 set network.lan.metric=2048
set network.lan.delegate=0
EOF EOF
uci -q batch <<-EOF uci -q batch <<-EOF

2
shadowsocks-libev/files/shadowsocks-libev.init
View file

@ -390,7 +390,7 @@ rules_up() {
config_foreach ss_rules_restart "$cfgtype" "$cfgtype" config_foreach ss_rules_restart "$cfgtype" "$cfgtype"
done done
ss_rules ss_rules
#[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "1" ] || ss_rules6 [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "1" ] || ss_rules6
[ -f /etc/init.d/omr-bypass ] && /etc/init.d/omr-bypass reload [ -f /etc/init.d/omr-bypass ] && /etc/init.d/omr-bypass reload
} }