Merge pull request #118 from Mattraks/data

Fix Netflix gfw2ipset error

luci-app-ssr-plus/root/etc/ssr/china_ssr.txt

@@ -1065,7 +1065,6 @@
 45.114.52.0/22
 45.114.96.0/22
 45.114.104.0/22
-45.114.108.0/22
 45.114.124.0/22
 45.114.136.0/22
 45.114.196.0/22
@@ -2855,7 +2854,6 @@
 103.61.160.0/22
 103.61.172.0/22
 103.61.176.0/22
-103.61.184.0/22
 103.61.188.0/22
 103.62.24.0/22
 103.62.52.0/22
@@ -4056,6 +4054,13 @@
 103.152.190.0/23
 103.152.192.0/23
 103.152.200.0/23
+103.152.208.0/23
+103.152.224.0/23
+103.152.226.0/23
+103.152.246.0/23
+103.152.250.0/23
+103.153.4.0/23
+103.153.36.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22
@@ -5654,7 +5659,9 @@
 120.31.0.0/16
 120.32.0.0/13
 120.40.0.0/14
-120.44.0.0/14
+120.44.0.0/15
+120.46.0.0/16
+120.47.0.0/16
 120.48.0.0/15
 120.52.0.0/16
 120.53.0.0/16
@@ -6113,7 +6120,6 @@
 157.119.16.0/22
 157.119.28.0/22
 157.119.68.0/22
-157.119.112.0/22
 157.119.132.0/22
 157.119.136.0/22
 157.119.140.0/22

luci-app-ssr-plus/root/etc/ssr/gfw_list.conf

@@ -778,8 +778,6 @@ server=/.bbs.morbell.com/127.0.0.1#5335
 ipset=/.bbs.morbell.com/gfwlist
 server=/.bbs.mychat.to/127.0.0.1#5335
 ipset=/.bbs.mychat.to/gfwlist
-server=/.bbs.netbig.com/127.0.0.1#5335
-ipset=/.bbs.netbig.com/gfwlist
 server=/.bbs.ozchinese.com/127.0.0.1#5335
 ipset=/.bbs.ozchinese.com/gfwlist
 server=/.bbs.qmzdd.com/127.0.0.1#5335
@@ -1078,8 +1076,6 @@ server=/.bodog88.com/127.0.0.1#5335
 ipset=/.bodog88.com/gfwlist
 server=/.bolehvpn.net/127.0.0.1#5335
 ipset=/.bolehvpn.net/gfwlist
-server=/.bolin.netfirms.com/127.0.0.1#5335
-ipset=/.bolin.netfirms.com/gfwlist
 server=/.bonbonme.com/127.0.0.1#5335
 ipset=/.bonbonme.com/gfwlist
 server=/.bonfoundation.org/127.0.0.1#5335
@@ -1746,8 +1742,6 @@ server=/.cn.shafaqna.com/127.0.0.1#5335
 ipset=/.cn.shafaqna.com/gfwlist
 server=/.cn.thegay.com/127.0.0.1#5335
 ipset=/.cn.thegay.com/gfwlist
-server=/.cn.uncyclopedia.wikia.com/127.0.0.1#5335
-ipset=/.cn.uncyclopedia.wikia.com/gfwlist
 server=/.cn.uptodown.com/127.0.0.1#5335
 ipset=/.cn.uptodown.com/gfwlist
 server=/.cn.voa.mobi/127.0.0.1#5335
@@ -2320,6 +2314,8 @@ server=/.drgan.net/127.0.0.1#5335
 ipset=/.drgan.net/gfwlist
 server=/.drmingxia.org/127.0.0.1#5335
 ipset=/.drmingxia.org/gfwlist
+server=/.dronedj.com/127.0.0.1#5335
+ipset=/.dronedj.com/gfwlist
 server=/.dropbooks.tv/127.0.0.1#5335
 ipset=/.dropbooks.tv/gfwlist
 server=/.dropbox.com/127.0.0.1#5335
@@ -2516,6 +2512,8 @@ server=/.eksisozluk.com/127.0.0.1#5335
 ipset=/.eksisozluk.com/gfwlist
 server=/.electionsmeter.com/127.0.0.1#5335
 ipset=/.electionsmeter.com/gfwlist
