diff --git a/package/jsda/luci-app-koolproxy/files/etc/config/koolproxy b/package/jsda/luci-app-koolproxy/files/etc/config/koolproxy index 8d638491fa..8ba0bad118 100755 --- a/package/jsda/luci-app-koolproxy/files/etc/config/koolproxy +++ b/package/jsda/luci-app-koolproxy/files/etc/config/koolproxy @@ -8,6 +8,7 @@ config global option koolproxy_host '1' option koolproxy_rules 'fanboy.txt easylistchina.txt yhosts.txt kp.dat user.txt' option enabled '0' + option koolproxy_ipv6 '0' config rss_rule option load '1' diff --git a/package/jsda/luci-app-koolproxy/files/etc/init.d/koolproxy b/package/jsda/luci-app-koolproxy/files/etc/init.d/koolproxy index dd0e606aac..974ca87494 100755 --- a/package/jsda/luci-app-koolproxy/files/etc/init.d/koolproxy +++ b/package/jsda/luci-app-koolproxy/files/etc/init.d/koolproxy @@ -124,6 +124,7 @@ load_config() { koolproxy_acl_default=$(config_t_get global koolproxy_acl_default 1) koolproxy_port=$(config_t_get global koolproxy_port 0) koolproxy_bp_port=$(config_t_get global koolproxy_bp_port) + koolproxy_ipv6=$(config_t_get global koolproxy_ipv6 0) config_load $CONFIG return 1 } @@ -317,6 +318,7 @@ load_nat() { else iptables -t nat -A KP_ALL_PORT -p tcp -m set --match-set kp_full_port dst -j REDIRECT --to-ports 3000 fi + [ "$koolproxy_ipv6" == "1" ] && ip6tables -t nat -I PREROUTING -p tcp -j REDIRECT --to-ports 3000 # 局域网控制 lan_acess_control # 剩余流量转发到缺省规则定义的链中 @@ -359,6 +361,7 @@ flush_nat() { iptables -t nat -X KP_ALL_PORT > /dev/null 2>&1 ipset -F black_koolproxy > /dev/null 2>&1 && ipset -X black_koolproxy > /dev/null 2>&1 ipset -F white_kp_list > /dev/null 2>&1 && ipset -X white_kp_list > /dev/null 2>&1 + ip6tables -t nat -D PREROUTING -p tcp -j REDIRECT --to-ports 3000 > /dev/null 2>&1 } export_ipt_rules() { @@ -425,6 +428,7 @@ start_service() { procd_set_param command /usr/share/koolproxy/koolproxy procd_append_param command --mark procd_append_param command --ttl 160 + procd_append_param command --ipv6 procd_set_param respawn diff --git a/package/jsda/luci-app-koolproxy/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua b/package/jsda/luci-app-koolproxy/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua index bbc10fb1cf..31069103cd 100644 --- a/package/jsda/luci-app-koolproxy/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua +++ b/package/jsda/luci-app-koolproxy/files/usr/lib/lua/luci/model/cbi/koolproxy/global.lua @@ -62,6 +62,12 @@ e.rmempty = false e:value(0, translate("关闭")) e:value(1, translate("开启")) +e = t:taboption("base", ListValue, "koolproxy_ipv6", translate("IPv6支持(一刀切,有副作用)")) +e.default = 0 +e.rmempty = false +e:value(0, translate("关闭")) +e:value(1, translate("开启")) + e = t:taboption("base", Value, "koolproxy_bp_port", translate("例外端口")) e:depends("koolproxy_port", "1") e.rmempty = false diff --git a/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/data/source.list b/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/data/source.list index b381ef3fda..92f7c5b9ac 100644 --- a/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/data/source.list +++ b/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/data/source.list @@ -2,5 +2,4 @@ 0|kp.dat|https://raw.githubusercontent.com/user1121114685/koolproxyR_rule_list/master/kp.dat|视频规则 0|user.txt||自定义规则 0|easylistchina.txt|https://github.com/user1121114685/koolproxyR/raw/master/koolproxyR/koolproxyR/data/rules/easylistchina.txt|ABP规则 -0|chengfeng.txt|https://kprule.com/chengfeng.txt|乘风规则 0|fanboy.txt|https://github.com/user1121114685/koolproxyR/raw/master/koolproxyR/koolproxyR/data/rules/fanboy-annoyance.txt|Fanboy规则