mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-26 13:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update freedom.go

Browse source
This commit is contained in:
patterniha 2025-06-10 22:51:09 +03:30
parent 892e92bb27
commit f8d3ea371c
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
proxy/freedom/freedom.go
View file

@ -130,6 +130,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
output := link.Writer output := link.Writer
var conn stat.Connection var conn stat.Connection
initAddr := destination.Address
err := retry.ExponentialBackoff(5, 100).On(func() error { err := retry.ExponentialBackoff(5, 100).On(func() error {
dialDest := destination dialDest := destination
if h.config.hasStrategy() && dialDest.Address.Family().IsDomain() { if h.config.hasStrategy() && dialDest.Address.Family().IsDomain() {
@ -140,6 +141,7 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
Address: ip, Address: ip,
Port: dialDest.Port, Port: dialDest.Port,
} }
initAddr = ip
errors.LogInfo(ctx, "dialing to ", dialDest) errors.LogInfo(ctx, "dialing to ", dialDest)
} else if h.config.forceIP() { } else if h.config.forceIP() {
return dns.ErrEmptyResponse return dns.ErrEmptyResponse
@ -202,7 +204,12 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte
writer = buf.NewWriter(conn) writer = buf.NewWriter(conn)
} }
} else { } else {
writer = NewPacketWriter(conn, h, ctx, UDPOverride) resolvedUDPAddr := make(map[string]net.Address)
if destination.Address.Family().IsDomain() && initAddr.Family().IsIP() {
resolvedUDPAddr[destination.Address.Domain()] = initAddr
}
writer = NewPacketWriter(conn, h, ctx, UDPOverride, resolvedUDPAddr)
if h.config.Noises != nil { if h.config.Noises != nil {
errors.LogDebug(ctx, "NOISE", h.config.Noises) errors.LogDebug(ctx, "NOISE", h.config.Noises)
writer = &NoisePacketWriter{ writer = &NoisePacketWriter{
@ -317,7 +324,7 @@ func (r *PacketReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
return buf.MultiBuffer{b}, nil return buf.MultiBuffer{b}, nil
} }
func NewPacketWriter(conn net.Conn, h *Handler, ctx context.Context, UDPOverride net.Destination) buf.Writer { func NewPacketWriter(conn net.Conn, h *Handler, ctx context.Context, UDPOverride net.Destination, resolvedUDPAddr map[string]net.Address) buf.Writer {
iConn := conn iConn := conn
statConn, ok := iConn.(*stat.CounterConnection) statConn, ok := iConn.(*stat.CounterConnection)
if ok { if ok {
@ -334,7 +341,7 @@ func NewPacketWriter(conn net.Conn, h *Handler, ctx context.Context, UDPOverride
Handler: h, Handler: h,
Context: ctx, Context: ctx,
UDPOverride: UDPOverride, UDPOverride: UDPOverride,
resolvedUDPAddr: make(map[string]net.Address), resolvedUDPAddr: resolvedUDPAddr,
} }
} }
@ -377,8 +384,8 @@ func (w *PacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
} else { } else {
ip := w.Handler.resolveIP(w.Context, b.UDP.Address.Domain(), nil) ip := w.Handler.resolveIP(w.Context, b.UDP.Address.Domain(), nil)
if ip != nil { if ip != nil {
b.UDP.Address = ip
w.resolvedUDPAddr[b.UDP.Address.Domain()] = ip w.resolvedUDPAddr[b.UDP.Address.Domain()] = ip
b.UDP.Address = ip
} }
} }
} }