From 0eda3dde2c64f9d5216470d575614d4ea180bb68 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 4 Feb 2020 18:08:57 +0800 Subject: [PATCH] luci-app-unblockneteasemusic: sync with upstream source --- .../root/etc/init.d/unblockneteasemusic | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic index 0f41eb072e..f15c6ba060 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -40,40 +40,40 @@ set_ipset(){ rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf" cat <<-EOF > "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf" dhcp-option=252,http://${lan_addr}:${http_port}/proxy.pac -ipset=/.music.163.com/music -ipset=/interface.music.163.com/music -ipset=/interface3.music.163.com/music -ipset=/apm.music.163.com/music -ipset=/apm3.music.163.com/music +ipset=/.music.163.com/neteasemusic +ipset=/interface.music.163.com/neteasemusic +ipset=/interface3.music.163.com/neteasemusic +ipset=/apm.music.163.com/neteasemusic +ipset=/apm3.music.163.com/neteasemusic EOF - /etc/init.d/dnsmasq restart > "/dev/null" 2>&1 + /etc/init.d/dnsmasq reload > "/dev/null" 2>&1 - if ! ipset list music > "/dev/null"; then ipset create music hash:ip; fi + if ! ipset list "neteasemusic" > "/dev/null"; then ipset create "neteasemusic" hash:ip; fi curl -s "http://httpdns.n.netease.com/httpdns/v2/d?domain=music.163.com,interface.music.163.com,interface3.music.163.com,apm.music.163.com,apm3.music.163.com,clientlog.music.163.com,clientlog3.music.163.com" |grep -Eo '[0-9]+?\.[0-9]+?\.[0-9]+?\.[0-9]+?' |sort |uniq |awk '{print "ipset add music "$1}' |bash > "/dev/null" 2>&1 - iptables -t nat -N cloud_music - iptables -t nat -A cloud_music -d 0.0.0.0/8 -j RETURN - iptables -t nat -A cloud_music -d 10.0.0.0/8 -j RETURN - iptables -t nat -A cloud_music -d 127.0.0.0/8 -j RETURN - iptables -t nat -A cloud_music -d 169.254.0.0/16 -j RETURN - iptables -t nat -A cloud_music -d 172.16.0.0/12 -j RETURN - iptables -t nat -A cloud_music -d 192.168.0.0/16 -j RETURN - iptables -t nat -A cloud_music -d 224.0.0.0/4 -j RETURN - iptables -t nat -A cloud_music -d 240.0.0.0/4 -j RETURN - iptables -t nat -A cloud_music -p tcp --dport 80 -j REDIRECT --to-ports "${http_port}" - iptables -t nat -A cloud_music -p tcp --dport 443 -j REDIRECT --to-ports "${https_port}" - iptables -t nat -I PREROUTING -p tcp -m set --match-set music dst -j cloud_music + iptables -t nat -N "netease_cloud_music" + iptables -t nat -A "netease_cloud_music" -d "0.0.0.0/8" -j RETURN + iptables -t nat -A "netease_cloud_music" -d "10.0.0.0/8" -j RETURN + iptables -t nat -A "netease_cloud_music" -d "127.0.0.0/8" -j RETURN + iptables -t nat -A "netease_cloud_music" -d "169.254.0.0/16" -j RETURN + iptables -t nat -A "netease_cloud_music" -d "172.16.0.0/12" -j RETURN + iptables -t nat -A "netease_cloud_music" -d "192.168.0.0/16" -j RETURN + iptables -t nat -A "netease_cloud_music" -d "224.0.0.0/4" -j RETURN + iptables -t nat -A "netease_cloud_music" -d "240.0.0.0/4" -j RETURN + iptables -t nat -A "netease_cloud_music" -p tcp --dport 80 -j REDIRECT --to-ports "${http_port}" + iptables -t nat -A "netease_cloud_music" -p tcp --dport 443 -j REDIRECT --to-ports "${https_port}" + iptables -t nat -I PREROUTING -p tcp -m set --match-set "neteasemusic" dst -j "netease_cloud_music" - mkdir -p /var/etc + mkdir -p "/var/etc/" echo -e "/etc/init.d/unblockneteasemusic restart" > "/var/etc/unblockneteasemusic.include" elif [ "${set_type}" = "stop" ]; then - iptables -t nat -D PREROUTING -p tcp -m set --match-set music dst -j cloud_music - iptables -t nat -F cloud_music - iptables -t nat -X cloud_music - ipset destroy music + iptables -t nat -D PREROUTING -p tcp -m set --match-set "neteasemusic" dst -j "netease_cloud_music" + iptables -t nat -F "netease_cloud_music" + iptables -t nat -X "netease_cloud_music" + ipset destroy "neteasemusic" echo "" > "/var/etc/unblockneteasemusic.include" rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf" - /etc/init.d/dnsmasq restart > "/dev/null" 2>&1 + /etc/init.d/dnsmasq reload > "/dev/null" 2>&1 fi } @@ -90,14 +90,14 @@ address=/apm.music.163.com/${lan_addr} address=/apm3.music.163.com/${lan_addr} address=/music.httpdns.c.163.com/0.0.0.0 EOF - /etc/init.d/dnsmasq restart > "/dev/null" 2>&1 + /etc/init.d/dnsmasq reload > "/dev/null" 2>&1 - ip route add 223.252.199.10 dev lo + ip route add "223.252.199.10" dev lo elif [ "${set_type}" = "stop" ]; then rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf" - /etc/init.d/dnsmasq restart > "/dev/null" 2>&1 + /etc/init.d/dnsmasq reload > "/dev/null" 2>&1 - ip route del 223.252.199.10 + ip route del "223.252.199.10" fi } @@ -106,7 +106,7 @@ set_ports(){ iptables -I INPUT -p tcp --dport "${http_port}" -j ACCEPT iptables -I INPUT -p tcp --dport "${https_port}" -j ACCEPT - mkdir -p /var/etc + mkdir -p "/var/etc/" echo -e "/etc/init.d/unblockneteasemusic restart" > "/var/etc/unblockneteasemusic.include" elif [ "${set_type}" = "stop" ]; then iptables -D INPUT -p tcp --dport "${http_port}" -j ACCEPT @@ -169,7 +169,7 @@ stop() /etc/init.d/cron restart > "/dev/null" 2>&1 sed -i '/unblockneteasemusic/d' "/etc/sysupgrade.conf" - [ "${keep_core_when_upgrade}" -eq 1 ] && { echo "/usr/share/unblockneteasemusic/core/" >> "/etc/sysupgrade.conf"; echo "/usr/share/unblockneteasemusic/local_ver" >> "/etc/sysupgrade.conf"; } + [ "${keep_core_when_upgrade}" -eq "1" ] && { echo "/usr/share/unblockneteasemusic/core/" >> "/etc/sysupgrade.conf"; echo "/usr/share/unblockneteasemusic/local_ver" >> "/etc/sysupgrade.conf"; } rm -f "/tmp/unblockneteasemusic.log"