From 5555d5840de23ffd23a9e9aba97d95dcbb509a1f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 08:53:44 +0800 Subject: [PATCH] update 2022-06-06 08:53:44 --- .../root/etc/mosdns/serverlist.txt | 238 +++++-- luci-app-ssr-plus/Makefile | 18 +- .../luasrc/model/cbi/shadowsocksr/client.lua | 13 +- luci-app-ssr-plus/po/zh-cn/ssr-plus.po | 6 +- .../root/etc/init.d/shadowsocksr | 4 +- luci-app-ssr-plus/root/usr/bin/ssr-monitor | 38 +- xray-core/Makefile | 4 +- ...0-Fix-build-in-legacy-golang-version.patch | 628 ------------------ xray-plugin/Makefile | 4 +- 9 files changed, 215 insertions(+), 738 deletions(-) delete mode 100644 xray-core/patches/010-Fix-build-in-legacy-golang-version.patch diff --git a/luci-app-mosdns/root/etc/mosdns/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/serverlist.txt index cb337a511..2b7e80f70 100644 --- a/luci-app-mosdns/root/etc/mosdns/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/serverlist.txt @@ -292,6 +292,7 @@ 1.huilv.cc 1.huobiwang.cc 1.hysou.com +1.i999d.cn 1.idc100.com 1.isanxia.com 1.jiqie.cn @@ -699,6 +700,7 @@ 127.173.74.c752sa3k9oeb2eg2ehpgc8fnhkeyyyyyn.domsearch.net 1276.adsina.allyes.com 127xb4b.edvfwlacluo.com +12805b86d6.com 12818210.rtc.youme.im 1285a451.api.splkmobile.com 1298bab69bbc4.com @@ -1636,12 +1638,12 @@ 27admin.com 27ceb2d5631623.com 27d8cbdc.dr.youme.im +27f51e5610.com 27fys.xyz 27vckaccbto7p761.pro 28.nbryb.com 2803e11a21.com 28082021.dustymural.com -280dp.com 2818w.huronews.com 2818w.reminews.com 2819.linux2.testsider.dk @@ -1918,6 +1920,7 @@ 3208073.notifysrv.com 320ca3f6.space 321.jintang114.org +321930e1f3.com 321gongsi.com 321tui.cn 321tui.com @@ -2731,6 +2734,7 @@ 51posuiji.org.cn 51roadway.com 51showmy.com +51sm.vip 51sxzz.com 51taifu.com 51teach.club @@ -3458,6 +3462,7 @@ 7577.cc 758.api.swrve.com 758.content.swrve.com +75abf77682.com 75ac70e71d9118f2eeb7419d3dbcb7ad.safeframe.googlesyndication.com 75bb9a4031.com 75e3ee05eb012fac0b759048be14642f.safeframe.googlesyndication.com @@ -4303,6 +4308,7 @@ 9oi6khy9.xyz 9ovlf.bemobtrk.com 9purdfe9xg.com +9qusw7f.cn 9rmjh-baogr.ads.tremorhub.com 9rmjh-t0k0q.ads.tremorhub.com 9rmjh-w3w1r.ads.tremorhub.com @@ -5311,6 +5317,7 @@ a8780.actonservice.com a8aspconv.xn--biglobe-kc9k.com a8aspconv.xn--ocn-ws1e.jp a8c171db33.com +a8cd.com a8click.you-up.com a8clk.app.offerbox.jp a8clk.asahi-net.or.jp @@ -5741,6 +5748,9 @@ ablebodiedcool.com ablebodiedfibre.com ablehed.pro ableka.com +ablen01.tk +ablen02.tk +ablen10.tk ablenctionalle.info ablepsysnup.com ablesasme.co @@ -6364,6 +6374,7 @@ ad-ebis.mynavi-job20s.jp ad-emea.doubleclick.net ad-ettoday.cdn.hinet.net ad-exchange.toast.com +ad-fam.com ad-flow.com ad-g.doubleclick.net ad-gbn.com @@ -6408,6 +6419,7 @@ ad-switcher.com ad-tech.com ad-thd-east.tagdelivery.com ad-tools.condenastdigital.com +ad-track.jp ad-track.paravi.jp ad-u.com ad-up.com @@ -9546,6 +9558,7 @@ adsmt1.adsparc.net adsnative.com adsnearme.com adsnetworkserver.com +adsninja.ca adsniper.ru adsoftware.com adsoldier.com @@ -10311,7 +10324,6 @@ aerialmistaken.com aerobicsfit.com aeromark.actonservice.com aeros01.tk -aeros11.tk aerserv-east.brealtime.com aerserv.com aes01.com @@ -10357,6 +10369,7 @@ afd.baidu.cn afd.baidu.com afd.l.google.com afdads.com +afdjljiyagf.ru afe.specificclick.net afeixctetrtcyp.xyz afenx.top @@ -11713,7 +11726,6 @@ amexcadrillon.com amfi.gou.sogou.com amgardevoirtor.com amgdgt.com -amghais.cn amgload.net amgvmmnprpat.xyz amhixwqagiz.ru @@ -11754,6 +11766,7 @@ amorluv.com amos5lynn.com amountdonutproxy.com amountinsulation.com +amp-api-edge.apps.apple.com amp-error-reporting.appspot.com amp-service.addthis.com amp-test.adzerk.net @@ -12836,6 +12849,7 @@ anni141224.club annotationcoinboiled.com annotationpushy.com annotationsolely.com +announcem.com announcement.ru annoyedairport.com annoyedfifth.com @@ -13119,6 +13133,7 @@ aper.zhfosenghtr.com aperio.leicabiosystems.com aperushmo.cam apester.com +apex-ad.com apex.go.sonobi.com apexcdn.com apexcreative.co.kr @@ -13513,6 +13528,7 @@ api.optmstr.com api.optnmnstr.com api.otclick-adv.ru api.otherlevels.com +api.panda.boosters.company api.parse.com api.parsely.com api.perfectaudience.com @@ -14980,6 +14996,7 @@ assp.sohu.com asssyy.icook.tw asstok.com assumptivestation.com +assuranceapprobationblackbird.com assurancelocusmat.com assuremath.com assurland.speedera.net @@ -15907,7 +15924,6 @@ avertscratch.com avestor.uz avfatpygr.xyz avfay.com -avfgoatbyyerys.com avg.ffotka.ru avhlqslmfubbts.com avhost.xyz @@ -16701,6 +16717,7 @@ baisogou.net bait4role.com baitaiad.com baitaoidc.com +baitbrdwk.com baitugu.com baiwanchuangyi.com baiwb.com @@ -17127,6 +17144,7 @@ basheighthnumerous.com bashenghuo.com bashfuladvancedeliberately.com bashfulweaponsscratch.com +bashod.com basicpossibility.com basicstat.com basilic.io @@ -17381,6 +17399,7 @@ bd1.home8080.cn bd1.idgdmg.com.cn bd1.idgdmgroup.com.cn bd1.jinbaozy.com +bd1.ningboseo0574.com bd1.nipic.com bd1.pipaw.com bd1.qcjslm.com @@ -18198,6 +18217,7 @@ bewailbeforelibrarian.com bewailconsistedmembers.com bewailindigestionunhappy.com bewaslac.com +bewhoyouare.gq bewilderedbattle.com bewilderedblade.com bewilderedclayinsulation.com @@ -18282,6 +18302,7 @@ bhcdgfuivlgjobyl.me bhcumsc.com bhgmarketing.112.2o7.net bhirhtacp.xyz +bhj691.com bhj699.com bhjac.azvub.cn bhlcimjcpvkxn.com @@ -18525,7 +18546,6 @@ bingooverdosegroom.com bingotingo.page.link bingstyle.com bingyinq.com -binkens.cn binlayer.com binlayer.de binnuryetikdanismanlik.com.tr @@ -18880,6 +18900,7 @@ blidattlenoined.com bliink.io blimpdigital.com blindlyidle.com +blingbling.wiki blingbucks.com blink.fra-01.braze.eu blinkadr.com @@ -18888,6 +18909,7 @@ blinks.mindoktor.se blip.bizrate.com blismedia.com blisscleopatra.com +blissfulblinds.com blissfuldes.com blissfulonline.com blisspoint.us-east-1.stinger-ad.bidr.io @@ -18966,7 +18988,6 @@ blogcatalog.com blogclans.com blogcounter.com blogcounter.de -blogdaka.cc blogengage.com blogger2020.com bloggerads.net @@ -19837,6 +19858,7 @@ brilig.com brilliantcollector.com brillspedlars.com bringmesports.com +bringsconserve.com bringsruinedstab.com brinkobdurate.com brioletredeyes.com @@ -21251,6 +21273,7 @@ camduty.com camel.headfarming.com camelee.cn camelotorganics.com +camelvanilla.com cameracaptivity.com cameraprive.com cameraregistryhut.com @@ -21348,6 +21371,7 @@ candid.zone candidphotographyinjaipur.com candiruarf.com candygirls.cc +canem-auris.com canesvisabid.com caneswindfallquiver.com cangnews.com @@ -21921,10 +21945,10 @@ cdfzcz.com cdgfa.ifeng.com cdgjxt.com cdgxq.com +cdhhbyy.cn cdhoc.piyaji.cn cdiah.com cdikrxknopf.com -cdjchpojgifwc.ru cdjkngs.cn cdjs.online cdlc.iadvize.com @@ -22917,6 +22941,7 @@ centeredpleasedfeudal.com centerwheelswildly.com centigradelocations.com centimetresnappeddock.com +centpopped.com centr-master.ru central-core-7.com centralads.simpli.fi @@ -22938,6 +22963,7 @@ centuaryfabindia.com centuriesactionperfectly.com centurylink.technoratimedia.com centwrite.com +ceo8000.net ceoillwdcc.com ceorlsrajasic.com cepailru.com @@ -23132,6 +23158,7 @@ chaineky.com chaingab.net chaintopdom.nl chainwalladsy.com +chairmanfreelancetravelling.com chairscrack.com chairwaydenew.site chaissoo.com @@ -24329,6 +24356,7 @@ clickvalue.cn clickwallads.s3.amazonaws.com clickwedkeys.com clickwinks.com +clickwith.bi clickx.autohome.com.cn clickx.io clickxchange.com @@ -24376,7 +24404,6 @@ clientservices.googleapis.com clientsviolet.com clifads.com cliffmuckswiz.com -cliggi.download clik.global-trk.com clikadoo.com climaxcreation.com @@ -24747,6 +24774,7 @@ cmp.huffingtonpost.fr cmp.idg.pl cmp.infopro-digital.com cmp.internetstandard.pl +cmp.lavie.fr cmp.lepoint.fr cmp.netzwelt.de cmp.nextday.media @@ -24897,6 +24925,7 @@ cnomy.com cnoufangfeng.cn cnpc.infzm.com cnpinzhuo.com +cnq4379.com cnrsindia.in cnscdj.com cnstats.cdev.eu @@ -25128,7 +25157,6 @@ coin-hive-proxy-ybydcnjgkl.now.sh coin-hive.com coin-miners.info coin-service.com -coin-services.info coinad.com coinad.media coinad.xyz @@ -26001,6 +26029,7 @@ comunicaciones.daviviendacorredores.com comunicazio.com comunicazioni.bancamediolanum.it comupoll.umengcloud.com +comurbate.com comwgi.com comwww.effectivedisplaycontent.com comwww.effectivedisplayformat.com @@ -26535,6 +26564,7 @@ conv.youdao.com convammp.taboola.com convchmp.taboola.com convdlink.com +convenientmemorizeminiaturization.com convention.tintworld.com conventionforgetful.com convergetrack.com @@ -26670,6 +26700,7 @@ coolbook.cc coolbrowsering.xyz coolerads.com coolfenxi.com +coolfuture.xyz coolgadgetfinder.com coolguang.com coolinghistory.com @@ -26832,6 +26863,7 @@ coumie.top councedvdvg.club councerned.com counciladvertising.net +councilcoveauto.com counsel.umeng.com counsellorcolours.com count-server.sharethis.com @@ -27142,6 +27174,7 @@ countomat.com countpage.sznews.com countpvn.light.fang.com country.yepshare.com +countrysideinhale.com counts.air.tv counts.yieldlab.net countt.51yes.com @@ -27574,6 +27607,7 @@ crglpt.com crhagihr.com crhconsultores.co.mz criantsleck.com +cribbolts.com cricket.mobileposse.com cricketunbutton.com cridiqrtf.com @@ -27661,6 +27695,7 @@ crptentry.com crptgate.com crrepo.com crrintyfgnohux.com +crs-event.line.me crs.actonservice.com crs.baidu.cn crs.baidu.com @@ -27861,6 +27896,7 @@ csxmhkahpy9y6cwwr.ay.delivery csxsyp.cn csxvsd.cn csyfe.com +csygxdym.com csykhjry.com csyn-r.cxense.com csyn.cxense.com @@ -27919,6 +27955,7 @@ ctivesprepaired.club ctki.hs1s1.cn ctl.buyt.in ctl.mobitrack.co.kr +ctlrnwbv.ru ctm-media.com ctmail.dns-dns.com ctmc5-i4y63.ads.tremorhub.com @@ -28125,6 +28162,7 @@ cupseedu.net cupzwcxgx.com curaghpatata.com curalate.com +curatcullion.com curated.fieldtest.cc curategeis.xyz curbimpress.com @@ -28782,6 +28820,7 @@ d2axgrpnciinw7.cloudfront.net d2axy0j4uulh4.cloudfront.net d2b4jmuffp1l21.cloudfront.net d2bbq3twedfo2f.cloudfront.net +d2c.ne.jp d2c4ylitp1qu24.cloudfront.net d2cgumzzqhgmdu.cloudfront.net d2cmh8xu3ncrj2.cloudfront.net @@ -29194,6 +29233,7 @@ daemonclicks.com daero.pw daethana.pw daeuppam.com +dafawl.cn daffaite.com daffodilovercoat.com dafoljqjmlopaf.com @@ -29251,6 +29291,7 @@ daistoce.com daisycontroversy.com daitianyu.vip daiwhoul.net +daixishuai.pw daizhangguanjia.com.cn daizoode.com dajak.vafrike.ru @@ -29363,7 +29404,6 @@ daringprobablywithin.com darkchemical.com darkenedshrine.com darkfailllnkf4vf.onion.pet -darking08.tk darksword.nl darley.ml darmexico.org @@ -30066,6 +30106,7 @@ decemberpedalunfair.com decenthat.com dechauffersnough.xyz decibelinsight.net +decide.dev decide.mixpanel.com decidedrum.com decideinteractive.com @@ -30305,6 +30346,7 @@ deluxe.onetag.io.edgekey.net deluxemongolia.com delvechoir.com delveharassment.com +delwargal.click demand.bidgear.com demand.mopub.com demand.rubiconproject.com @@ -31375,7 +31417,6 @@ djanguswest.com.br djdtfjpnubbnli.com djeissyivlbc.com djers.com -djfiln.com djfjbfte.xyz djfwuer.xyz djgfsrlt.com @@ -31429,6 +31470,7 @@ dk57sacpbi4by.cloudfront.net dkauifmp.com dkecjlcgdeulsp.com dkeyn.com +dkfixj.xyz dkfmhv.xyz dkgmgj.xyz dkifl.com @@ -32454,6 +32496,7 @@ druis.mytxt.cc drumcash.com drumimaring.xyz drunkenknowing.com +drunkinvincible.com drvbtayke.xyz drviniciusterra.com.br drvishalchestclinic.com @@ -32948,6 +32991,7 @@ dxftocy.cn dxgftqrdt.com dxgo95ahe73e8.cloudfront.net dxkkb5tytkivf.cloudfront.net +dxmhkisurxxxhm.ru dxmuilbb.xyz dxnglrimuuucmr.com dxp.baidu.com @@ -33344,6 +33388,7 @@ e.ediun.com e.ehxyz.com e.ejiur.com e.ejuen.com +e.emgwq.com e.enjuk.com e.enjuw.com e.eoeoev.cn @@ -34743,6 +34788,7 @@ eighteenmedal.com eighteenthservicehelper.com eighthservicehelper.com eigisxuxehc.xyz +eignal.com eiipskos.com eikegolehem.com eilaf.org @@ -35086,7 +35132,6 @@ elturismo.cl eludsgqepfmbmxl.xyz elusivewindows.com eluxer.net -elvfdnj.cn elvincom.com elvirahedwig.com elwkjmyqjw.com @@ -35223,6 +35268,7 @@ emesconcontabil.com.br emetriq.de emett.com emeu0circ.com +emgwq.com emi.by emiber.hu emieweneusxwjp.com @@ -35692,7 +35738,6 @@ eotlqwxohyhu.com eouryfvioeurfoevri.xyz eovkjlnh.com eovnezvotrnp.com -eovrti.cn eoweridus.com eowlhdnrtdqtqva.xyz eoxjdqwggqj.xyz @@ -36064,6 +36109,7 @@ etcintyai.com etcodes.com ete.cn etechdesignassociates.com +etempoat.net etesin.com etetdc4ed-exhausted-lizard-tc.mybluemix.net etetum.com @@ -36422,6 +36468,7 @@ events.engager.ecbsn.com events.engageya.com events.enigen.co.uk events.foreseeresults.com +events.framer.com events.georgiancollege.ca events.gfe.nvidia.com events.gogoair.com @@ -36914,7 +36961,6 @@ eylxxvilppj.com eymiwj.cancan.ro eynaaxnshpf.com eyouv.cn -eypdcpzrvk.com eyqeipls.com eytenenergy.us.com eywvmnf.cn @@ -39515,6 +39561,7 @@ ftvqvv.cn ftxabddarlo.xyz ftysya.aboutyou.de ftz.io +ftzivuesohvebj.ru fu.golikeus.net fu68.com fu9453.com @@ -40237,6 +40284,7 @@ gannett.gcion.com ganon.yahoo.com ganymed.beeppool.org gao.ynet.com +gaoai.wang gaobata.com gaoduan.cc gaoguai.com @@ -40250,7 +40298,6 @@ gapl.hit.gemius.pl gapp1.com gapsavyfo.com gapscult.com -gaqavrhhgmu.com garacy.cn garageopmaat.nl garant.bos.ru @@ -40317,6 +40364,7 @@ gateway.speedera.net gateway.ttpsdk.info gateway.yieldify-production.com gather.donga.com +gatheringtherealiases.com gator.com gatorleads.co.uk gatr.hit.gemius.pl @@ -40506,7 +40554,6 @@ gdg.gardnerdenver.com gdggdceehihgbgigadj.ru gdgy56.com gdh4szx.appspot.com -gdhyoa.cn gdhzpmh.com gdicoou.com gdjvznzeik.com @@ -40683,6 +40730,7 @@ geo.gorillanation.com geo.gridsumdissector.com geo.hltv.org geo.homepage-web.com +geo.instagram.com geo.kaloo.ga geo.kontagent.net geo.mattel163.com @@ -40814,6 +40862,7 @@ get-express-vpn.online get-express-vpn.xyz get-express-vpns.com get-free-btc.000webhostapp.com +get-link.xyz get-me-wow.in get-me-wow.xyz get-my-push.xyz @@ -40903,6 +40952,7 @@ getmailcounter.com getmos.cn getmyads.com getmyfreegiftcard.com +getmyfreetraffic.com getnormalizedurl.com getnotification.me getnotix.co @@ -40943,6 +40993,7 @@ getsurv2you.net getsurv2you.org getsweetlady1.com getsystemupdate.com +gettate.date getterobes.cam gettingtoaha.com gettingtoe.com @@ -40969,6 +41020,7 @@ geyan.gepush.com gez.io gezaehlt.de gezinti.com +gezkdx7.com gf108.com gfcksxnuhsny.xyz gfcmaffjnkn.com @@ -41715,7 +41767,6 @@ go.fuze.com go.getherculestires.com go.gogolm.xyz go.gotourl.xyz -go.gotourls.bid go.gpcom.com go.hager.com go.hangzhou.com.cn @@ -41952,6 +42003,7 @@ goldcotton.ro golden1.sogou.com golden1.sohu.com goldenbettingefforlessefforless.com +goldenlee.cn goldenlion.sg goldennoncepool.com goldenrice.in @@ -41985,6 +42037,7 @@ gondolagnome.com goneleft.com goneviral.com gonews2.com +gonextpage.ru gong-eb.qubit.com gongeeta.net gongshangwang.top @@ -42129,6 +42182,7 @@ gotadd.cn gotchosen.com goteacher.cn gotibetho.pro +gotie.tunein.com gotjobbs.com goto-target-com.customtraffic.impactradius.com goto.benchmarkeducation.com @@ -42152,7 +42206,6 @@ gotoniubiurl.pw gotonow.com.co gotoplaymillion.com gotourl.xyz -gotourls.bid gotovacoil.com gotpd.link gotpeuttoldan.info @@ -42763,6 +42816,7 @@ gstaticadssl.l.google.com gstralpolita.info gsvyjunccsw.com gsxfemnjf.xyz +gsyc.icu gsycdb.com gsycl.top gt.ads.justpremium.com @@ -43243,6 +43297,7 @@ h51.com h53n3o.trafficmagnates.com h559.stamfordadvocate.com h5634t.site +h56trh.site h5game.cmcm.com h5game.ksmobile.com h5jww.com @@ -43466,7 +43521,6 @@ haoeat.info haoerer.cn haogame.me haoghost.com -haogo.cc haohud.cc haohuisheng555.cn haoinn.top @@ -43708,7 +43762,6 @@ hbhbafghdbgbhfhgaee.ru hbhdyn.club hbhnwy.com hbhtbn.com -hbhyc.cn hbi-ingest.net hbid.ams3.cdn.digitaloceanspaces.com hbiwagduygompk.com @@ -44270,6 +44323,7 @@ hi.hellobar.com hi.koalendar.com hi.streetworkoutlist.com hi.victorbaudot.com +hi.xiunm.cn hi.xiunm.com hi760.com hi9377.com @@ -44750,7 +44804,6 @@ hlmiq.com hlok.qertewrt.com hlokux.cn hloprhawmswdb.com -hlpidkr.ru hlpjsypdvxu.com hlpnowp-c.com hlrml.cn @@ -44761,7 +44814,6 @@ hlslive.oclive.ksmobile.net hlslive.zglive.ksmobile.net hlstlyy.com hlupilkek.com -hlwlizloq.com hlxnntobidvhcm.xyz hly.com hlyixinwujin.com @@ -44961,6 +45013,7 @@ home.townisp.com home.usg.com home4loans.info homeeflyer.com +homeieped.cn homeishere.co homelessfunkenclose.com homelessstatuepersonal.com @@ -45146,6 +45199,7 @@ hostingcloud.party hostingcloud.racing hostingcloud.review hostingcloud.science +hostingcloud.stream hostingcloud.trade hostingcloud.win hostingmasters.net @@ -45233,7 +45287,6 @@ hotupgrade.hpplay.cn hotvhlqrb.com hotwords.com hotwords.com.br -hotwords.com.mx hotzxgirl.com houanjijuxie.cn houbaotech.cn @@ -45295,6 +45348,7 @@ hpco.6fai2.cn hpcyk.com hpd.baidu.cn hpd.baidu.com +hpdwfd2.com hpe.demdex.net hpejlsb.com hpeshwdwkzyz.com @@ -45316,6 +45370,7 @@ hprofits.com hpshopping.speedera.net hpssjqse.com hptl.avriant.com +hpuvkfbww.com hpvideo.tv hpvsbkrfsqsyjcy.xyz hpwlfhwydefe.xyz @@ -45522,7 +45577,6 @@ httpschecker.net httpsecurity.org httpsmediatradecraft-com.videoplayerhub.com httpswww.varietyofdisplayformats.com -htuczktvwtsf.com htuldxsgwifd.xyz htvh.vf5yb4.cn htvxjl.top @@ -45596,6 +45650,7 @@ hududushy.com hue5e3.cfeucdn.com hueads.com hueakmcp.xyz +hufwitew.com hugedomains.com hugeincome.cf hugelyantony.com @@ -46152,7 +46207,6 @@ i864ekhq.com i937g.bemobtrk.com i99i.org i9w8p.pw -i9zkiqn.cn ia.51.la ia.ctags.cn ia.ekstrabladet.dk @@ -46974,6 +47028,7 @@ imcht.net imcpqxmtlapagng.com imdb.amazon-adsystem.com imdns.hpplay.cn +imdvisual.ltd imediaaudiences.com imediacrew.club imediarevenue.com @@ -48047,6 +48102,7 @@ ingrammicro.tt.omtrdc.net ingramony.com ingratitudefunctions.com ingredient.restorepainful.xyz +ingress-public.brown.line-apps.com ingress.linktr.ee inhaletorchesoffended.com inheart.ru @@ -48380,6 +48436,7 @@ intelensafrete.stream intelglobal.112.2o7.net intelimet.com intell.work +intellecthosting.net intellectualcontradictstuck.com intelli-direct.com intelliad.de @@ -48802,6 +48859,7 @@ iperceptions.com ipffboesnf.com ipfind.com ipfingerprint.com +ipfmbexfdzb.com ipfrom.com ipgp.net iphonehub.info @@ -49237,7 +49295,6 @@ iuvdwottyg.xyz iv.doubleclick.net iv4mspvbgi22vhhfb.ay.delivery ivcbrasil.org.br -ivchui.cn ivcweksqd.com ivepdiwslclulq.com ivfihumeajjmbc.com @@ -49255,6 +49312,7 @@ ivqd8oi.cn ivstracker.net ivtcdnhshx.com ivtsqjxkwq.xyz +ivuovhsn.ru ivuuyvajp.com ivw-crawler.ioam.de ivwbox.de @@ -49332,6 +49390,7 @@ iyfsearch.com iyfubh.com iyi.net iymqlsiqdxu.com +iynmloa.cn iynwlojaay.com iyodoctor.com iyoewrxubefkrq.xyz @@ -49597,6 +49656,7 @@ jazzharder.com jazzspeechlessarena.com jb.4hw.com.cn jb.asqql.com +jb.dianshu119.com jb.eastlady.cn jb.ecar168.cn jb.mbaidu.top @@ -49929,6 +49989,7 @@ jiankongbao.com jianly.top jianpian.vip jiansuo.dsxdn.com +jiantiquan.cn jianxinshanghai.com jianyihang.com jianyouling.com @@ -49945,6 +50006,7 @@ jiasheng-china.cn jiatu.co jiawen88.com jiaxinkang.cn +jiaxinzhang.cn jiaxue.xyz jiayi1.oss-cn-shanghai.aliyuncs.com jiayiss.com @@ -49953,7 +50015,6 @@ jiayuwl.com jiazhenghangye.pw jiazhua.com jibmenbebloom.com -jibn12.jintang114.org jibrilrajoub.ps jic.talkingdata.com jicmutse.com @@ -50147,7 +50208,6 @@ jjyvwook.xyz jjyx.com jjyy.gaopengqcdz.cn jk5t7g6.cn -jk939.com jkamxvoi.com jkbqkgmqx.xyz jkbvdo.kaigojob.com @@ -50416,6 +50476,7 @@ jordanfe.com joredi.com joredii.com jorhtrovhk.xyz +josannastudio.co josephantecedentsick.com josephcalculatedsewer.com josephgrief.000webhostapp.com @@ -50442,8 +50503,6 @@ journeypropertysolutions.com journity.com jouteetu.net jouwaist.net -jovfwgr.cn -joxhvjnlpb.com joyases.com joyceglobal.club joyekepus.online @@ -50524,7 +50583,6 @@ jqk72ugyl2pz.com jqki.cn jqligfjlci.xyz jqmjkivvpjipnrg.com -jqmrqgaunex.ru jqmt.qq.com jqruegubwxfx.xyz jqsex.com @@ -50622,7 +50680,6 @@ js.bckrono.cn js.bizographics.com js.bju888.com js.blog-daka.com -js.blogdaka.cc js.brow.si js.brstke.top js.bulkhentai.com @@ -50868,6 +50925,7 @@ jshosting.download jshosting.loan jshosting.party jshosting.review +jshosting.science jshosting.stream jshosting.trade jshosting.win @@ -51212,6 +51270,7 @@ jwsgwnydpffpvlk.xyz jwt8e5vzc1.com jwvjcr.cn jwvwak1a.com +jwwhsqz.ru jwxrbpxtn.xyz jwyiyqptg.com jwyl.ltd @@ -51283,7 +51342,6 @@ jyk85mxc.z1001.net jynp9m209p.com jypbhdcpybnk.com jypugepha.pro -jyrwen.cn jyrxulbp.com jysbj.cn jyshavefu.com @@ -51874,6 +51932,7 @@ khimxz.shoesforcrews.com khirhdigjgxccm.com khkdorbljww.xyz khlgdkxien.com +kho3au7l4z.me khohuwpyulb.com khoshrangprint.com khovdimina.com @@ -52487,7 +52546,6 @@ kronosspell.com kronostr.com kropka.onet.pl krorsimh.com -krouekal.com krpano.org krq.yymmsd.cn krrhxalokf.com @@ -53563,6 +53621,7 @@ legolas-media.com legou361.com legozu.com legropack.eu +legy-jp-addr.line.naver.jp lehanusepardo.info lehechapunevent.com lehnhausen.nl @@ -53591,6 +53650,7 @@ lememovelaria.com.br lemetri.info lemitsuz.net lemmotx.cn +lemoncai.xyz lemoncine.com lemonde-fr.videoplayerhub.com lemonet.xyz @@ -54683,6 +54743,7 @@ lmgdmwyd.com lmgvur.scbt.com lmiutil.com lmjecwsgn.com +lmjy.us lmknjb1.com lml.jfjsp.com lmmaoo.com @@ -55723,7 +55784,6 @@ lt.ruppersalimentos.com.br lt.tritondigital.com ltanesperexcitems.club ltaoei.rendez-vous.ru -ltaome.cn ltassrv.com ltassrv.com.s3.amazonaws.com ltbbfotur.xyz @@ -56456,7 +56516,6 @@ m.dsgy521.com m.dsjre.com m.du1du.org m.duias.com -m.duobao999.com m.dxmci.com m.dzdkw9.cn m.e2n8vc.cn @@ -56480,6 +56539,7 @@ m.eiiteho.cn m.ejiur.com m.ektktg.cn m.eliuy.com +m.emgwq.com m.emshx.cn m.en.haughtydropszoology.com m.enjuk.com @@ -57717,6 +57777,7 @@ makeupbysally.co.uk makeupsagaa.com makeyoubelieve.top makeyouropportunity.com +makingnude.com makipsuki.pro makisk.com makmedia.ch @@ -57760,6 +57821,7 @@ mamababu.cn mamamiyu.com mamaspresence.com mambkooocango.com +mamblubamblua.com mamboedclarine.com mamihlapinatana.xyz mamka.aviasales.ru @@ -58234,6 +58296,7 @@ marketing.systancia.com marketing.technologyadvice.com marketing.temptimecorp.com marketing.testtargettreat.com +marketing.theamericancollege.edu marketing.theemeraldseattle.com marketing.thepalmbeaches.com marketing.theplasticsurgeryclinic.ca @@ -59763,6 +59826,7 @@ metrics.marcus.com metrics.maxgo.com metrics.maxizoo.be metrics.maxizoo.fr +metrics.maxizoo.it metrics.mca-insight.com metrics.mhi.com metrics.mhn.com @@ -61324,6 +61388,7 @@ moparnet.com mopedisods.com mopemodelingfrown.com mopinion.com +mopnatrestriction.com mopnixhem.com mopsaups.net mopsilysa.com @@ -61673,6 +61738,7 @@ ms-cf.applovin.com ms-debug-services.com ms-home-live.com ms-shopguide.su +ms-shoponline.top ms-trackingapi.phenompeople.com ms-usa.applovin.com ms.actingidekex.cn @@ -61961,7 +62027,6 @@ munchkin.marketo.net mundanepollution.com mundodoingles.com.br mundoflorencia.com -munero.me municalcurit.xyz munityand.biz munnin.hicsuntdra.co @@ -62382,7 +62447,6 @@ myqualifica.fun myramark.com myrdrcts.com myreferer.com -myregeneaf.com myrfdq.emmi.jp myro.shop myroitracking.com @@ -62628,7 +62692,6 @@ naj.sk najihojeily.com najingyi.cn najsdnkdqpsd.com -najsiejfnc.win najva.com nakanohito.jp nakedfulfilhairy.com @@ -62959,7 +63022,6 @@ neadscxznser.ml nearbyad.com nearestaxe.com neatstats.com -nebabrop.com nebadu.com nebbishbraeman.com nebcative-pringical.icu @@ -63037,6 +63099,7 @@ neitherentrailsrim.com neki.org nelberk.com nellads.com +nelo2-col.linecorp.com nelo2-col.navercorp.com nelson.world neltac.com @@ -63356,6 +63419,7 @@ news-themes.com news-venere.com news.51y5.net news.58.com +news.766ba.net news.azcapitoltimes.com news.bpost.be news.chiefexecutive.net @@ -63500,7 +63564,6 @@ nex8.net nexac.com nexage.com nexeps.com -nexioniect.com nexstar.blueconic.net nexstep.zdworks.com next-api.wbagora.com @@ -63522,6 +63585,7 @@ nexus.officeapps.live.com nexusark.com nexusrules.officeapps.live.com nexxxt.biz +neyhdjwpumivpa.com neysjymxkgvs.xyz nezttolpyroty.com nfadiivfibqrk.com @@ -63551,6 +63615,7 @@ nffyghbliml.xyz nfgrcasntnjmcm.com nfh.cnshef.com nfhldnpnfmp.com +nfhlink.com nfiuerwtftasnuk.com nfjjevrdl.com nfkd2ug8d9.com @@ -63737,6 +63802,7 @@ nimiq.terorie.com nimiq.watch nimiqchain.info nimiqpool.com +nimiqtest.ml nimiqtest.net nimmediu.info nimp.org @@ -64155,7 +64221,6 @@ nordvpn.setbizsolutions.com nordvpn.themkproductions.com norentisol.com norep-layamazoon.wootraining.certificacion.cl -norespar.ru noretia.com norm0care.com norma-external-collect.meizu.com @@ -64182,6 +64247,7 @@ northstartravelmedia.com northwestlegendary.com noscvgma.xyz noseaceptandevoluciones.com +nosensor.cn nositkarta2.top nospartenaires.com nosselphloxes.com @@ -64292,7 +64358,6 @@ nova.collect.igodigital.com nova.dice.net novadune.com novaleafgroup.cn -novaminers.tk novax.hr novel.pangolin-sdk-toutiao.com novellcom.112.2o7.net @@ -65410,7 +65475,6 @@ ocuf.pzuth.cn oculustrack.com ocwlhv.ecid.com.br ocx.umeng.com -ocznxv.cn oda.markitondemand.com odb-chidc2.outbrain.com odb.outbrain.com @@ -65461,7 +65525,6 @@ oeclysutilufixgegpajbg.me oecuaprwid.com oedlwhcqfpfup.xyz oeeee.adsame.com -oegdmfjoqyyt.com oei1.gq oeiisnpmh.xyz oeitlgqjw.com @@ -67114,7 +67177,6 @@ oxtrmw.marinarinaldi.com oxu24.com oxupblarlg.xyz oxwbngglwxx.com -oxwwoeukjispema.ru oxybe.com oxydend2r5umarb8oreum.com oxymvbqbivojqy.xyz @@ -69290,6 +69352,7 @@ pigewang.com.cn pignuwoa.com pigpenchiba.com pigspie.com +pigtisetdilqsi.com pigtre.com pigvideo.cn pigvideo.com.cn @@ -69476,6 +69539,7 @@ pix.eads.com pix.hk5.vip.prod.criteo.net pix.hyj.mobi pix.impdesk.com +pix.pub pix.revjet.com pix.sniperlog.ru pix.speedbit.com @@ -72061,7 +72125,6 @@ play.lz-pub-ads.com play.mine.gay-hotvideo.net play.mix.kinostuff.com play.nbryb.com -play.nexioniect.com play.on.animeteatr.ru play.pampopholf.com play.pc.belicimo.pw @@ -72077,6 +72140,7 @@ play.tercabilis.info play.topnewsfeeds.net play.video2.stream.vidzi.tv play.vidzi.tv +play.www.intellecthosting.net play1.flashx.pw play2.flashx.pw play4.flashx.pw @@ -72939,6 +73003,7 @@ pptv.m.cn.miaozhen.com ppunion.com ppurifier.game.xiaomi.com ppvabs.pplive.com +ppwxgpr.cn ppxbsbluutiwc.xyz ppxhpc.eurocamp.nl ppxldikxksuo.com @@ -73144,6 +73209,7 @@ premiumvertising.com premixture.com premlp-pt11.365lpodds.com premovenonda.com +preoccupydaughterinlaw.com preonesetro.com preownedweddingdresses.net.au prepareacquitmeaningless.com @@ -73256,6 +73322,7 @@ primetag.net primetime.ad.primetime.net primetime.net primevalcherries.com +primevalrespectful.com primevalsymphonymuttering.com primis.tech primissima.it @@ -73786,7 +73853,6 @@ proxy.dzeio.com proxy.qualtrics.com proxy.sec.miui.com proxy.tremorhub.com -proxy4life.org proxybis.tremorhub.com proxyfl.info proxyhell.com @@ -75138,6 +75204,7 @@ qgepodownload.mediatek.com qgeuaunfkrru.com qgevavwyafjf.com qgfdqjf.cn +qgfwets.cn qggxqbormiyrq.xyz qgjapp.com qgkpngsyi.com @@ -75339,6 +75406,7 @@ qlmxlgmqi.xyz qlog.adap.tv qloved.cn qlowivucwh.com +qlpwqpvuw.com qlqd5zqefmkcr34a.onion.pet qlqtnqlruou.com qlssbq.cn @@ -75636,6 +75704,7 @@ query1.finance.yahoo.com query2.finance.yahoo.com query7.hicloud.com querylead.com +quesid.com questintegrity.actonservice.com question-mgr-test.cmcm.com question2answer.com @@ -76890,6 +76959,7 @@ referer.pixplug.in referforex.com refericon.pl referralware.com +referredhighway.com referrer.disqus.com referrer.org referrer.website @@ -77043,6 +77113,7 @@ relating.wang relationshipregard.com relativefraudulentprop.com relaxtime24.biz +relay-sentry-fp.line-apps.com relay.fiverr.com relead.com release.baidu.com @@ -77097,6 +77168,7 @@ remehealth.net remekcikkek.com remembercompetitioninexplicable.com rememberdeterminedmerger.com +rememberedshamlag.com rememberu3.zzz.com.ua remembranceadventurer.com rementui.top @@ -78822,7 +78894,6 @@ rva.outbrain.com rvbvxtjvjxckc.xyz rvddfchkj.xyz rvdempreendimentos.cloudstorage.pw -rvedfxeljxo.com rverxn.autosphere.fr rvfmqsiyevgao.com rvg31q.edvfwlacluo.com @@ -78838,7 +78909,6 @@ rvpsrv.com rvrpushserv.com rvrpushsrv.com rvsdepkdfxbphds.xyz -rvsosm.cn rvttrack.com rvv.emol.com rvwtpwmtnfj.com @@ -79376,7 +79446,6 @@ s2.kuaibaopay.com s2.leshi123.cc s2.mingmingtehui.com s2.mopub.com -s2.myregeneaf.com s2.seedtag.com s2.yandui.com s2.zdface.com @@ -79427,7 +79496,6 @@ s3.leadcontrol.net s3.lightboxcdn.com s3.ll.videorolls.row.aiv-cdn.net s3.minexmr.com -s3.myregeneaf.com s3.pampopholf.com s3.pfp.sina.net s3.phluant.com @@ -79777,6 +79845,7 @@ sam4m.com samage-bility.icu samane-sana.com samantharegina.com +samanthyean.com samariaalipeds.com samba.adsame.com samba.tv @@ -81271,6 +81340,7 @@ seed.btc.petertodd.org seed.nimiqpool.com seed1.sushipool.com seedallegation.com +seedattentiontestify.com seeder.igetget.com seedoupo.com seedr.cdnvideo.ru @@ -81479,6 +81549,8 @@ sentifi.com sentimenthypocrisy.com sentineldiscordmm.com sentphysically.com +sentry-tw.line-apps.com +sentry-uit.line-apps.com sentry.arc.io sentry.deepl.com sentry.friendbuy.com @@ -82277,6 +82349,7 @@ shenxiangkeji.com shenyunkeji.com shepeekr.net shepherdbetrayaldecoction.com +shequdaohang.com shequn.online sher.index.hu sherlock.api.seedtag.com @@ -82358,7 +82431,6 @@ shiwan.dl.gxpan.cn shixiaofei864.cn shixiong.xyz shixunjs.th21333.com -shiyaokejishanghai.com shizen-no-megumi.com shj.tjawst.com shjk.xyz @@ -83130,6 +83202,7 @@ skcyber.xyz skdev.io skeettools.com skellbillard.com +skencituer.com skenqaamefeoncfegrytbuvksebpefer.com sketchinferiorunits.com sketeprofs.com @@ -84663,6 +84736,7 @@ snmi.cn snnnyy.com sno1.snowrental.com snodlycaccias.com +snonoz.com snonsy.com snoobi.com snoopytool.outbrain.com @@ -85460,6 +85534,7 @@ specificallydoubtless.com specificallythesisballot.com specificationconsiderable.com specificationheadless.com +specificationmadamdetriment.com specificclick.net specificmedia.com specificpop.com @@ -85980,6 +86055,9 @@ ss.missyouxi.com ss.moatads.com ss.monita.co.id ss.musthird.com +ss.photospecialist.at +ss.photospecialist.co.uk +ss.photospecialist.de ss.shuajuzu.com ss.subo.me ss.swagger1.com @@ -87111,6 +87189,7 @@ statistichegratis.net statistics.11880.com statistics.aldi-international.com statistics.crowdynews.com +statistics.csob.cz statistics.csweapons.com statistics.daktilo.com statistics.fppressa.ru @@ -87219,6 +87298,7 @@ stats.bluebillywig.com stats.bluesabre.org stats.bmxdevils.be stats.bongobd.com +stats.breadtube.tv stats.breathly.app stats.briskoda.net stats.broddin.be @@ -88412,6 +88492,7 @@ sulake.pushwoosh.com sulcateeclogue.com sulkybutter.com sulkycook.com +sulkydozeperceive.com sulkypowerheads.com sullensregimes.com sulphursceneryhenceforward.com @@ -89969,6 +90050,7 @@ tangerinenet.biz tanggoushequ.xyz tangibleteam.com tangiblewhereuponprestige.com +tangli.ltd tangozebra.com tangram.e.qq.com tanguinantaiva.com @@ -90636,6 +90718,7 @@ tenderunderstatement.com tendonshepherdsomething.com tendontoss.com tenezratio.com +tengbaiwan.com tengmoneron.com tengxunwang.top tengyuncloud.cn @@ -90889,7 +90972,6 @@ tg8.cllgxx.com tg8.imuillj.com tg876.cn tga.csbew.com -tgafbvokjmluf.top tgajddao.com tgasiamanagement.com tgb.csbew.com @@ -91486,6 +91568,7 @@ tiltgardenheadlight.com tiltleaden.com tiltwmxtghnngw.xyz tim.nextinpact.com +timai-mao.com timber.sendtonews.com timbercooling.com timbol.iad-03.braze.com @@ -92384,6 +92467,7 @@ toufangke.com toufangzhe.cn toughvolume.com touglesy.net +toujing4.top toujing5.top toujing7.top toujing9.top @@ -92474,6 +92558,7 @@ tpat.api.vungle.akadns.net tpat.api.vungle.com tpb.tw tpbid.com +tpbpiratbay.cl tpbproxyone.org tpc.googlesyndication.com tpcdn.top @@ -95007,6 +95092,7 @@ trk.us.underarmour.com trk.vidible.tv trk.wdacashtrk.com trk.webhostingtalk.com +trk.wizzdeal.trade trk1.17admob.com trk2-wtb.swaven.com trk4.com @@ -96154,7 +96240,6 @@ uglaiste.com ugllcqok.com uglyp.club ugmarketing.smu.edu.sg -ugmovxfikvhct.com ugmvoys.cn ugmxpc.xyz ugomall.hk @@ -96692,6 +96777,7 @@ unrrahyena.com unrulycomprehension.com unrulymedia.com unrulyrotate.com +unrummaged.com unrviaefkhfttj.xyz uns.soarfi.cn unsaferairn.com @@ -97154,6 +97240,7 @@ use-tor.adsrvr.org use.cc.loginfra.com use1-match.justpremium.com useast-beacon.deepintent.com +usebutton.com usecatoutlet.com.br usedexample.com usedirect.adsrvr.org @@ -98158,7 +98245,6 @@ vfgta.com vfgtb.com vfindprod.amobee.com vfl81ea28aztw7y3.pro -vfmfjoknzndbee.com vfo.voyage-prive.co.uk vfpbgnxvb.xyz vfqteyqy.xyz @@ -98927,7 +99013,6 @@ vnet.ink vnfjsus.xyz vngajgpvosjxdo.xyz vnghuw.xyz -vngmbyij.cn vnjexsypl.com vnl1.voyage-prive.nl vnlaqu.site @@ -99482,6 +99567,7 @@ vz-cdn2.trafficjunky.net vzeyba.shopee.co.id vzhjnw.officedepot.com vzikntliefc.com +vzlmcd.spellbinderspaperarts.com vzlomvimeworldv3.000webhostapp.com vzonebd.vuclip.com vzovmzc.cn @@ -99526,7 +99612,6 @@ w.xiaopiaoyou.com w.xvideos.by w.yamaidei.cn w.yieldmo.com -w.yinyuehu.cn w.ymapp.com w0.extreme-dm.com w00f.net @@ -99562,7 +99647,6 @@ w3.flatex.de w3.flatex.nl w3.ting55.com w3.vitrade.de -w3.yinyuehu.cn w3counter.com w3exit.com w3facility.org @@ -101474,6 +101558,7 @@ woningverhuren.growise.pro woniu1314520.vip wonokerso-pringsurat.temanggungkab.go.id wonokerso-tembarak.temanggungkab.go.id +wonsegax.net wontent.powvideo.net wontonsnosite.com wonwg.com @@ -101674,6 +101759,7 @@ wpfc.ml wpfukdvchi.com wpgwonline.com wph2.destinia.us +wpib0jr.cn wpiybvppvemk.xyz wpjcwadh.xyz wpk-auth.ucweb.com @@ -103111,6 +103197,7 @@ www.claimfreerewards.com www.clarity.ms www.claroadsclick.com www.clasite.com +www.classicproduction.com www.cleanupcokesunny.com www.clenchedyouthmatching.com www.clfxjrlui.com @@ -103914,6 +104001,8 @@ www.harsik.am www.hashing.win www.hastejuggle.com www.hata.ero-advertising.com +www.hatbenchmajestic.com +www.hawsuffer.com www.hblinwei.com www.hbtzzlcxfijk.com www.hcltech.com @@ -103978,6 +104067,7 @@ www.hostingcloud.party www.hostingcloud.racing www.hostingcloud.review www.hostingcloud.science +www.hostingcloud.stream www.hostingcloud.trade www.hostingcloud.win www.hostingfreelife.com @@ -104081,6 +104171,7 @@ www.information-update.dynamic-dns.net www.informereng.com www.informsnobstephen.com www.ingonherbal.com +www.ingratitudefunctions.com www.initiallogical.com www.inkscape.es www.inkscape.fr @@ -104222,6 +104313,7 @@ www.jshosting.download www.jshosting.loan www.jshosting.party www.jshosting.review +www.jshosting.science www.jshosting.stream www.jshosting.trade www.jshosting.win @@ -106642,7 +106734,6 @@ x56za02.cn x57772.com x6.yakiuchi.com x6z6.com -x7rrjgs.cn x8.cho-chin.com x822.mrt.com x8ad.com @@ -106862,6 +106953,7 @@ xfantazy.os.tc xfast.host xfbkg.bemobtrk.com xfdhahmpjewl.xyz +xfdqxfpm.cn xfei.top xfffx.xyz xffg.1x26q3.cn @@ -106991,6 +107083,7 @@ xiangkantv.cn xianglong360.cn xianguangergaozhi.com xiangwangdesh.com +xiangwuquan.cn xiangyudj.cn xiangzhengjinshu.com xianka.cloud @@ -107101,6 +107194,7 @@ xin365.org xinbo-lora.cn xinchaocacchau.000webhostapp.com xinchenyang.cn +xindong.fun xindream.cn xineday.com xinerdact.com @@ -107126,6 +107220,7 @@ xingyou25.xyz xingyou46.icu xingyou64.xyz xingyou65.xyz +xingyou71.asia xingzhu.top xingzuomeixue.com xinhaogong.xyz @@ -107299,6 +107394,7 @@ xmindchina.cn xmindchina.net xminingpool.com xminxnaioxnwiau.com +xmjvcgaawkqllg.top xmkniejb.xyz xml-api.online xml-eu.adright.co @@ -107359,7 +107455,6 @@ xmlwizard.com xmmnsl.com xmode.duckdns.org xmorex.com -xmouxe.cn xmpp-ha-alb.iadvize.com xmq123.cn xmqkgcxcuvlorxw.xyz @@ -107515,7 +107610,6 @@ xprotection.net xpst0kx.cn xptlogin.ksmobile.com xpx7heciz9.com -xpxmpf.cn xpxye.rdtk.io xq12.com xqbervetkiq.com @@ -107592,6 +107686,7 @@ xsrypte.cn xsrzqh.bdnews24.com xsrzqh.oferte360.ro xsspt.vip +xssrmimmnq.ru xstar.cc xstats.evoload.io xsu.cc @@ -108175,6 +108270,7 @@ yeadudelude.com yeahmobi.com yealnk.com yeaonesad.com +yearlylight.com yearms.com yearthpsyllid.com yeastwrinklefatigue.com @@ -108428,7 +108524,6 @@ yinteukrestina.xyz yinvmh.com yinyating.top yinyouapp.com -yinyuehu.cn yinzantouzi.com yioarkcknnooq.com yiongminghan.xyz @@ -108447,6 +108542,7 @@ yiqiwin.com yiran686.cn yirendajiankang.com yirr5frog.com +yirui.wang yisd.press yiseiyrdnufqdi.com yisheng120.info @@ -108641,7 +108737,6 @@ ynyn.shop ynyyx168.com ynzby.cn ynzhby.com -yoaabgvkm.ru yoads.net yoads.network yobihost.com @@ -108813,7 +108908,6 @@ yourhealmyheal.com yourhotpleasure.com yourkadspunew.com yourlegacy.club -yourloganalytics.com yourpc411.com yourpleasure3.com yourprivacy.icu @@ -108896,6 +108990,7 @@ ypv.chengadx.com ypvvvkwyctgp.xyz ypymsisnwv.com ypyrhtnpmdvjmb.com +ypz5trk.com yq6.lhkwy.com yqanlvekcrfkd.xyz yqdtktcigxjik.com @@ -108936,7 +109031,6 @@ yrnikichkxyb.xyz yrnoxshfygj.com yrntpeas.xyz yrqr-ping.com -yrqwyn.cn yrrhrffmn.com yrrsckr.cn yrrudp.inven.co.kr @@ -109148,6 +109242,7 @@ yuriaftereleven.com yurivideo.com yushengyuancaishui.com yushuha.com +yusnw.cc yusukgbirmwi.com yuu360.com yuubuslvsqhopkk.com @@ -109163,7 +109258,6 @@ yuyinqs.com yuyrxkbxqvfubk.xyz yuyue008.cn yuyueyang.cn -yvatswzotstdve.com yvboogtpw.xyz yvcjyi.beymen.com yvfnb.cn @@ -109204,6 +109298,7 @@ ywrcqa.khou.com ywrcqa.ksdk.com ywrcqa.wgrz.com ywrcqa.wthr.com +ywsywh.cn ywwm.net ywxi.net ywxigvzbkqg.com @@ -109532,6 +109627,7 @@ zcoup.com zcpmenyq.com zcqgsnn.cn zcrtd.com +zcsdbj.cn zctibmvmbmev.com zctrack.com zcuuqnrb.com @@ -109552,6 +109648,7 @@ zdpsk.bemobtrk.com zdpsve.scrapbook.com zdrcnx.cn zdryg.com +zdsfnagupwkztl.com zdtag.com zdtvfpu.cn zdunex25.e398mod.com @@ -109853,6 +109950,7 @@ zhuguangjl.top zhuhaiqilu.cn zhulik2ne1voruy1d.com zhululm.com +zhuogego8.top zhuoyuanxcl.cn zhuozhongfangshui.cn zhuren.site @@ -109932,6 +110030,7 @@ zitaoh.cn zitaptugo.com ziwyduke.xyz zixiaxianhua.shop +zixinnuo.cn zixivily.com zixixtx.top zixun8.com @@ -109970,6 +110069,7 @@ zjqhyx.cn zjrbwb.markenschuhe.de zjsyawqj.cn zjvnet.allyes.com +zjwldq.cn zjwwbznpcqhk.com zjxkdq.cn zjzs.club @@ -110262,6 +110362,8 @@ zubovskaya-banya.ru zuchaptigra.com zuche321.com zuciwang.com +zucks.net +zucks.net.zimg.jp zudrurta.com zudver.matsmart.se zug.sbb.ch @@ -110301,6 +110403,7 @@ zvfzqw.cotta.jp zvhgxssgec.com zvideo-live.com zviybblezmc.com +zvkoukk.cn zvkytbjimbhk.com zvs1.cnzz.com zvs2.cnzz.com @@ -110427,6 +110530,7 @@ zzmmkj.com zzoacwqfw.com zzpush.58.com zzpzero.com +zzqhsrg.ru zzqqhb.com zzqsmjj.top zzsdjq.com diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 711267532..e96872459 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=185 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_CONFIG_DEPENDS:= \ - CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_DNS2TCP \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy \ + CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2 \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server \ @@ -25,13 +25,13 @@ LUCI_TITLE:=SS/SSR/V2Ray/Trojan/NaiveProxy/Socks5/Tun LuCI interface LUCI_PKGARCH:=all LUCI_DEPENDS:= \ @(PACKAGE_libustream-mbedtls||PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl) \ - +coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset +kmod-ipt-nat +ip-full \ - +iptables +iptables-mod-tproxy +lua +libuci-lua +microsocks +pdnsd-alt +tcping \ + +coreutils +coreutils-base64 +dns2socks +dns2tcp +dnsmasq-full +ipset +kmod-ipt-nat \ + +ip-full +iptables +iptables-mod-tproxy +lua +libuci-lua +microsocks +tcping \ +resolveip +shadowsocksr-libev-ssr-check +uclient-fetch \ - +PACKAGE_$(PKG_NAME)_INCLUDE_DNS2TCP:dns2tcp \ +PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \ +PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks:ipt2socks \ +PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \ + +PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD:pdnsd-alt \ +PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2:redsocks2 \ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-local \ +PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-redir \ @@ -48,10 +48,6 @@ LUCI_DEPENDS:= \ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core define Package/$(PKG_NAME)/config -config PACKAGE_$(PKG_NAME)_INCLUDE_DNS2TCP - bool "Include DNS2TCP" - default n - config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun bool "Include Kcptun" default n @@ -65,6 +61,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks bool "Include ipt2socks" default n +config PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD + bool "Include PDNSD" + default n + config PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2 bool "Include Redsocks2" default n diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua index 8f86ff64c..89212f327 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua @@ -1,10 +1,11 @@ -- Copyright (C) 2017 yushi studio github.com/ywb94 -- Copyright (C) 2018 lean github.com/coolsnowwolf -- Licensed to the public under the GNU General Public License v3. -local m, s, sec, o, kcp_enable -local uci = luci.model.uci.cursor() -m = Map("shadowsocksr", translate("ShadowSocksR Plus+ Settings"), translate("

Support SS/SSR/V2RAY/XRAY/TROJAN/NAIVEPROXY/SOCKS5/TUN etc.

")) +local m, s, sec, o +local uci = luci.model.uci.cursor() + +m = Map("shadowsocksr", translate("ShadowSocksR Plus+ Settings"), translate("

Support SS/SSR/V2RAY/XRAY/TROJAN/NAIVEPROXY/SOCKS5/TUN etc.

")) m:section(SimpleSection).template = "shadowsocksr/status" local server_table = {} @@ -84,10 +85,10 @@ o:value("2", translate("Only Common Ports")) o.default = 1 o = s:option(ListValue, "pdnsd_enable", translate("Resolve Dns Mode")) -o:value("1", translate("Use Pdnsd tcp query and cache")) +o:value("1", translate("Use DNS2TCP query")) o:value("2", translate("Use DNS2SOCKS query and cache")) -if nixio.fs.access('/usr/bin/dns2tcp') then - o:value("3", translate("Use DNS2TCP query")) +if nixio.fs.access('/usr/sbin/pdnsd') then + o:value("3", translate("Use Pdnsd tcp query and cache")) end o:value("0", translate("Use Local DNS Service listen port 5335")) o.default = 1 diff --git a/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/luci-app-ssr-plus/po/zh-cn/ssr-plus.po index d1b1e64c2..e1ee40dd5 100644 --- a/luci-app-ssr-plus/po/zh-cn/ssr-plus.po +++ b/luci-app-ssr-plus/po/zh-cn/ssr-plus.po @@ -424,15 +424,15 @@ msgstr "访问国外域名DNS服务器" msgid "Custom DNS Server format as IP:PORT (default: 8.8.4.4:53)" msgstr "格式为 IP:PORT (默认: 8.8.4.4:53)" +msgid "Use DNS2TCP query" +msgstr "使用 DNS2TCP 查询" + msgid "Use Pdnsd tcp query and cache" msgstr "使用PDNSD TCP查询并缓存" msgid "Use DNS2SOCKS query and cache" msgstr "使用 DNS2SOCKS 查询并缓存" -msgid "Use DNS2TCP query" -msgstr "使用 DNS2TCP 查询" - msgid "DNS Server IP:Port" msgstr "DNS服务器 IP:Port" diff --git a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 14ce639bf..ee78c406b 100755 --- a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -213,7 +213,7 @@ start_dns() { esac case "$ssrplus_dns" in 1) - start_pdnsd $dnsserver $dnsport + ln_start_bin $(first_type dns2tcp) dns2tcp -L "127.0.0.1#$dns_port" -R "$dnsserver#$dnsport" pdnsd_enable_flag=1 ;; 2) @@ -222,7 +222,7 @@ start_dns() { pdnsd_enable_flag=2 ;; 3) - ln_start_bin $(first_type dns2tcp) dns2tcp -L "127.0.0.1#$dns_port" -R "$dnsserver#$dnsport" + start_pdnsd $dnsserver $dnsport pdnsd_enable_flag=3 ;; esac diff --git a/luci-app-ssr-plus/root/usr/bin/ssr-monitor b/luci-app-ssr-plus/root/usr/bin/ssr-monitor index 8517c18ea..6acf563ff 100755 --- a/luci-app-ssr-plus/root/usr/bin/ssr-monitor +++ b/luci-app-ssr-plus/root/usr/bin/ssr-monitor @@ -82,18 +82,17 @@ while [ "1" == "1" ]; do #死循环 exit 0 fi fi - #pdnsd + #dns2tcp if [ "$pdnsd_process" -eq 1 ]; then - icount=$(busybox ps -w | grep $TMP_BIN_PATH/pdnsd | grep -v grep | wc -l) + icount=$(busybox ps -w | grep $TMP_BIN_PATH/dns2tcp | grep -v grep | wc -l) if [ "$icount" -lt 1 ]; then #如果进程挂掉就重启它 - logger -t "$NAME" "pdnsd tunnel error.restart!" - echolog "pdnsd tunnel error.restart!" - if [ -f /var/run/pdnsd.pid ]; then - kill $(cat /var/run/pdnsd.pid) >/dev/null 2>&1 - else - kill -9 $(ps | grep $TMP_PATH/pdnsd.conf | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - fi - ln_start_bin $(first_type pdnsd) pdnsd -c $TMP_PATH/pdnsd.conf + logger -t "$NAME" "dns2tcp tunnel error.restart!" + echolog "dns2tcp tunnel error.restart!" + dnsstr=$(uci_get_by_type global tunnel_forward 8.8.4.4:53) + dnsserver=$(echo "$dnsstr" | awk -F ':' '{print $1}') + dnsport=$(echo "$dnsstr" | awk -F ':' '{print $2}') + kill -9 $(busybox ps -w | grep $TMP_BIN_PATH/dns2tcp | grep -v grep | awk '{print $1}') >/dev/null 2>&1 + ln_start_bin $(first_type dns2tcp) dns2tcp -L "127.0.0.1#$dns_port" -R "$dnsserver#$dnsport" fi #dns2socks elif [ "$pdnsd_process" -eq 2 ]; then @@ -109,17 +108,18 @@ while [ "1" == "1" ]; do #死循环 ln_start_bin $(first_type microsocks) microsocks -i 127.0.0.1 -p $tmp_dns_port ssrplus-dns ln_start_bin $(first_type dns2socks) dns2socks 127.0.0.1:$tmp_dns_port $dnsserver:$dnsport 127.0.0.1:$dns_port -q fi - #dns2tcp + #pdnsd elif [ "$pdnsd_process" -eq 3 ]; then - icount=$(busybox ps -w | grep $TMP_BIN_PATH/dns2tcp | grep -v grep | wc -l) + icount=$(busybox ps -w | grep $TMP_BIN_PATH/pdnsd | grep -v grep | wc -l) if [ "$icount" -lt 1 ]; then #如果进程挂掉就重启它 - logger -t "$NAME" "dns2tcp tunnel error.restart!" - echolog "dns2tcp tunnel error.restart!" - dnsstr=$(uci_get_by_type global tunnel_forward 8.8.4.4:53) - dnsserver=$(echo "$dnsstr" | awk -F ':' '{print $1}') - dnsport=$(echo "$dnsstr" | awk -F ':' '{print $2}') - kill -9 $(busybox ps -w | grep $TMP_BIN_PATH/dns2tcp | grep -v grep | awk '{print $1}') >/dev/null 2>&1 - ln_start_bin $(first_type dns2tcp) dns2tcp -L "127.0.0.1#$dns_port" -R "$dnsserver#$dnsport" + logger -t "$NAME" "pdnsd tunnel error.restart!" + echolog "pdnsd tunnel error.restart!" + if [ -f /var/run/pdnsd.pid ]; then + kill $(cat /var/run/pdnsd.pid) >/dev/null 2>&1 + else + kill -9 $(ps | grep $TMP_PATH/pdnsd.conf | grep -v grep | awk '{print $1}') >/dev/null 2>&1 + fi + ln_start_bin $(first_type pdnsd) pdnsd -c $TMP_PATH/pdnsd.conf fi fi done diff --git a/xray-core/Makefile b/xray-core/Makefile index e97e92016..fe0b59fba 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Xray-core -PKG_VERSION:=1.5.6 +PKG_VERSION:=1.5.7 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=62f2f6574391cf600b6b18a6c9f0fd93c1da9775043bb2c7d81c8ce80b80f923 +PKG_HASH:=6e1761b63da7fb17da98aa6cf74d224882467cd9825c12eb0ab28eacf8d92d19 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 diff --git a/xray-core/patches/010-Fix-build-in-legacy-golang-version.patch b/xray-core/patches/010-Fix-build-in-legacy-golang-version.patch deleted file mode 100644 index 1aa5d48c4..000000000 --- a/xray-core/patches/010-Fix-build-in-legacy-golang-version.patch +++ /dev/null @@ -1,628 +0,0 @@ -From f1d753f0693b3845ace8962bd9a34343f472631d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= -Date: Tue, 31 May 2022 15:55:38 +0800 -Subject: [PATCH] Fix build in legacy golang version - ---- - infra/conf/shadowsocks.go | 2 + - infra/conf/shadowsocks_legacy.go | 152 +++++++++++++++ - proxy/shadowsocks_2022/inbound.go | 2 + - proxy/shadowsocks_2022/inbound_multi.go | 2 + - proxy/shadowsocks_2022/outbound.go | 2 + - proxy/shadowsocks_2022/shadowsocks_2022.go | 2 + - testing/scenarios/shadowsocks_2022_test.go | 209 +++++++++++++++++++++ - testing/scenarios/shadowsocks_test.go | 190 ------------------- - 8 files changed, 371 insertions(+), 190 deletions(-) - create mode 100644 infra/conf/shadowsocks_legacy.go - create mode 100644 testing/scenarios/shadowsocks_2022_test.go - ---- a/infra/conf/shadowsocks.go -+++ b/infra/conf/shadowsocks.go -@@ -1,3 +1,5 @@ -+//go:build go1.18 -+ - package conf - - import ( ---- /dev/null -+++ b/infra/conf/shadowsocks_legacy.go -@@ -0,0 +1,152 @@ -+//go:build !go1.18 -+package conf -+ -+import ( -+ "strings" -+ -+ "github.com/golang/protobuf/proto" -+ "github.com/xtls/xray-core/common/protocol" -+ "github.com/xtls/xray-core/common/serial" -+ "github.com/xtls/xray-core/proxy/shadowsocks" -+) -+ -+func cipherFromString(c string) shadowsocks.CipherType { -+ switch strings.ToLower(c) { -+ case "aes-128-gcm", "aead_aes_128_gcm": -+ return shadowsocks.CipherType_AES_128_GCM -+ case "aes-256-gcm", "aead_aes_256_gcm": -+ return shadowsocks.CipherType_AES_256_GCM -+ case "chacha20-poly1305", "aead_chacha20_poly1305", "chacha20-ietf-poly1305": -+ return shadowsocks.CipherType_CHACHA20_POLY1305 -+ case "xchacha20-poly1305", "aead_xchacha20_poly1305", "xchacha20-ietf-poly1305": -+ return shadowsocks.CipherType_XCHACHA20_POLY1305 -+ case "none", "plain": -+ return shadowsocks.CipherType_NONE -+ default: -+ return shadowsocks.CipherType_UNKNOWN -+ } -+} -+ -+type ShadowsocksUserConfig struct { -+ Cipher string `json:"method"` -+ Password string `json:"password"` -+ Level byte `json:"level"` -+ Email string `json:"email"` -+} -+ -+type ShadowsocksServerConfig struct { -+ Cipher string `json:"method"` -+ Password string `json:"password"` -+ Level byte `json:"level"` -+ Email string `json:"email"` -+ Users []*ShadowsocksUserConfig `json:"clients"` -+ NetworkList *NetworkList `json:"network"` -+ IVCheck bool `json:"ivCheck"` -+} -+ -+func (v *ShadowsocksServerConfig) Build() (proto.Message, error) { -+ config := new(shadowsocks.ServerConfig) -+ config.Network = v.NetworkList.Build() -+ -+ if v.Users != nil { -+ for _, user := range v.Users { -+ account := &shadowsocks.Account{ -+ Password: user.Password, -+ CipherType: cipherFromString(user.Cipher), -+ IvCheck: v.IVCheck, -+ } -+ if account.Password == "" { -+ return nil, newError("Shadowsocks password is not specified.") -+ } -+ if account.CipherType < shadowsocks.CipherType_AES_128_GCM || -+ account.CipherType > shadowsocks.CipherType_XCHACHA20_POLY1305 { -+ return nil, newError("unsupported cipher method: ", user.Cipher) -+ } -+ config.Users = append(config.Users, &protocol.User{ -+ Email: user.Email, -+ Level: uint32(user.Level), -+ Account: serial.ToTypedMessage(account), -+ }) -+ } -+ } else { -+ account := &shadowsocks.Account{ -+ Password: v.Password, -+ CipherType: cipherFromString(v.Cipher), -+ IvCheck: v.IVCheck, -+ } -+ if account.Password == "" { -+ return nil, newError("Shadowsocks password is not specified.") -+ } -+ if account.CipherType == shadowsocks.CipherType_UNKNOWN { -+ return nil, newError("unknown cipher method: ", v.Cipher) -+ } -+ config.Users = append(config.Users, &protocol.User{ -+ Email: v.Email, -+ Level: uint32(v.Level), -+ Account: serial.ToTypedMessage(account), -+ }) -+ } -+ -+ return config, nil -+} -+ -+type ShadowsocksServerTarget struct { -+ Address *Address `json:"address"` -+ Port uint16 `json:"port"` -+ Cipher string `json:"method"` -+ Password string `json:"password"` -+ Email string `json:"email"` -+ Level byte `json:"level"` -+ IVCheck bool `json:"ivCheck"` -+} -+ -+type ShadowsocksClientConfig struct { -+ Servers []*ShadowsocksServerTarget `json:"servers"` -+} -+ -+func (v *ShadowsocksClientConfig) Build() (proto.Message, error) { -+ if len(v.Servers) == 0 { -+ return nil, newError("0 Shadowsocks server configured.") -+ } -+ -+ config := new(shadowsocks.ClientConfig) -+ serverSpecs := make([]*protocol.ServerEndpoint, len(v.Servers)) -+ for idx, server := range v.Servers { -+ if server.Address == nil { -+ return nil, newError("Shadowsocks server address is not set.") -+ } -+ if server.Port == 0 { -+ return nil, newError("Invalid Shadowsocks port.") -+ } -+ if server.Password == "" { -+ return nil, newError("Shadowsocks password is not specified.") -+ } -+ account := &shadowsocks.Account{ -+ Password: server.Password, -+ } -+ account.CipherType = cipherFromString(server.Cipher) -+ if account.CipherType == shadowsocks.CipherType_UNKNOWN { -+ return nil, newError("unknown cipher method: ", server.Cipher) -+ } -+ -+ account.IvCheck = server.IVCheck -+ -+ ss := &protocol.ServerEndpoint{ -+ Address: server.Address.Build(), -+ Port: uint32(server.Port), -+ User: []*protocol.User{ -+ { -+ Level: uint32(server.Level), -+ Email: server.Email, -+ Account: serial.ToTypedMessage(account), -+ }, -+ }, -+ } -+ -+ serverSpecs[idx] = ss -+ } -+ -+ config.Server = serverSpecs -+ -+ return config, nil -+} ---- a/proxy/shadowsocks_2022/inbound.go -+++ b/proxy/shadowsocks_2022/inbound.go -@@ -1,3 +1,5 @@ -+//go:build go1.18 -+ - package shadowsocks_2022 - - import ( ---- a/proxy/shadowsocks_2022/inbound_multi.go -+++ b/proxy/shadowsocks_2022/inbound_multi.go -@@ -1,3 +1,5 @@ -+//go:build go1.18 -+ - package shadowsocks_2022 - - import ( ---- a/proxy/shadowsocks_2022/outbound.go -+++ b/proxy/shadowsocks_2022/outbound.go -@@ -1,3 +1,5 @@ -+//go:build go1.18 -+ - package shadowsocks_2022 - - import ( ---- a/proxy/shadowsocks_2022/shadowsocks_2022.go -+++ b/proxy/shadowsocks_2022/shadowsocks_2022.go -@@ -1,3 +1,5 @@ -+//go:build go1.18 -+ - package shadowsocks_2022 - - import ( ---- /dev/null -+++ b/testing/scenarios/shadowsocks_2022_test.go -@@ -0,0 +1,209 @@ -+package scenarios -+ -+import ( -+ "crypto/rand" -+ "encoding/base64" -+ "github.com/sagernet/sing-shadowsocks/shadowaead_2022" -+ "github.com/xtls/xray-core/proxy/shadowsocks_2022" -+ "testing" -+ "time" -+ -+ "github.com/xtls/xray-core/app/log" -+ "github.com/xtls/xray-core/app/proxyman" -+ "github.com/xtls/xray-core/common" -+ clog "github.com/xtls/xray-core/common/log" -+ "github.com/xtls/xray-core/common/net" -+ "github.com/xtls/xray-core/common/serial" -+ "github.com/xtls/xray-core/core" -+ "github.com/xtls/xray-core/proxy/dokodemo" -+ "github.com/xtls/xray-core/proxy/freedom" -+ "github.com/xtls/xray-core/testing/servers/tcp" -+ "github.com/xtls/xray-core/testing/servers/udp" -+ "golang.org/x/sync/errgroup" -+) -+ -+func TestShadowsocks2022Tcp(t *testing.T) { -+ for _, method := range shadowaead_2022.List { -+ password := make([]byte, 32) -+ rand.Read(password) -+ t.Run(method, func(t *testing.T) { -+ testShadowsocks2022Tcp(t, method, base64.StdEncoding.EncodeToString(password)) -+ }) -+ } -+} -+ -+func TestShadowsocks2022Udp(t *testing.T) { -+ for _, method := range shadowaead_2022.List { -+ password := make([]byte, 32) -+ rand.Read(password) -+ t.Run(method, func(t *testing.T) { -+ testShadowsocks2022Udp(t, method, base64.StdEncoding.EncodeToString(password)) -+ }) -+ } -+} -+ -+func testShadowsocks2022Tcp(t *testing.T, method string, password string) { -+ tcpServer := tcp.Server{ -+ MsgProcessor: xor, -+ } -+ dest, err := tcpServer.Start() -+ common.Must(err) -+ defer tcpServer.Close() -+ -+ serverPort := tcp.PickPort() -+ serverConfig := &core.Config{ -+ App: []*serial.TypedMessage{ -+ serial.ToTypedMessage(&log.Config{ -+ ErrorLogLevel: clog.Severity_Debug, -+ ErrorLogType: log.LogType_Console, -+ }), -+ }, -+ Inbound: []*core.InboundHandlerConfig{ -+ { -+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{ -+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(serverPort)}}, -+ Listen: net.NewIPOrDomain(net.LocalHostIP), -+ }), -+ ProxySettings: serial.ToTypedMessage(&shadowsocks_2022.ServerConfig{ -+ Method: method, -+ Key: password, -+ Network: []net.Network{net.Network_TCP}, -+ }), -+ }, -+ }, -+ Outbound: []*core.OutboundHandlerConfig{ -+ { -+ ProxySettings: serial.ToTypedMessage(&freedom.Config{}), -+ }, -+ }, -+ } -+ -+ clientPort := tcp.PickPort() -+ clientConfig := &core.Config{ -+ App: []*serial.TypedMessage{ -+ serial.ToTypedMessage(&log.Config{ -+ ErrorLogLevel: clog.Severity_Debug, -+ ErrorLogType: log.LogType_Console, -+ }), -+ }, -+ Inbound: []*core.InboundHandlerConfig{ -+ { -+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{ -+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(clientPort)}}, -+ Listen: net.NewIPOrDomain(net.LocalHostIP), -+ }), -+ ProxySettings: serial.ToTypedMessage(&dokodemo.Config{ -+ Address: net.NewIPOrDomain(dest.Address), -+ Port: uint32(dest.Port), -+ Networks: []net.Network{net.Network_TCP}, -+ }), -+ }, -+ }, -+ Outbound: []*core.OutboundHandlerConfig{ -+ { -+ ProxySettings: serial.ToTypedMessage(&shadowsocks_2022.ClientConfig{ -+ Address: net.NewIPOrDomain(net.LocalHostIP), -+ Port: uint32(serverPort), -+ Method: method, -+ Key: password, -+ }), -+ }, -+ }, -+ } -+ -+ servers, err := InitializeServerConfigs(serverConfig, clientConfig) -+ common.Must(err) -+ defer CloseAllServers(servers) -+ -+ var errGroup errgroup.Group -+ for i := 0; i < 10; i++ { -+ errGroup.Go(testTCPConn(clientPort, 10240*1024, time.Second*20)) -+ } -+ -+ if err := errGroup.Wait(); err != nil { -+ t.Error(err) -+ } -+} -+ -+func testShadowsocks2022Udp(t *testing.T, method string, password string) { -+ udpServer := udp.Server{ -+ MsgProcessor: xor, -+ } -+ udpDest, err := udpServer.Start() -+ common.Must(err) -+ defer udpServer.Close() -+ -+ serverPort := udp.PickPort() -+ serverConfig := &core.Config{ -+ App: []*serial.TypedMessage{ -+ serial.ToTypedMessage(&log.Config{ -+ ErrorLogLevel: clog.Severity_Debug, -+ ErrorLogType: log.LogType_Console, -+ }), -+ }, -+ Inbound: []*core.InboundHandlerConfig{ -+ { -+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{ -+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(serverPort)}}, -+ Listen: net.NewIPOrDomain(net.LocalHostIP), -+ }), -+ ProxySettings: serial.ToTypedMessage(&shadowsocks_2022.ServerConfig{ -+ Method: method, -+ Key: password, -+ Network: []net.Network{net.Network_UDP}, -+ }), -+ }, -+ }, -+ Outbound: []*core.OutboundHandlerConfig{ -+ { -+ ProxySettings: serial.ToTypedMessage(&freedom.Config{}), -+ }, -+ }, -+ } -+ -+ udpClientPort := udp.PickPort() -+ clientConfig := &core.Config{ -+ App: []*serial.TypedMessage{ -+ serial.ToTypedMessage(&log.Config{ -+ ErrorLogLevel: clog.Severity_Debug, -+ ErrorLogType: log.LogType_Console, -+ }), -+ }, -+ Inbound: []*core.InboundHandlerConfig{ -+ { -+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{ -+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(udpClientPort)}}, -+ Listen: net.NewIPOrDomain(net.LocalHostIP), -+ }), -+ ProxySettings: serial.ToTypedMessage(&dokodemo.Config{ -+ Address: net.NewIPOrDomain(udpDest.Address), -+ Port: uint32(udpDest.Port), -+ Networks: []net.Network{net.Network_UDP}, -+ }), -+ }, -+ }, -+ Outbound: []*core.OutboundHandlerConfig{ -+ { -+ ProxySettings: serial.ToTypedMessage(&shadowsocks_2022.ClientConfig{ -+ Address: net.NewIPOrDomain(net.LocalHostIP), -+ Port: uint32(serverPort), -+ Method: method, -+ Key: password, -+ }), -+ }, -+ }, -+ } -+ -+ servers, err := InitializeServerConfigs(serverConfig, clientConfig) -+ common.Must(err) -+ defer CloseAllServers(servers) -+ -+ var errGroup errgroup.Group -+ for i := 0; i < 10; i++ { -+ errGroup.Go(testUDPConn(udpClientPort, 1024, time.Second*5)) -+ } -+ -+ if err := errGroup.Wait(); err != nil { -+ t.Error(err) -+ } -+} ---- a/testing/scenarios/shadowsocks_test.go -+++ b/testing/scenarios/shadowsocks_test.go -@@ -1,10 +1,6 @@ - package scenarios - - import ( -- "crypto/rand" -- "encoding/base64" -- "github.com/sagernet/sing-shadowsocks/shadowaead_2022" -- "github.com/xtls/xray-core/proxy/shadowsocks_2022" - "testing" - "time" - -@@ -489,189 +485,3 @@ func TestShadowsocksNone(t *testing.T) { - t.Fatal(err) - } - } -- --func TestShadowsocks2022Tcp(t *testing.T) { -- for _, method := range shadowaead_2022.List { -- password := make([]byte, 32) -- rand.Read(password) -- t.Run(method, func(t *testing.T) { -- testShadowsocks2022Tcp(t, method, base64.StdEncoding.EncodeToString(password)) -- }) -- } --} -- --func TestShadowsocks2022Udp(t *testing.T) { -- for _, method := range shadowaead_2022.List { -- password := make([]byte, 32) -- rand.Read(password) -- t.Run(method, func(t *testing.T) { -- testShadowsocks2022Udp(t, method, base64.StdEncoding.EncodeToString(password)) -- }) -- } --} -- --func testShadowsocks2022Tcp(t *testing.T, method string, password string) { -- tcpServer := tcp.Server{ -- MsgProcessor: xor, -- } -- dest, err := tcpServer.Start() -- common.Must(err) -- defer tcpServer.Close() -- -- serverPort := tcp.PickPort() -- serverConfig := &core.Config{ -- App: []*serial.TypedMessage{ -- serial.ToTypedMessage(&log.Config{ -- ErrorLogLevel: clog.Severity_Debug, -- ErrorLogType: log.LogType_Console, -- }), -- }, -- Inbound: []*core.InboundHandlerConfig{ -- { -- ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{ -- PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(serverPort)}}, -- Listen: net.NewIPOrDomain(net.LocalHostIP), -- }), -- ProxySettings: serial.ToTypedMessage(&shadowsocks_2022.ServerConfig{ -- Method: method, -- Key: password, -- Network: []net.Network{net.Network_TCP}, -- }), -- }, -- }, -- Outbound: []*core.OutboundHandlerConfig{ -- { -- ProxySettings: serial.ToTypedMessage(&freedom.Config{}), -- }, -- }, -- } -- -- clientPort := tcp.PickPort() -- clientConfig := &core.Config{ -- App: []*serial.TypedMessage{ -- serial.ToTypedMessage(&log.Config{ -- ErrorLogLevel: clog.Severity_Debug, -- ErrorLogType: log.LogType_Console, -- }), -- }, -- Inbound: []*core.InboundHandlerConfig{ -- { -- ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{ -- PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(clientPort)}}, -- Listen: net.NewIPOrDomain(net.LocalHostIP), -- }), -- ProxySettings: serial.ToTypedMessage(&dokodemo.Config{ -- Address: net.NewIPOrDomain(dest.Address), -- Port: uint32(dest.Port), -- Networks: []net.Network{net.Network_TCP}, -- }), -- }, -- }, -- Outbound: []*core.OutboundHandlerConfig{ -- { -- ProxySettings: serial.ToTypedMessage(&shadowsocks_2022.ClientConfig{ -- Address: net.NewIPOrDomain(net.LocalHostIP), -- Port: uint32(serverPort), -- Method: method, -- Key: password, -- }), -- }, -- }, -- } -- -- servers, err := InitializeServerConfigs(serverConfig, clientConfig) -- common.Must(err) -- defer CloseAllServers(servers) -- -- var errGroup errgroup.Group -- for i := 0; i < 10; i++ { -- errGroup.Go(testTCPConn(clientPort, 10240*1024, time.Second*20)) -- } -- -- if err := errGroup.Wait(); err != nil { -- t.Error(err) -- } --} -- --func testShadowsocks2022Udp(t *testing.T, method string, password string) { -- udpServer := udp.Server{ -- MsgProcessor: xor, -- } -- udpDest, err := udpServer.Start() -- common.Must(err) -- defer udpServer.Close() -- -- serverPort := udp.PickPort() -- serverConfig := &core.Config{ -- App: []*serial.TypedMessage{ -- serial.ToTypedMessage(&log.Config{ -- ErrorLogLevel: clog.Severity_Debug, -- ErrorLogType: log.LogType_Console, -- }), -- }, -- Inbound: []*core.InboundHandlerConfig{ -- { -- ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{ -- PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(serverPort)}}, -- Listen: net.NewIPOrDomain(net.LocalHostIP), -- }), -- ProxySettings: serial.ToTypedMessage(&shadowsocks_2022.ServerConfig{ -- Method: method, -- Key: password, -- Network: []net.Network{net.Network_UDP}, -- }), -- }, -- }, -- Outbound: []*core.OutboundHandlerConfig{ -- { -- ProxySettings: serial.ToTypedMessage(&freedom.Config{}), -- }, -- }, -- } -- -- udpClientPort := udp.PickPort() -- clientConfig := &core.Config{ -- App: []*serial.TypedMessage{ -- serial.ToTypedMessage(&log.Config{ -- ErrorLogLevel: clog.Severity_Debug, -- ErrorLogType: log.LogType_Console, -- }), -- }, -- Inbound: []*core.InboundHandlerConfig{ -- { -- ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{ -- PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(udpClientPort)}}, -- Listen: net.NewIPOrDomain(net.LocalHostIP), -- }), -- ProxySettings: serial.ToTypedMessage(&dokodemo.Config{ -- Address: net.NewIPOrDomain(udpDest.Address), -- Port: uint32(udpDest.Port), -- Networks: []net.Network{net.Network_UDP}, -- }), -- }, -- }, -- Outbound: []*core.OutboundHandlerConfig{ -- { -- ProxySettings: serial.ToTypedMessage(&shadowsocks_2022.ClientConfig{ -- Address: net.NewIPOrDomain(net.LocalHostIP), -- Port: uint32(serverPort), -- Method: method, -- Key: password, -- }), -- }, -- }, -- } -- -- servers, err := InitializeServerConfigs(serverConfig, clientConfig) -- common.Must(err) -- defer CloseAllServers(servers) -- -- var errGroup errgroup.Group -- for i := 0; i < 10; i++ { -- errGroup.Go(testUDPConn(udpClientPort, 1024, time.Second*5)) -- } -- -- if err := errGroup.Wait(); err != nil { -- t.Error(err) -- } --} diff --git a/xray-plugin/Makefile b/xray-plugin/Makefile index b359c3121..ccf422c48 100644 --- a/xray-plugin/Makefile +++ b/xray-plugin/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-plugin -PKG_VERSION:=1.5.6 +PKG_VERSION:=1.5.7 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/xray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=c352ba07c84ea58aab6a0f41f628fa37f2e5aab0701d019d163e12678dc8c062 +PKG_HASH:=55f72a44a4089eb211ab0e35f064723c028854243e8388d0fcc5d8524aa5fb6b PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE