Compare commits

...

4 Commits

Author SHA1 Message Date
风扇滑翔翼
f4246e9314
Add init check 2025-06-10 20:02:57 +00:00
风扇滑翔翼
892e92bb27
Fix 2025-06-10 17:49:21 +00:00
风扇滑翔翼
9004838704
map init 2025-06-10 17:29:13 +00:00
风扇滑翔翼
8edf471c9f
Freedom: Cache UDP resolve result 2025-06-10 17:24:53 +00:00

View File

@ -328,12 +328,22 @@ func NewPacketWriter(conn net.Conn, h *Handler, ctx context.Context, UDPOverride
counter = statConn.WriteCounter counter = statConn.WriteCounter
} }
if c, ok := iConn.(*internet.PacketConnWrapper); ok { if c, ok := iConn.(*internet.PacketConnWrapper); ok {
// If target is a domain, it will be resolved in dialer
// check this behavior and add it to map
outbounds := session.OutboundsFromContext(ctx)
targetAddr := outbounds[len(outbounds)-1].Target.Address
resolvedUDPAddr := make(map[string]net.Address)
if targetAddr.Family().IsDomain() {
RemoteAddress, _, _ := net.SplitHostPort(conn.RemoteAddr().String())
resolvedUDPAddr[targetAddr.String()] = net.ParseAddress(RemoteAddress)
}
return &PacketWriter{ return &PacketWriter{
PacketConnWrapper: c, PacketConnWrapper: c,
Counter: counter, Counter: counter,
Handler: h, Handler: h,
Context: ctx, Context: ctx,
UDPOverride: UDPOverride, UDPOverride: UDPOverride,
resolvedUDPAddr: resolvedUDPAddr,
} }
} }
@ -346,6 +356,12 @@ type PacketWriter struct {
*Handler *Handler
context.Context context.Context
UDPOverride net.Destination UDPOverride net.Destination
// Dest of udp packets might be a domain, we will resolve them to IP
// But resolver will return a random one if the domain has many IPs
// Resulting in these packets being sent to many different IPs randomly
// So, cache and keep the resolve result
resolvedUDPAddr map[string]net.Address
} }
func (w *PacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error { func (w *PacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
@ -365,9 +381,14 @@ func (w *PacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
b.UDP.Port = w.UDPOverride.Port b.UDP.Port = w.UDPOverride.Port
} }
if w.Handler.config.hasStrategy() && b.UDP.Address.Family().IsDomain() { if w.Handler.config.hasStrategy() && b.UDP.Address.Family().IsDomain() {
ip := w.Handler.resolveIP(w.Context, b.UDP.Address.Domain(), nil) if ip := w.resolvedUDPAddr[b.UDP.Address.Domain()]; ip != nil {
if ip != nil {
b.UDP.Address = ip b.UDP.Address = ip
} else {
ip := w.Handler.resolveIP(w.Context, b.UDP.Address.Domain(), nil)
if ip != nil {
b.UDP.Address = ip
w.resolvedUDPAddr[b.UDP.Address.Domain()] = ip
}
} }
} }
destAddr, _ := net.ResolveUDPAddr("udp", b.UDP.NetAddr()) destAddr, _ := net.ResolveUDPAddr("udp", b.UDP.NetAddr())