From 6ae0e7c53c8d6a9fab1e385f6e81b82af356f87e Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 28 Dec 2019 19:20:43 +0800 Subject: [PATCH] luci-app-unblockneteasemusic-mini: sync with uostream source --- .../luci-app-unblockneteasemusic-mini/Makefile | 2 +- .../controller/unblockneteasemusic-mini.lua | 2 +- .../root/etc/init.d/unblockneteasemusic-mini | 15 +-------------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile index 26acc93bac..f42e816d28 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockneteasemusic-mini PKG_VERSION:=1.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 LUCI_TITLE:=LuCI support for UnblockNeteaseMusic LUCI_DEPENDS:=+busybox +dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua index a7e25394cc..73460b723c 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/controller/unblockneteasemusic-mini.lua @@ -10,7 +10,7 @@ function index() end local page - page = entry({"admin", "services", "unblockneteasemusic-mini"}, cbi("unblockneteasemusic-mini"), _("解除网易云音乐播放限制"), 100) + page = entry({"admin", "services", "unblockneteasemusic-mini"}, cbi("unblockneteasemusic-mini"), _("解除网易云音乐播放限制 (Mini)"), 100) page.dependent = true entry({"admin", "services", "unblockneteasemusic-mini", "status"},call("act_status")).leaf=true end diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini index bd0487ef56..e02d1f6da3 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini @@ -44,20 +44,7 @@ ipset=/apm3.music.163.com/music mkdir -p /var/etc cat <<-EOF >> "/var/etc/unblockneteasemusic-mini.include" -if ! ipset list music >/dev/null; then ipset create music hash:ip; fi -wget -O- "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}' |sh - iptables -t nat -N unblock_netease_music - iptables -t nat -A unblock_netease_music -d 0.0.0.0/8 -j RETURN - iptables -t nat -A unblock_netease_music -d 10.0.0.0/8 -j RETURN - iptables -t nat -A unblock_netease_music -d 127.0.0.0/8 -j RETURN - iptables -t nat -A unblock_netease_music -d 169.254.0.0/16 -j RETURN - iptables -t nat -A unblock_netease_music -d 172.16.0.0/12 -j RETURN - iptables -t nat -A unblock_netease_music -d 192.168.0.0/16 -j RETURN - iptables -t nat -A unblock_netease_music -d 224.0.0.0/4 -j RETURN - iptables -t nat -A unblock_netease_music -d 240.0.0.0/4 -j RETURN - iptables -t nat -A unblock_netease_music -p tcp --dport 80 -j DNAT --to ${unblock_server_ip}:${unblock_server_http_port} - iptables -t nat -A unblock_netease_music -p tcp --dport 443 -j DNAT --to ${unblock_server_ip}:${unblock_server_https_port} - iptables -t nat -I PREROUTING -p tcp -m set --match-set music dst -j unblock_netease_music +/etc/init.d/luci-app-unblockneteasemusic-mini restart EOF elif [ "${set_type}" = "stop" ]; then iptables -t nat -D PREROUTING -p tcp -m set --match-set music dst -j unblock_netease_music