+server=/.electrek.co/127.0.0.1#5335
+ipset=/.electrek.co/gfwlist
 server=/.elgoog.im/127.0.0.1#5335
 ipset=/.elgoog.im/gfwlist
 server=/.ellawine.org/127.0.0.1#5335
@@ -2672,8 +2670,6 @@ server=/.eurekavpt.com/127.0.0.1#5335
 ipset=/.eurekavpt.com/gfwlist
 server=/.euronews.com/127.0.0.1#5335
 ipset=/.euronews.com/gfwlist
-server=/.evchk.wikia.com/127.0.0.1#5335
-ipset=/.evchk.wikia.com/gfwlist
 server=/.evschool.net/127.0.0.1#5335
 ipset=/.evschool.net/gfwlist
 server=/.exblog.jp/127.0.0.1#5335
@@ -3062,8 +3058,6 @@ server=/.fpmt.tw/127.0.0.1#5335
 ipset=/.fpmt.tw/gfwlist
 server=/.fpmtmexico.org/127.0.0.1#5335
 ipset=/.fpmtmexico.org/gfwlist
-server=/.fq.wikia.com/127.0.0.1#5335
-ipset=/.fq.wikia.com/gfwlist
 server=/.fqok.org/127.0.0.1#5335
 ipset=/.fqok.org/gfwlist
 server=/.fqrouter.com/127.0.0.1#5335
@@ -4796,8 +4790,6 @@ server=/.joymiihub.com/127.0.0.1#5335
 ipset=/.joymiihub.com/gfwlist
 server=/.joyourself.com/127.0.0.1#5335
 ipset=/.joyourself.com/gfwlist
-server=/.jpl.nasa.gov/127.0.0.1#5335
-ipset=/.jpl.nasa.gov/gfwlist
 server=/.jpopforum.net/127.0.0.1#5335
 ipset=/.jpopforum.net/gfwlist
 server=/.jtvnw.net/127.0.0.1#5335
@@ -4952,6 +4944,8 @@ server=/.kkbox.com/127.0.0.1#5335
 ipset=/.kkbox.com/gfwlist
 server=/.kmuh.org.tw/127.0.0.1#5335
 ipset=/.kmuh.org.tw/gfwlist
+server=/.knowyourmeme.com/127.0.0.1#5335
+ipset=/.knowyourmeme.com/gfwlist
 server=/.kobo.com/127.0.0.1#5335
 ipset=/.kobo.com/gfwlist
 server=/.kobobooks.com/127.0.0.1#5335
@@ -5128,6 +5122,8 @@ server=/.lihkg.com/127.0.0.1#5335
 ipset=/.lihkg.com/gfwlist
 server=/.like.com/127.0.0.1#5335
 ipset=/.like.com/gfwlist
+server=/.limbopro.github.io/127.0.0.1#5335
+ipset=/.limbopro.github.io/gfwlist
 server=/.limiao.net/127.0.0.1#5335
 ipset=/.limiao.net/gfwlist
 server=/.line-apps.com/127.0.0.1#5335
@@ -5406,6 +5402,8 @@ server=/.mediachinese.com/127.0.0.1#5335
 ipset=/.mediachinese.com/gfwlist
 server=/.mediafreakcity.com/127.0.0.1#5335
 ipset=/.mediafreakcity.com/gfwlist
+server=/.mediawiki.org/127.0.0.1#5335
+ipset=/.mediawiki.org/gfwlist
 server=/.medium.com/127.0.0.1#5335
 ipset=/.medium.com/gfwlist
 server=/.meetav.com/127.0.0.1#5335
@@ -5834,14 +5832,12 @@ server=/.mywww.biz/127.0.0.1#5335
 ipset=/.mywww.biz/gfwlist
 server=/.myz.info/127.0.0.1#5335
 ipset=/.myz.info/gfwlist
