2020-05-07 21:27:50

apps/koolproxy/config/koolproxy.uci

@@ -4,10 +4,10 @@ needver="0.0.1"
 supports="linux_arm,linux_mips,linux_x86_64"
 openport="1"
 backupfiles="config/kpcontrol.conf,bin/data/private,bin/data/certs"
-newinfo="修复kp进程无法关闭的bug"
+newinfo="修复bug"
 appinfo="简单，快速屏蔽网页或视频广告，TG：https://t.me/joinchat/AAAAAD-tO7GPvfOU131_vg"
 kp_rule_koolproxy="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/koolproxy.txt"
 kp_rule_daily="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/daily.txt"
 kp_rule_dat="https://houzi-.coding.net/p/my_dream/d/my_dream/git/raw/master/kp.dat"
 kp_rule_user="https://raw.githubusercontent.com/kysdm/ad-rules/master/user-rules-koolproxy.txt"
-version="1.5.7"
+version="1.5.8"

apps/koolproxy/scripts/koolproxy.sh

@@ -2,6 +2,8 @@
 source /etc/mixbox/bin/base
 eval `mbdb export koolproxy`
 
+koolproxy_acl_default_mode=${koolproxy_acl_default_mode:-1}
+
 # 1|koolproxy.txt|https://kprule.com/koolproxy.txt|静态规则
 # 1|daily.txt|https://kprule.com/daily.txt|每日规则
 # 1|kp.dat|https://kprule.com/kp.dat|视频规则
@@ -165,7 +167,6 @@ lan_acess_control () {
         logsh "【$service】" "加载ACL规则:【$proxy_name】模式为:$(get_mode_name $proxy_mode)"
         iptables -t nat -A KOOLPROXY $(factor $mac "-m mac --mac-source") -p tcp $(get_jump_mode $proxy_mode) $(get_action_chain $proxy_mode)
     done
-    koolproxy_acl_default_mode=$(mbdb get ${appname}.main.koolproxy_acl_default_mode) || koolproxy_acl_default_mode=1
     logsh "【$service】" "加载ACL规则:其余主机模式为:$(get_mode_name $koolproxy_acl_default_mode)"
 }