enoch/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-08-22 09:36:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove unused

Browse Source
This commit is contained in:
patterniha
2025-08-21 12:14:27 +03:30
parent 6be9c4a429
commit c56e1650a1
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
proxy/freedom/freedom.go
View File

@@ -72,7 +72,7 @@ func isValidAddress(addr *net.IPOrDomain) bool {
} }
a := addr.AsAddress() a := addr.AsAddress()
return a != net.AnyIP return a != net.AnyIP && a != net.AnyIPv6
} }
// Process implements proxy.Outbound. // Process implements proxy.Outbound.
@@ -189,7 +189,7 @@ 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, UDPOverride, destination) writer = NewPacketWriter(conn, UDPOverride, destination)
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{
@@ -261,7 +261,7 @@ func isTLSConn(conn stat.Connection) bool {
return false return false
} }
func NewPacketReader(conn net.Conn, UDPOverride net.Destination, DialDest net.Destination) buf.Reader { func NewPacketReader(conn net.Conn, UDPOverride net.Destination, destination net.Destination) buf.Reader {
iConn := conn iConn := conn
statConn, ok := iConn.(*stat.CounterConnection) statConn, ok := iConn.(*stat.CounterConnection)
if ok { if ok {
@@ -281,7 +281,7 @@ func NewPacketReader(conn net.Conn, UDPOverride net.Destination, DialDest net.De
PacketConnWrapper: c, PacketConnWrapper: c,
Counter: counter, Counter: counter,
IsOverridden: isOverridden, IsOverridden: isOverridden,
InitUnchangedAddr: DialDest.Address, InitUnchangedAddr: destination.Address,
InitChangedAddr: net.DestinationFromAddr(conn.RemoteAddr()).Address, InitChangedAddr: net.DestinationFromAddr(conn.RemoteAddr()).Address,
} }
} }
@@ -325,7 +325,7 @@ func (r *PacketReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
} }
// DialDest means the dial target used in the dialer when creating conn // DialDest means the dial target used in the dialer when creating conn
func NewPacketWriter(conn net.Conn, h *Handler, UDPOverride net.Destination, destination net.Destination) buf.Writer { func NewPacketWriter(conn net.Conn, UDPOverride net.Destination, destination net.Destination) buf.Writer {
iConn := conn iConn := conn
statConn, ok := iConn.(*stat.CounterConnection) statConn, ok := iConn.(*stat.CounterConnection)
if ok { if ok {
@@ -339,10 +339,9 @@ func NewPacketWriter(conn net.Conn, h *Handler, UDPOverride net.Destination, des
return &PacketWriter{ return &PacketWriter{
PacketConnWrapper: c, PacketConnWrapper: c,
Counter: counter, Counter: counter,
Handler: h,
UDPOverride: UDPOverride, UDPOverride: UDPOverride,
InitialUnchangedAddr: destination.Address, InitUnchangedAddr: destination.Address,
InitialChangedAddr: net.DestinationFromAddr(conn.RemoteAddr()).Address, InitChangedAddr: net.DestinationFromAddr(conn.RemoteAddr()).Address,
} }
} }
@@ -352,11 +351,10 @@ func NewPacketWriter(conn net.Conn, h *Handler, UDPOverride net.Destination, des
type PacketWriter struct { type PacketWriter struct {
*internet.PacketConnWrapper *internet.PacketConnWrapper
stats.Counter stats.Counter
*Handler
UDPOverride net.Destination UDPOverride net.Destination
InitialUnchangedAddr net.Address InitUnchangedAddr net.Address
InitialChangedAddr net.Address InitChangedAddr net.Address
} }
func (w *PacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error { func (w *PacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
@@ -375,13 +373,13 @@ func (w *PacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
if w.UDPOverride.Port != 0 { if w.UDPOverride.Port != 0 {
b.UDP.Port = w.UDPOverride.Port b.UDP.Port = w.UDPOverride.Port
} }
if b.UDP.Address == w.InitialUnchangedAddr { if b.UDP.Address == w.InitUnchangedAddr {
b.UDP.Address = w.InitialChangedAddr b.UDP.Address = w.InitChangedAddr
} }
if b.UDP.Address.Family().IsDomain() { if b.UDP.Address.Family().IsDomain() {
b.Release() b.Release()
buf.ReleaseMulti(mb) buf.ReleaseMulti(mb)
return errors.New("multiple domains cone does not supported") return errors.New("multiple domains cone is not supported")
} }
n, err = w.PacketConnWrapper.WriteTo(b.Bytes(), b.UDP.RawNetAddr()) n, err = w.PacketConnWrapper.WriteTo(b.Bytes(), b.UDP.RawNetAddr())
} else { } else {