-server=/.naacoalition.org/127.0.0.1#5335
-ipset=/.naacoalition.org/gfwlist
-server=/.naiadsystems.com/127.0.0.1#5335
-ipset=/.naiadsystems.com/gfwlist
 server=/.naitik.net/127.0.0.1#5335
 ipset=/.naitik.net/gfwlist
 server=/.nakido.com/127.0.0.1#5335
 ipset=/.nakido.com/gfwlist
+server=/.nakuz.com/127.0.0.1#5335
+ipset=/.nakuz.com/gfwlist
 server=/.nalandabodhi.org/127.0.0.1#5335
 ipset=/.nalandabodhi.org/gfwlist
 server=/.nalandawest.org/127.0.0.1#5335
@@ -5850,14 +5846,8 @@ server=/.namgyal.org/127.0.0.1#5335
 ipset=/.namgyal.org/gfwlist
 server=/.namgyalmonastery.org/127.0.0.1#5335
 ipset=/.namgyalmonastery.org/gfwlist
-server=/.namsisi.com/127.0.0.1#5335
-ipset=/.namsisi.com/gfwlist
-server=/.nanyang.com/127.0.0.1#5335
-ipset=/.nanyang.com/gfwlist
 server=/.nanyangpost.com/127.0.0.1#5335
 ipset=/.nanyangpost.com/gfwlist
-server=/.nanzao.com/127.0.0.1#5335
-ipset=/.nanzao.com/gfwlist
 server=/.naol.ca/127.0.0.1#5335
 ipset=/.naol.ca/gfwlist
 server=/.naol.cc/127.0.0.1#5335
@@ -5880,30 +5870,16 @@ server=/.naweeklytimes.com/127.0.0.1#5335
 ipset=/.naweeklytimes.com/gfwlist
 server=/.nbtvpn.com/127.0.0.1#5335
 ipset=/.nbtvpn.com/gfwlist
-server=/.nccwatch.org.tw/127.0.0.1#5335
-ipset=/.nccwatch.org.tw/gfwlist
-server=/.nch.com.tw/127.0.0.1#5335
-ipset=/.nch.com.tw/gfwlist
 server=/.nchrd.org/127.0.0.1#5335
 ipset=/.nchrd.org/gfwlist
 server=/.ncn.org/127.0.0.1#5335
 ipset=/.ncn.org/gfwlist
-server=/.nde.de/127.0.0.1#5335
-ipset=/.nde.de/gfwlist
 server=/.ndr.de/127.0.0.1#5335
 ipset=/.ndr.de/gfwlist
 server=/.ned.org/127.0.0.1#5335
 ipset=/.ned.org/gfwlist
-server=/.nekoslovakia.net/127.0.0.1#5335
-ipset=/.nekoslovakia.net/gfwlist
-server=/.nepusoku.com/127.0.0.1#5335
-ipset=/.nepusoku.com/gfwlist
-server=/.net-fits.pro/127.0.0.1#5335
-ipset=/.net-fits.pro/gfwlist
 server=/.netbirds.com/127.0.0.1#5335
 ipset=/.netbirds.com/gfwlist
-server=/.netcolony.com/127.0.0.1#5335
-ipset=/.netcolony.com/gfwlist
 server=/.netflix.com/127.0.0.1#5335
 ipset=/.netflix.com/gfwlist
 server=/.netme.cc/127.0.0.1#5335
@@ -6164,8 +6140,6 @@ server=/.nuuvem.com/127.0.0.1#5335
 ipset=/.nuuvem.com/gfwlist
 server=/.nuvid.com/127.0.0.1#5335
 ipset=/.nuvid.com/gfwlist
-server=/.nuzcom.com/127.0.0.1#5335
-ipset=/.nuzcom.com/gfwlist
 server=/.nvdst.com/127.0.0.1#5335
 ipset=/.nvdst.com/gfwlist
 server=/.nvquan.org/127.0.0.1#5335
@@ -6254,8 +6228,6 @@ server=/.okk.tw/127.0.0.1#5335
 ipset=/.okk.tw/gfwlist
 server=/.old-cat.net/127.0.0.1#5335
 ipset=/.old-cat.net/gfwlist
-server=/.old.nabble.com/127.0.0.1#5335
-ipset=/.old.nabble.com/gfwlist
 server=/.olumpo.com/127.0.0.1#5335
 ipset=/.olumpo.com/gfwlist
 server=/.olympicwatch.org/127.0.0.1#5335
