From 41cb47aedd080c3636d18102d300b7004063237d Mon Sep 17 00:00:00 2001 From: Ycarus Date: Tue, 12 Feb 2019 19:46:52 +0100 Subject: [PATCH] revert Listen only on local IP for shadowsocks --- .../luasrc/controller/openmptcprouter.lua | 4 ++-- luci-app-openmptcprouter/root/etc/init.d/openmptcprouter | 4 ++-- openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks | 2 +- shadowsocks-libev/files/shadowsocks-libev.config | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index c407baff7..54bb2c5d9 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -1181,12 +1181,12 @@ function set_ipv6_state(disable_ipv6) luci.sys.call("uci -q del dhcp.lan.dhcpv6") luci.sys.call("uci -q del dhcp.lan.ra") luci.sys.call("uci -q del dhcp.lan.ra_default") - ucic:set("shadowsocks-libev","hi","local_address","127.0.0.1") + ucic:set("shadowsocks-libev","hi","local_address","0.0.0.0") else -- ucic:set("dhcp","lan","dhcpv6","server") -- ucic:set("dhcp","lan","ra","server") -- ucic:set("dhcp","lan","ra_default","1") - ucic:set("shadowsocks-libev","hi","local_address","::1") + ucic:set("shadowsocks-libev","hi","local_address","::") end ucic:save("dhcp") ucic:commit("dhcp") diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter index 325206fee..bd621b2ec 100755 --- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter @@ -39,9 +39,9 @@ set_ipv6_state() { uci -q delete dhcp.lan.dhcpv6 uci -q delete dhcp.lan.ra uci -q delete dhcp.lan.ra_default - uci -q set shadowsocks-libev.hi.local_address="127.0.0.1" + uci -q set shadowsocks-libev.hi.local_address="0.0.0.0" else - uci -q set shadowsocks-libev.hi.local_address="::1" + uci -q set shadowsocks-libev.hi.local_address="::" fi uci -q commit shadowsocks-libev uci -q commit dhcp diff --git a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks index 6688ac156..3cfc95b55 100755 --- a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks +++ b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks @@ -8,7 +8,7 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then uci -q batch <<-EOF >/dev/null set shadowsocks-libev.hi$c=ss_redir set shadowsocks-libev.hi$c.server=sss0 - set shadowsocks-libev.hi$c.local_address="127.0.0.1" + set shadowsocks-libev.hi$c.local_address="0.0.0.0" set shadowsocks-libev.hi$c.local_port=1100 set shadowsocks-libev.hi$c.mode=tcp_and_udp set shadowsocks-libev.hi$c.timeout=600 diff --git a/shadowsocks-libev/files/shadowsocks-libev.config b/shadowsocks-libev/files/shadowsocks-libev.config index a81514e95..ddb587807 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.config +++ b/shadowsocks-libev/files/shadowsocks-libev.config @@ -1,6 +1,6 @@ config ss_redir hi option server 'sss0' - option local_address '::1' + option local_address '::' option local_port '1100' option mode 'tcp_and_udp' option timeout '600' @@ -14,7 +14,7 @@ config ss_redir hi config ss_redir hi2 option server 'sss0' - option local_address '127.0.0.1' + option local_address '0.0.0.0' option local_port '1100' option mode 'tcp_and_udp' option timeout '600'