From d400486667da612ae86acfd67ea17f59e699fa78 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 28 Dec 2019 19:21:21 +0800 Subject: [PATCH] luci-app-unblockneteasemusic: sync with uostream source --- .../luci-app-unblockneteasemusic/Makefile | 2 +- .../root/etc/init.d/unblockneteasemusic | 22 ++++--------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/package/ctcgfw/luci-app-unblockneteasemusic/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic/Makefile index 20e336e569..56eabf43b5 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic/Makefile @@ -12,7 +12,7 @@ LUCI_DEPENDS:=+bash +busybox +coreutils-nohup +curl +dnsmasq-full +ipset +libope LUCI_PKGARCH:=all PKG_NAME:=luci-app-unblockneteasemusic PKG_VERSION:=2.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt 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 7d9b6ae66e..7a6ab553d8 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -55,21 +55,8 @@ ipset=/apm3.music.163.com/music iptables -t nat -I PREROUTING -p tcp -m set --match-set music dst -j cloud_music mkdir -p /var/etc - cat <<-EOF >> "/var/etc/unblockneteasemusic.include" -if ! ipset list music > "/dev/null"; then ipset create music 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 + cat <<-EOF > "/var/etc/unblockneteasemusic.include" +/etc/init.d/unblockneteasemusic EOF elif [ "${set_type}" = "stop" ]; then iptables -t nat -D PREROUTING -p tcp -m set --match-set music dst -j cloud_music @@ -117,9 +104,8 @@ set_ports(){ iptables -I INPUT -p tcp --dport "${https_port}" -j ACCEPT mkdir -p /var/etc - cat <<-EOF >> "/var/etc/unblockneteasemusic.include" -iptables -I INPUT -p tcp --dport "${http_port}" -j ACCEPT -iptables -I INPUT -p tcp --dport "${https_port}" -j ACCEPT + cat <<-EOF > "/var/etc/unblockneteasemusic.include" +/etc/init.d/unblockneteasemusic EOF elif [ "${set_type}" = "stop" ]; then iptables -D INPUT -p tcp --dport "${http_port}" -j ACCEPT