mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-11-20 08:39:14 +00:00
Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df3a1ce5c1 | ||
|
|
6c1378705e | ||
|
|
6529210568 | ||
|
|
009635c229 | ||
|
|
9db67f0e4e | ||
|
|
0fcf8f4dce | ||
|
|
541f8ea3d1 |
@@ -181,8 +181,10 @@ func (h *Handler) Tag() string {
|
|||||||
func (h *Handler) Dispatch(ctx context.Context, link *transport.Link) {
|
func (h *Handler) Dispatch(ctx context.Context, link *transport.Link) {
|
||||||
outbounds := session.OutboundsFromContext(ctx)
|
outbounds := session.OutboundsFromContext(ctx)
|
||||||
ob := outbounds[len(outbounds)-1]
|
ob := outbounds[len(outbounds)-1]
|
||||||
content := session.ContentFromContext(ctx)
|
if h.senderSettings != nil && h.senderSettings.TargetStrategy.HasStrategy() && ob.Target.Address.Family().IsDomain() {
|
||||||
if h.senderSettings != nil && h.senderSettings.TargetStrategy.HasStrategy() && ob.Target.Address.Family().IsDomain() && (content == nil || !content.SkipDNSResolve) {
|
if session.SkipDNSResolveFromContext(ctx) {
|
||||||
|
errors.LogInfo(ctx, "bypassing targetStrategy ", h.senderSettings.TargetStrategy, " for ", ob.Target, "; preserving target domain")
|
||||||
|
} else {
|
||||||
strategy := h.senderSettings.TargetStrategy
|
strategy := h.senderSettings.TargetStrategy
|
||||||
if ob.Target.Network == net.Network_UDP && ob.OriginalTarget.Address != nil {
|
if ob.Target.Network == net.Network_UDP && ob.OriginalTarget.Address != nil {
|
||||||
strategy = strategy.GetDynamicStrategy(ob.OriginalTarget.Address.Family())
|
strategy = strategy.GetDynamicStrategy(ob.OriginalTarget.Address.Family())
|
||||||
@@ -203,6 +205,7 @@ func (h *Handler) Dispatch(ctx context.Context, link *transport.Link) {
|
|||||||
errors.LogInfo(ctx, "target: ", unchangedDomain, " resolved to: ", ob.Target.Address.String())
|
errors.LogInfo(ctx, "target: ", unchangedDomain, " resolved to: ", ob.Target.Address.String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if ob.Target.Network == net.Network_UDP && ob.OriginalTarget.Address != nil && ob.OriginalTarget.Address != ob.Target.Address {
|
if ob.Target.Network == net.Network_UDP && ob.OriginalTarget.Address != nil && ob.OriginalTarget.Address != ob.Target.Address {
|
||||||
link.Reader = &buf.EndpointOverrideReader{Reader: link.Reader, Dest: ob.Target.Address, OriginalDest: ob.OriginalTarget.Address}
|
link.Reader = &buf.EndpointOverrideReader{Reader: link.Reader, Dest: ob.Target.Address, OriginalDest: ob.OriginalTarget.Address}
|
||||||
link.Writer = &buf.EndpointOverrideWriter{Writer: link.Writer, Dest: ob.Target.Address, OriginalDest: ob.OriginalTarget.Address}
|
link.Writer = &buf.EndpointOverrideWriter{Writer: link.Writer, Dest: ob.Target.Address, OriginalDest: ob.OriginalTarget.Address}
|
||||||
|
|||||||
@@ -44,9 +44,8 @@ func (c routingContext) GetRuleTag() string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetSkipDNSResolve is a mock implementation here to match the interface,
|
// GetSkipDNSResolve implements routing.Context.
|
||||||
// SkipDNSResolve is set from dns module, no use if coming from a protobuf object?
|
// The protobuf RoutingContext has no skip flag, so API contexts use false.
|
||||||
// TODO: please confirm @Vigilans
|
|
||||||
func (c routingContext) GetSkipDNSResolve() bool {
|
func (c routingContext) GetSkipDNSResolve() bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,6 +77,11 @@ func ContentFromContext(ctx context.Context) *Content {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func SkipDNSResolveFromContext(ctx context.Context) bool {
|
||||||
|
content := ContentFromContext(ctx)
|
||||||
|
return content != nil && content.SkipDNSResolve
|
||||||
|
}
|
||||||
|
|
||||||
func ContextWithIsReverseMux(ctx context.Context, isReverseMux bool) context.Context {
|
func ContextWithIsReverseMux(ctx context.Context, isReverseMux bool) context.Context {
|
||||||
return context.WithValue(ctx, isReverseMuxKey, isReverseMux)
|
return context.WithValue(ctx, isReverseMuxKey, isReverseMux)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -318,6 +318,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
|
|||||||
}
|
}
|
||||||
ob.Name = "freedom"
|
ob.Name = "freedom"
|
||||||
ob.CanSpliceCopy = 1
|
ob.CanSpliceCopy = 1
|
||||||
|
|
||||||
if !h.usesDialerProxy && len(h.firewall) > 0 {
|
if !h.usesDialerProxy && len(h.firewall) > 0 {
|
||||||
rule := h.firewall[0]
|
rule := h.firewall[0]
|
||||||
if rule.action == RuleAction_Block && rule.network == allNetworks && len(rule.port) == 0 && rule.ip == nil {
|
if rule.action == RuleAction_Block && rule.network == allNetworks && len(rule.port) == 0 && rule.ip == nil {
|
||||||
@@ -350,6 +351,10 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if h.resolveStrategy.HasStrategy() && session.SkipDNSResolveFromContext(ctx) {
|
||||||
|
errors.LogInfo(ctx, "DNS-origin connection to ", destination, " may recursively resolve with sockopt.domainStrategy ", h.resolveStrategy)
|
||||||
|
}
|
||||||
|
|
||||||
input := link.Reader
|
input := link.Reader
|
||||||
output := link.Writer
|
output := link.Writer
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ func (l *Loopback) Process(ctx context.Context, link *transport.Link, _ internet
|
|||||||
|
|
||||||
errors.LogInfo(ctx, "opening connection to ", destination)
|
errors.LogInfo(ctx, "opening connection to ", destination)
|
||||||
content := new(session.Content)
|
content := new(session.Content)
|
||||||
content.SkipDNSResolve = true
|
content.SkipDNSResolve = session.SkipDNSResolveFromContext(ctx)
|
||||||
content.SniffingRequest = l.sniffingRequest
|
content.SniffingRequest = l.sniffingRequest
|
||||||
|
|
||||||
ctx = session.ContextWithContent(ctx, content)
|
ctx = session.ContextWithContent(ctx, content)
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ func DialTaggedOutbound(ctx context.Context, dispatcher routing.Dispatcher, dest
|
|||||||
return nil, errors.New("Instance context variable is not in context, dial denied. ")
|
return nil, errors.New("Instance context variable is not in context, dial denied. ")
|
||||||
}
|
}
|
||||||
content := new(session.Content)
|
content := new(session.Content)
|
||||||
content.SkipDNSResolve = true
|
content.SkipDNSResolve = tag != ""
|
||||||
|
|
||||||
ctx = session.ContextWithContent(ctx, content)
|
ctx = session.ContextWithContent(ctx, content)
|
||||||
ctx = session.SetForcedOutboundTagToContext(ctx, tag)
|
ctx = session.SetForcedOutboundTagToContext(ctx, tag)
|
||||||
|
|||||||
Reference in New Issue
Block a user