diff --git a/package/cnsztl/luci-app-unblockneteasemusic/Makefile b/package/cnsztl/luci-app-unblockneteasemusic/Makefile index acde41b5cf..facd5d8edb 100644 --- a/package/cnsztl/luci-app-unblockneteasemusic/Makefile +++ b/package/cnsztl/luci-app-unblockneteasemusic/Makefile @@ -12,7 +12,7 @@ LUCI_DEPENDS:=+UnblockNeteaseMusic-nondanee +bash +dnsmasq-full +ipset LUCI_PKGARCH:=all PKG_NAME:=luci-app-unblockneteasemusic PKG_VERSION:=1.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:= diff --git a/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic b/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic index f30a8cb9a9..db09539fbe 100755 --- a/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -40,14 +40,15 @@ 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 -i br-lan -p tcp --dport 80 -j DNAT --to ${lan_addr}:${http_port} -iptables -t nat -A cloud_music -i br-lan -p tcp --dport 443 -j DNAT --to ${lan_addr}:${https_port} -iptables -t nat -A prerouting_rule -i br-lan -p tcp -m set --match-set music dst -j cloud_music +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 EOF /etc/init.d/firewall restart >/dev/null 2>&1 elif [ "${set_type}" = "stop" ]; then echo "" > /var/etc/unblockneteasemusic.include /etc/init.d/firewall restart >/dev/null 2>&1 + ipset destroy music rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic.conf" /etc/init.d/dnsmasq restart >/dev/null 2>&1 @@ -124,4 +125,4 @@ stop() set_type="stop" set_ipset set_hosts -} \ No newline at end of file +} diff --git a/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/logcheck.sh b/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/logcheck.sh old mode 100644 new mode 100755