diff --git a/luci-app-ikoolproxy/Makefile b/luci-app-ikoolproxy/Makefile index d1535db7..bb61dcd8 100644 --- a/luci-app-ikoolproxy/Makefile +++ b/luci-app-ikoolproxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ikoolproxy PKG_VERSION:=3.8.5 -PKG_RELEASE:=20221012 +PKG_RELEASE:=20221011 PKG_MAINTAINER:=panda-mute diff --git a/luci-app-ikoolproxy/change.log b/luci-app-ikoolproxy/change.log index 47253c2a..2868d251 100644 --- a/luci-app-ikoolproxy/change.log +++ b/luci-app-ikoolproxy/change.log @@ -1,7 +1,4 @@ -## 更新：2022年10月12日： -1、更换规则更新地址。 - ## 更新：2022年10月11日： 1、感谢群里Mr Conter（@biliconter）提供修复证书过期的二进制文件。 diff --git a/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate b/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate index 00bbd463..ed9719fb 100755 --- a/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate +++ b/luci-app-ikoolproxy/root/usr/share/koolproxy/kpupdate @@ -111,16 +111,16 @@ update_rss_rules() { update_rules() { echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/steven.txt' -q -O $KP_DIR/data/rules/steven.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/adg.txt' -q -O $KP_DIR/data/rules/adg.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/antiad.txt' -q -O $KP_DIR/data/rules/antiad.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/adgk.txt' -q -O $KP_DIR/data/rules/adgk.txt - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf - wget 'https://raw.iqiq.io/yaof2/koolproxy/master/rules/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/steven.txt' -q -O $KP_DIR/data/rules/steven.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/adg.txt' -q -O $KP_DIR/data/rules/adg.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/antiad.txt' -q -O $KP_DIR/data/rules/antiad.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/adgk.txt' -q -O $KP_DIR/data/rules/adgk.txt + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf + wget 'https://cdn.jsdelivr.net/gh/yaof2/koolproxy@main/rules/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock adg_rules_local=`cat /usr/share/koolproxy/data/rules/adg.txt | sed -n '4p'|awk '{print $4}'` steven_rules_local=`cat /usr/share/koolproxy/data/rules/steven.txt | sed -n '2p'|awk '{print $3,$4,$5,$6}'` yhosts_rules_local=`cat /usr/share/koolproxy/data/rules/yhosts.txt | sed -n '1p' | cut -d ":" -f2` diff --git a/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt index 51de575c..36aca958 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt @@ -2177,6 +2177,7 @@ 3325604.notifysrv.com 332d21e5.dr.youme.im 332d21e5.rtc.youme.im +333-nft.com 333180904388427.windows-display-service.com 3331909.com 3332218.com @@ -8322,6 +8323,7 @@ adblock.sina.cn adblockanalytics.com adblockerapp.com adblockerapp.info +adblockerapp.net adblockervideo.com adblockextension.online adblockfast.com @@ -12281,6 +12283,7 @@ agamagcargoan.com agamantykeon.com agamgreetingscom.112.2o7.net agaomastaran.com +agarsainrelocation.com agasengenharias.com agathazanna.com agatystuffs.com @@ -16577,6 +16580,7 @@ arccarterultimate.com arccdyvgh.com archandeddies.com archeives-ouvertes.fr +archeswethers.live archi-facile.fr archicadofficial.kweb.hk archicadofficial.sonaaone.com @@ -17207,6 +17211,7 @@ assoc-msdk-us.amazon-adsystem.com associalbde.xyz associalinterva.xyz associalunb.xyz +associatedwindowcleaners.co.uk associationwish.com assoctrac.com assodigitale.fr @@ -22622,6 +22627,10 @@ broadstreetads.com brocardcored.com broccoli.uc.cn broced.co +brocode1s.com +brocode2s.com +brocode3s.com +brocode4s.com brodmn.com broidensordini.com brokagedefraud.com @@ -22641,6 +22650,7 @@ brontops.com brookbrutallovers.com brooklandsestate2.co.za brooklynservicesgroup.com +brookycenacle.com broomacknowledgedpinch.com broomemulation.com broommeeting.com @@ -24402,6 +24412,7 @@ carniferou.club carnivorouseditsemester.com carnivorouswordsroute.com caroda.io +caroformation.com carolabrucker.com carolina.actonservice.com carolinebeverly.com @@ -24417,6 +24428,7 @@ carpreposition.com carrefour.adform.net carregandoaspaginas.com carregandopagina.com +carrellsubdit.com carreras.unisabana.edu.co carretilha.net carrfefour.fr @@ -24465,6 +24477,7 @@ cas.pxl.ace.advertising.com cas.xoxknct.com casadelfutbol.info casadorothea.com +casagalvan.com.mx casaitaliana.md casale-cm.p.veruta.comupoll.umengcloud.com casalemedia.com @@ -26322,6 +26335,7 @@ chaumsee.net chaussew.net chaussizers.cam chautcho.com +chautchy.net chautsez.com chavoads.com chawhuxachi.com @@ -26416,9 +26430,11 @@ chelaxeshi.com chelpus.com chemdraw.com chemdraw.com.cn +chemicalbusinessreports.com chemicalcoach.com chemicalmarketindication.com chemicalsnake.com +chemitug.net chenaiwx.xyz chenfoo.cn chengadx.com @@ -26520,6 +26536,7 @@ chillypublishthird.com chiltogi.com chimachinenow.com chimaerason.com +chimarssensory.com china-cdn3.unityads.unity3d.com china-cf.sizmek.com china-india.wang @@ -30996,6 +31013,7 @@ creptdeservedprofanity.com creptpotentglue.com creptsaddle.com creq.page.link +cresclab.com cresfpho2ntesepapillo3.com crespoauto91.fr cresstech.com @@ -32251,6 +32269,7 @@ d1f05vr3sjsuy7.cloudfront.net d1fee48c.api.splkmobile.com d1fs2ef81chg3.cloudfront.net d1g1f25tn8m2e6.cloudfront.net +d1g2nud28z4vph.cloudfront.net d1gp8joe0evc8s.cloudfront.net d1grtyyel8f1mh.cloudfront.net d1hgdmbgioknig.cloudfront.net @@ -32383,6 +32402,7 @@ d2axy0j4uulh4.cloudfront.net d2b4jmuffp1l21.cloudfront.net d2bbq3twedfo2f.cloudfront.net d2bxxk33t58v29.cloudfront.net +d2byenqwec055q.cloudfront.net d2c.ne.jp d2c4ylitp1qu24.cloudfront.net d2cgumzzqhgmdu.cloudfront.net @@ -36741,6 +36761,7 @@ drviniciusterra.com.br drvishalchestclinic.com drvmy.ats68.cn drwjrgbcsb.xyz +drwsecommerce.com drybdxodeefwh.xyz drydrum.com drylnk.com @@ -37054,6 +37075,7 @@ dulatiosa.com dulcormutated.com dulewang.com dulillipupan.com +dulimatourtravel.com dull.bankofamerica.com dulogav.com dulombwwfm.com @@ -39033,6 +39055,7 @@ eeopreessykt.xyz eeoqsr.cn eeoylmkd.com eephaush.com +eephilru.com eephysiotherapy.co.uk eepltxvnf.xyz eer.zhthf.com @@ -39431,6 +39454,7 @@ elirfaan.com elite-s001.com eliteboxing.com.ph eliteclng.ericksonbuilt.com +elites.com eliteturismo.com elitics.com elitistrawirresistible.com @@ -42555,6 +42579,7 @@ fenkang.tech fenrir-resolver.aprod.scopely.io fenrunwayradiant.com fensterfront.com +fentent.streampiay.me fepete.ch feqbqn.rent.com feqii.com @@ -47233,6 +47258,7 @@ gorgon.youdao.com gorhnffu.xyz gorillabrightenarms.com gorillapower.net +gororn.com goroskop.co gorplitka.ru gorrodorro.top @@ -48083,6 +48109,7 @@ guchihyfa.pro gudja.iad-02.braze.com guduopu.com gueigdtqfrcdvo.com +guerreroalinstante.com.mx guerrilla-links.com guess.mediav.com guess.tf.360.cn @@ -48909,6 +48936,7 @@ hashto.cash hashvault.pro hashzone.io haslundalsted.dk +hasnoconve.one haso.pubmatic.com haspswashrag.com hassaleh.iad-03.braze.com @@ -52295,6 +52323,7 @@ igrs.ca igshop.net igsn.us igtqora.cn +iguare.com igusoft.com igyljifdedta.com igyljifdedta.top @@ -54388,6 +54417,7 @@ ioiylgyf.com iojgo.com iokhsx.unionmonthly.jp iol.io +iolenproces.asia iomsew.com ionakasulba.xyz ionia.pro @@ -55750,6 +55780,7 @@ jgbkiructjtlfdf.com jgchq.com jgcyjx.cn jgdguc.arcteryx.com +jghanatv.com jghcy.com jgifwylxaxcv.xyz jgirlvlh.com @@ -58079,6 +58110,7 @@ kitnmedia.com kitokit.com kitrigthy.com kittenmilletfoggy.com +kittga.com kittyaction.com kittyshop.ir kitwkuouldhukel.xyz @@ -63865,6 +63897,7 @@ ma95-r.analytics.edgekey.net ma959-r.analytics.edgekey.net ma980-r.analytics.edgekey.net ma988-r.analytics.edgekey.net +maac.io maaijun.top maaiuh.tomorrowland.co.jp maalabaala.com @@ -66936,6 +66969,7 @@ mindmanager.cc mindmapgallery.morelib.com mindmemobile.com mindopu.com +mindsethomecare.com mindshare.de mindshareworld.fr mindtake.com @@ -68290,6 +68324,7 @@ moviestorrentxyz.imageshack.host moviestreamingonline.club moviesvalanet.imageshack.host movii-loft.cn +movimento.al movip.wps.com movrramgaibm.xyz mowfruit.com @@ -68814,6 +68849,7 @@ munityand.biz munkfm.com munnin.hicsuntdra.co munori.com +munpractical.buzz munsterduke.com munterlyexation.com muoo.xyz @@ -70608,6 +70644,7 @@ ngwuconsulting.com ngxdyxhdkx.xyz nh.miaozhu66.com nhadattyhung.com +nhdddxvwpmriirk.com nhfpdc.cn nhkoze.saneibd.com nhl.speedera.net @@ -70788,6 +70825,7 @@ nirifude.com nisa-accessories.de nisafnic.space nisanth.ifincloud.in +nishangroup.org nishoagn.com nisireals.com nisperodonax.com @@ -72558,6 +72596,7 @@ odtffmfcxhw.xyz odulunual.sa.com odumbulvrweboa.xyz odysseus-nua.com +odysseyretreat.in oe.tredsd.com oeabvhwxk.com oeafllrcq.com @@ -74370,6 +74409,7 @@ ownerfacinglung.com owneriq.net ownerlitter.com ownerswifeimprove.com +ownlacingingelling.com ownlocal.com ownpage.fr ownsattrib.life @@ -75183,6 +75223,7 @@ paiondelivery.duckdns.org paiptoaz.com pair-square.city pair1tune.com +pairaire.com pairextent.com pairssuggestionscasual.com pairstolerancepaint.com @@ -75387,6 +75428,7 @@ parkingdeceaseddoctrine.com parkinggrumpy.com parkingpremium.com parklogic.com +parkonlineart.com parkurl.com parkways.tims.se parkwooddoors.co.nz @@ -75588,6 +75630,7 @@ patio-furniture.dreamhoster.com patiotheoretical.com patiskcontentdelivery.info patithatspartal.pro +patriauniversidad.edu.mx patricewheat.com patriciamirapsicologa.com patrickunger.de @@ -76633,6 +76676,7 @@ photographingstirinput.com photographpan.com photogrid.cmcm.com photorank.me +photos-kb.com photozoomchina.com photure.nl phoudson.com @@ -77196,6 +77240,7 @@ pixelhere.com pixelinteractivemedia.com pixeljs-ads.pubmatic.com pixellitomedia.com +pixelparasite.com pixelpop.co pixelrevenue.com pixels.ad.gt @@ -80276,6 +80321,7 @@ popwad.xyz popwang.top popwin.net popwow.xyz +popxperts.com popxxx.net popxyz.com popyark.com @@ -82466,6 +82512,7 @@ pwbstpjjkovpy.com pwc.tt.omtrdc.net pwdxedmuutaok.com pweaatek.com +pwidonnctmdc.com pwigekcyr.com pwj.biqugezw.com pwjmzqx.cn @@ -85534,6 +85581,7 @@ rev.da.netease.com rev2pub.com rev4rtb.com revadvocacy.com +revaluecronus.digital revampcdn.com revaprojectsllc.com revarynookier.com @@ -86537,6 +86585,7 @@ rsalcch.com rsalchk.com rsaltsjt.com rsas.szzek.com +rsationhesa.one rsationhesaid.xyz rsbyksjtejlhhlr.xyz rsc-host.com @@ -86697,6 +86746,7 @@ rtbtraffic.plugrush.com rtbtrail.com rtbvideobox.com rtbx.adgrx.com +rtc.dymatrix.cloud rtc.youme.im rtclocketsun.info rtclx.com @@ -87038,6 +87088,7 @@ rwpt.top rwq.youle55.com rwqbilrg.xyz rwrnkb.lifelongcollectibles.com +rwrunurmhly.com rwrwyjso.xyz rwsim.co.nz rwtmdxpceemcjc.com @@ -88541,6 +88592,7 @@ savouryliaison.com sawadeca.com sawap.equifax.com sawdflies.site +sawedhindgut.com sawhitpew.site sawmonwhomble.com sawnowepage.com @@ -90177,6 +90229,7 @@ sentry.deepl.com sentry.friendbuy.com sentry.io sentry.justwatch.com +sentry.line.dev sentry.mopub.com sentry.ovhcloud.com sentry.stripchat.com @@ -91162,6 +91215,7 @@ shoogloonetwork.com shookcooperassociate.com shooksap.net shoomsie.uk +shoop4.com shooterconsultationcart.com shooterpillar.com shootoax.com @@ -93687,6 +93741,7 @@ sobar.baidu.com sobartop.baidu.com sobbathing.com sobcase.com +sober-motivation.com sobin.wang sobolev.net.ru sobowapso.com @@ -94002,6 +94057,7 @@ sonniesabreact.website sonobi.com sonsang.cn sontent.pomvideo.cc +sontent.powvibeo.me sonumal.com sonycorporate.122.2o7.net sonyglobal.112.2o7.net @@ -99822,6 +99878,7 @@ techevolution.work techgadgetsy.com techgear.com.br techhome-js.github.io +techhuntinc.in techitdoit.com techiteration.com techkey.com.cn @@ -100715,6 +100772,7 @@ thiltimt.com thimbleenigma.com thimoaph.net thinazuthy.pro +thinbi.com thind-gke-euw.prd.data.corp.unity3d.com thind.unityads.unity3d.com thindsoo.cn @@ -100831,6 +100889,7 @@ thoushan.net thovetmprrfp.com thqccwlq.com thqjrh.elly.vn +thraxgawks.guru threadloom.com threat-analytics.com threatenedpersonnel.com @@ -101509,6 +101568,7 @@ tn.porntop.com tn.tporn.xxx tn.upornia.com tn1.tporn.xxx +tnaconstructionllc.com tnarzc.com tnative.ru tnc16-alisg.isnssdk.com @@ -103753,6 +103813,7 @@ tracker.providence.org tracker.publico.pt tracker.realclick.co.kr tracker.relaido.jp +tracker.remp-beam.golem.de tracker.remp.impresa.pt tracker.remp.sme.sk tracker.roitesting.com @@ -103915,6 +103976,7 @@ tracking.demandforced3.com tracking.deutscheladies.de tracking.devoteladies.de tracking.diginetica.net +tracking.digitalocean.com tracking.directservices.it tracking.dominanteladies.de tracking.donnemagazine.it @@ -106110,6 +106172,7 @@ ujx.komawai.ru ujxgnpxinx.com ujypzjnbxmsmwnyh4.ay.delivery ujyrxnyycveaufx.xyz +ujyuenxiovjqh.com uk-ads.openx.net uk-market.openx.com uk-script.dotmetrics.net @@ -107396,6 +107459,7 @@ utrosy.com uts-front.line-apps.com uts.auction.co.kr uts.kingoapp.com +utsukbrewst.website utt.impactcdn.com uttclimber.com utteredtheatresaround.com @@ -108255,6 +108319,7 @@ vetcheslegumen.com vetdeberg.com vethojoa.net vetodelaycourageous.com +vetordecarros.com.br vetvljbx.com veugcz8.com vevatom.com @@ -108607,6 +108672,7 @@ vidvas4.com vidvas5.com vidverto.io vidvrzcdn.taboola.com +vidyaspoorthischool.edu.in vidyceky.com vidzi.tv viedechretien.org @@ -120262,6 +120328,7 @@ yw78.cn ywadf.cn ywak.com.cn ywammazatlan.com +ywasnothyc.buzz ywbcdeyqgfzx.com ywbmed.cn ywbwsm.com diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm index c1db7a0e..5bbd1a29 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm @@ -149,12 +149,41 @@ local has_xray = api.is_finded("xray") } var v_plugin_opts = opt.get("ss_plugin_opts").value; if (v_plugin_opts && v_plugin_opts != "") { - v_plugin += encodeURI(";" + v_plugin_opts); + v_plugin += ";" + v_plugin_opts; } - params += "&plugin=" + encodeURI(v_plugin); + params += "&plugin=" + encodeURIComponent(v_plugin); } params += "&group=" - params += "#" + encodeURI(v_alias.value); + params += "#" + encodeURIComponent(v_alias.value); + if (params[0] == "&") { + params = params.substring(1); + } + url += params; + } else if (v_type === "SS-Rust") { + v_type = "SS" + var v_server = opt.get("address"); + var v_port = opt.get("port"); + var v_method = opt.get("ss_rust_encrypt_method"); + var v_password = opt.get("password"); + + url = btoa(v_method.value + ":" + v_password.value) + "@" + + v_server.value + ":" + + v_port.value + "/?"; + + var params = ""; + var v_plugin = opt.get("ss_plugin").value; + if (v_plugin && v_plugin != "none") { + if (v_plugin == "simple-obfs" || v_plugin == "obfs-local") { + v_plugin = "obfs-local"; + } + var v_plugin_opts = opt.get("ss_plugin_opts").value; + if (v_plugin_opts && v_plugin_opts != "") { + v_plugin += ";" + v_plugin_opts; + } + params += "&plugin=" + encodeURIComponent(v_plugin); + } + params += "&group=" + params += "#" + encodeURIComponent(v_alias.value); if (params[0] == "&") { params = params.substring(1); } @@ -552,18 +581,23 @@ local has_xray = api.is_finded("xray") var pluginIndex = pluginInfo.indexOf(";"); var pluginNameInfo = pluginInfo.substr(0, pluginIndex); plugin = pluginNameInfo.substr(pluginNameInfo.indexOf("=") + 1) - pluginOpts = pluginInfo.substr(pluginIndex + 1); + pluginOpts = pluginInfo.substr(pluginIndex + 1).split("&")[0]; } var userInfoSplitIndex = userInfo.indexOf(":"); if (userInfoSplitIndex !== -1) { method = userInfo.substr(0, userInfoSplitIndex); password = userInfo.substr(userInfoSplitIndex + 1); } - opt.set('type', "SS"); + if (["2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha8-poly1305", "2022-blake3-chacha20-poly1305"].includes(method)) { + opt.set('type', "SS-Rust"); + opt.set('ss_rust_encrypt_method', method || ""); + } else { + opt.set('type', "SS"); + opt.set('ss_encrypt_method', method || ""); + } opt.set('address', server); opt.set('port', port); opt.set('password', password || ""); - opt.set('ss_encrypt_method', method || ""); opt.set('ss_plugin', plugin || "none"); if (plugin && plugin != "none") { opt.set('ss_plugin_opts', pluginOpts || ""); diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config index 447ed423..ae8dc1a3 100644 --- a/luci-app-passwall/root/usr/share/passwall/0_default_config +++ b/luci-app-passwall/root/usr/share/passwall/0_default_config @@ -83,18 +83,14 @@ config nodes 'myshunt' option remarks '分流总节点' option type 'Xray' option protocol '_shunt' - option AD 'nil' + option AD '_blackhole' option BT '_direct' - option Netflix 'nil' - option TVB 'nil' - option China 'nil' + option Proxy '_default' + option Netflix '_default' + option Direct '_direct' option default_node 'nil' option domainStrategy 'IPOnDemand' -config shunt_rules 'GAME' - option remarks 'GAME' - option domain_list 'geosite:category-games@cn' - config shunt_rules 'AD' option remarks 'AD' option domain_list 'geosite:category-ads-all' @@ -103,43 +99,44 @@ config shunt_rules 'BT' option remarks 'BT' option protocol 'bittorrent' -config shunt_rules 'YOUTUBE' - option remarks 'YOUTUBE' - option domain_list 'www.youtube.com -youtube.com -fonts.googleapis.com' +config shunt_rules 'Proxy' + option remarks 'Proxy' + option domain_list 'geosite:geolocation-!cn' + option ip_list '149.154.160.0/20 +91.108.4.0/22 +91.108.56.0/24 +109.239.140.0/24 +67.198.55.0/24 +8.8.4.4 +8.8.8.8 +208.67.222.222 +208.67.220.220 +1.1.1.1 +1.1.1.2 +1.0.0.1 +9.9.9.9 +149.112.112.112 +2001:67c:4e8::/48 +2001:b28:f23c::/48 +2001:b28:f23d::/48 +2001:b28:f23f::/48 +2001:b28:f242::/48 +2001:4860:4860::8888 +2001:4860:4860::8844 +2606:4700:4700::1111 +2606:4700:4700::1001' config shunt_rules 'Netflix' option remarks 'Netflix' - option domain_list 'fast.com -netflix -netflix.ca -netflix.com -netflix.net -nflxso.net -nflxext.com -nflximg.com -nflximg.net -nflxsearch.net -nflxvideo.net -netflixdnstest0.com -netflixdnstest1.com -netflixdnstest2.com -netflixdnstest3.com -netflixdnstest4.com -netflixdnstest5.com -netflixdnstest6.com -netflixdnstest7.com -netflixdnstest8.com -netflixdnstest9.com -netflixdnstest10.com' + option domain_list 'geosite:netflix' -config shunt_rules 'TVB' - option remarks 'TVB' - option domain_list 'tvb.com -mytvsuper.com' - -config shunt_rules 'China' - option remarks 'China' - option domain_list 'geosite:cn' - option ip_list 'geoip:cn' +config shunt_rules 'Direct' + option remarks 'Direct' + option domain_list 'geosite:category-games@cn +geosite:cn' + option ip_list '223.5.5.5/32 +119.29.29.29/32 +180.76.76.76/32 +114.114.114.114/32 +geoip:cn +geoip:private' diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index d7c408aa..d69429b8 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -420,6 +420,7 @@ local function processData(szType, content, add_mode, add_from) result.mkcp_downlinkCapacity = 20 result.mkcp_readBufferSize = 2 result.mkcp_writeBufferSize = 2 + result.mkcp_seed = info.seed end if info.net == 'quic' then result.quic_guise = info.type @@ -524,6 +525,21 @@ local function processData(szType, content, add_mode, add_from) end end end + local aead2022 = false + for k, v in ipairs({"2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha8-poly1305", "2022-blake3-chacha20-poly1305"}) do + if method:lower() == v:lower() then + aead2022 = true + end + end + if aead2022 then + if ss_aead_type_default == "xray" and has_xray and not result.plugin then + result.type = 'Xray' + result.protocol = 'shadowsocks' + result.transport = 'tcp' + elseif has_ss_rust then + result.type = 'SS-Rust' + end + end elseif szType == "trojan" then local alias = "" if content:find("#") then @@ -739,6 +755,7 @@ local function processData(szType, content, add_mode, add_from) result.mkcp_downlinkCapacity = 20 result.mkcp_readBufferSize = 2 result.mkcp_writeBufferSize = 2 + result.mkcp_seed = params.seed end if params.type == 'quic' then result.quic_guise = params.headerType or "none"