@@ -6280,6 +6252,8 @@ server=/.onejav.com/127.0.0.1#5335
 ipset=/.onejav.com/gfwlist
 server=/.onion.city/127.0.0.1#5335
 ipset=/.onion.city/gfwlist
+server=/.onionhacker.github.io/127.0.0.1#5335
+ipset=/.onionhacker.github.io/gfwlist
 server=/.online.recoveryversion.org/127.0.0.1#5335
 ipset=/.online.recoveryversion.org/gfwlist
 server=/.onlinecha.com/127.0.0.1#5335
@@ -6618,6 +6592,8 @@ server=/.pki.goog/127.0.0.1#5335
 ipset=/.pki.goog/gfwlist
 server=/.placemix.com/127.0.0.1#5335
 ipset=/.placemix.com/gfwlist
+server=/.play-asia.com/127.0.0.1#5335
+ipset=/.play-asia.com/gfwlist
 server=/.playboy.com/127.0.0.1#5335
 ipset=/.playboy.com/gfwlist
 server=/.playboyplus.com/127.0.0.1#5335
@@ -7158,6 +7134,8 @@ server=/.rtycminnesota.org/127.0.0.1#5335
 ipset=/.rtycminnesota.org/gfwlist
 server=/.rukor.org/127.0.0.1#5335
 ipset=/.rukor.org/gfwlist
+server=/.rule34.xxx/127.0.0.1#5335
+ipset=/.rule34.xxx/gfwlist
 server=/.runbtx.com/127.0.0.1#5335
 ipset=/.runbtx.com/gfwlist
 server=/.rushbee.com/127.0.0.1#5335
@@ -9042,6 +9020,8 @@ server=/.ur7s.com/127.0.0.1#5335
 ipset=/.ur7s.com/gfwlist
 server=/.uraban.me/127.0.0.1#5335
 ipset=/.uraban.me/gfwlist
+server=/.urbandictionary.com/127.0.0.1#5335
+ipset=/.urbandictionary.com/gfwlist
 server=/.urbansurvival.com/127.0.0.1#5335
 ipset=/.urbansurvival.com/gfwlist
 server=/.urchin.com/127.0.0.1#5335
@@ -9364,6 +9344,8 @@ server=/.vuku.cc/127.0.0.1#5335
 ipset=/.vuku.cc/gfwlist
 server=/.vultryhw.com/127.0.0.1#5335
 ipset=/.vultryhw.com/gfwlist
+server=/.w.wiki/127.0.0.1#5335
+ipset=/.w.wiki/gfwlist
 server=/.w3schools.com/127.0.0.1#5335
 ipset=/.w3schools.com/gfwlist
 server=/.waffle1999.com/127.0.0.1#5335
@@ -9572,6 +9554,12 @@ server=/.wiki.oauth.net/127.0.0.1#5335
 ipset=/.wiki.oauth.net/gfwlist
 server=/.wiki.phonegap.com/127.0.0.1#5335
 ipset=/.wiki.phonegap.com/gfwlist
+server=/.wikia.com/127.0.0.1#5335
+ipset=/.wikia.com/gfwlist
+server=/.wikibooks.org/127.0.0.1#5335
+ipset=/.wikibooks.org/gfwlist
+server=/.wikidata.org/127.0.0.1#5335
+ipset=/.wikidata.org/gfwlist
 server=/.wikileaks-forum.com/127.0.0.1#5335
 ipset=/.wikileaks-forum.com/gfwlist
 server=/.wikileaks.ch/127.0.0.1#5335
@@ -9590,12 +9578,26 @@ server=/.wikileaks.pl/127.0.0.1#5335
 ipset=/.wikileaks.pl/gfwlist
 server=/.wikimapia.org/127.0.0.1#5335
 ipset=/.wikimapia.org/gfwlist
+server=/.wikimedia.org/127.0.0.1#5335
+ipset=/.wikimedia.org/gfwlist
+server=/.wikinews.org/127.0.0.1#5335
+ipset=/.wikinews.org/gfwlist
 server=/.wikipedia.org/127.0.0.1#5335
 ipset=/.wikipedia.org/gfwlist
+server=/.wikiquote.org/127.0.0.1#5335
+ipset=/.wikiquote.org/gfwlist
+server=/.wikisource.org/127.0.0.1#5335
+ipset=/.wikisource.org/gfwlist
+server=/.wikiversity.org/127.0.0.1#5335
+ipset=/.wikiversity.org/gfwlist
+server=/.wikivoyage.org/127.0.0.1#5335
+ipset=/.wikivoyage.org/gfwlist
 server=/.wikiwand.com/127.0.0.1#5335
 ipset=/.wikiwand.com/gfwlist
 server=/.wikiwiki.jp/127.0.0.1#5335
 ipset=/.wikiwiki.jp/gfwlist
+server=/.wiktionary.org/127.0.0.1#5335
+ipset=/.wiktionary.org/gfwlist
 server=/.wildammo.com/127.0.0.1#5335
 ipset=/.wildammo.com/gfwlist
 server=/.williamhill.com/127.0.0.1#5335
@@ -9750,6 +9752,8 @@ server=/.www.gmiddle.com/127.0.0.1#5335
 ipset=/.www.gmiddle.com/gfwlist
 server=/.www.gmiddle.net/127.0.0.1#5335
 ipset=/.www.gmiddle.net/gfwlist
+server=/.www.gmll.org/127.0.0.1#5335
+ipset=/.www.gmll.org/gfwlist
 server=/.www.idlcoyote.com/127.0.0.1#5335
 ipset=/.www.idlcoyote.com/gfwlist
 server=/.www.kindleren.com/127.0.0.1#5335
@@ -10144,14 +10148,8 @@ server=/.zgzcjj.net/127.0.0.1#5335
 ipset=/.zgzcjj.net/gfwlist
 server=/.zh.bitterwinter.org/127.0.0.1#5335
 ipset=/.zh.bitterwinter.org/gfwlist
-server=/.zh.ecdm.wikia.com/127.0.0.1#5335
-ipset=/.zh.ecdm.wikia.com/gfwlist
 server=/.zh.pokerstrategy.com/127.0.0.1#5335
 ipset=/.zh.pokerstrategy.com/gfwlist
-server=/.zh.uncyclopedia.wikia.com/127.0.0.1#5335
-ipset=/.zh.uncyclopedia.wikia.com/gfwlist
-server=/.zh.wikinews.org/127.0.0.1#5335
-ipset=/.zh.wikinews.org/gfwlist
 server=/.zhanbin.net/127.0.0.1#5335
 ipset=/.zhanbin.net/gfwlist
 server=/.zhangboli.net/127.0.0.1#5335

luci-app-ssr-plus/root/etc/ssr/netflixip.list

@@ -1,15 +1,15 @@
-8.41.4.0/24
 23.246.0.0/18
 37.77.184.0/21
+38.72.126.0/24
 45.57.0.0/17
 64.120.128.0/17
 66.197.128.0/17
 69.53.224.0/19
+103.87.204.0/22
 108.175.32.0/20
 185.2.220.0/22
 185.9.188.0/22
 192.173.64.0/18
 198.38.96.0/19
 198.45.48.0/20
-207.45.72.0/22
-208.75.76.0/22
+208.75.76.0/22

luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh

@@ -9,7 +9,7 @@ NETFLIX_SERVER=$(uci_get_by_type global netflix_server nil)
 [ "$NETFLIX_SERVER" == "same" ] && NETFLIX_SERVER=$GLOBAL_SERVER
 if [ "$NETFLIX_SERVER" != "nil" ]; then
 	netflix() {
-		if [ -f "tmp/dnsmasq.ssr/gfw_list.conf" ]; then
+		if [ -f "/tmp/dnsmasq.ssr/gfw_list.conf" ]; then
 			for line in $(cat /etc/ssr/netflix.list); do sed -i "/$line/d" /tmp/dnsmasq.ssr/gfw_list.conf; done
 		fi
 		awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"netflix"'\n",$0)}' /etc/ssr/netflix.list >/tmp/dnsmasq.ssr/netflix_forward.conf