Skip to content

Conversation

patterniha
Copy link
Collaborator

@patterniha
Copy link
Collaborator Author

also, we have another domainStrategy in routing, which is a completely different thing than sockopt-domainStrategy.

@RPRX
Copy link
Member

RPRX commented Aug 16, 2025

liner 有额外的代码吗,需要删掉

@patterniha
Copy link
Collaborator Author

only NewDomainMatcher function, but we have a test that use that to compare benchmark between linear and hybrid.

@RPRX
Copy link
Member

RPRX commented Aug 16, 2025

那都删了吧

@patterniha
Copy link
Collaborator Author

Delete them all then.

done.

@RPRX
Copy link
Member

RPRX commented Aug 16, 2025

那个 strmatcher.MatcherGroup 有没有被别的地方引用

@@ -15,6 +15,7 @@ import (

type FreedomConfig struct {
DomainStrategy string `json:"domainStrategy"`
TargetStrategy string `json:"targetStrategy"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

按惯例,别名放原名上面

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

@patterniha

This comment was marked as outdated.

@patterniha
Copy link
Collaborator Author

patterniha commented Aug 16, 2025

aha, I deleted it, and didn't see it :)
wait...

@patterniha
Copy link
Collaborator Author

Is strmatcher.MatcherGroup referenced elsewhere?

yes, in dns-servers and dns-hosts.

@RPRX RPRX changed the title Remove domainMatcher, Add targetStrategy as an alias of domainStrategy to freedom settings Routing: Remove domainMatcher and liner; Direct/Freedom: Add targetStrategy as an alias of domainStrategy Aug 16, 2025
@RPRX RPRX changed the title Routing: Remove domainMatcher and liner; Direct/Freedom: Add targetStrategy as an alias of domainStrategy Routing: Remove domainMatcher and linear; Direct/Freedom: Add targetStrategy as an alias of domainStrategy Aug 16, 2025
@RPRX RPRX changed the title Routing: Remove domainMatcher and linear; Direct/Freedom: Add targetStrategy as an alias of domainStrategy Routing: Remove domainMatcher, "linear"and type; Direct/Freedom: Add targetStrategy as an alias of domainStrategy Aug 16, 2025
@RPRX RPRX changed the title Routing: Remove domainMatcher, "linear"and type; Direct/Freedom: Add targetStrategy as an alias of domainStrategy Routing: Remove domainMatcher, "linear"and type; Direct/Freedom config: Add targetStrategy as an alias of domainStrategy Aug 16, 2025
@RPRX RPRX changed the title Routing: Remove domainMatcher, "linear"and type; Direct/Freedom config: Add targetStrategy as an alias of domainStrategy Routing config: Remove domainMatcher, "linear"and type; Direct/Freedom config: Add targetStrategy as an alias of domainStrategy Aug 16, 2025
@@ -132,8 +126,6 @@ type RouterRule struct {
Type string `json:"type"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这行也删

@RPRX
Copy link
Member

RPRX commented Aug 16, 2025

@patterniha

@patterniha
Copy link
Collaborator Author

done.

@patterniha
Copy link
Collaborator Author

patterniha commented Aug 16, 2025

Off topic:

Some users are reporting receiving this error occasionally for randomized fingerprint for cloudflare-worker ws+tls:

tls: CurvePreferences includes unsupported curve

@RPRX
Copy link
Member

RPRX commented Aug 16, 2025

@patterniha randomized 指纹本来就是这样的,不必用,建议用 Xray 默认的 chrome

@RPRX RPRX merged commit ed97374 into XTLS:main Aug 16, 2025
39 checks passed
@RPRX RPRX changed the title Routing config: Remove domainMatcher, "linear"and type; Direct/Freedom config: Add targetStrategy as an alias of domainStrategy Direct/Freedom config: Add targetStrategy as an alias of domainStrategy; Routing config: Remove domainMatcher, "linear" and type Aug 16, 2025
RPRX pushed a commit that referenced this pull request Aug 16, 2025
…ategy`; Routing config: Remove `domainMatcher`, "linear" and `type` (#5027)

#5006 (comment)
@patterniha patterniha deleted the alias-rem branch August 16, 2025 17:48
maoxikun added a commit to maoxikun/Xray-core that referenced this pull request Aug 22, 2025
…omainStrategy`; Routing config: Remove `domainMatcher`, "linear" and `type` (XTLS#5027)"

This reverts commit 40ce850
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants