Skip to content

Commit

Permalink
Fix concurrency vmess udp write
Browse files Browse the repository at this point in the history
  • Loading branch information
nekohasekai committed Jun 28, 2022
1 parent 6664547 commit 6b44178
Showing 1 changed file with 20 additions and 5 deletions.
25 changes: 20 additions & 5 deletions adapter/outbound/vmess.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"net/http"
"strconv"
"strings"
"sync"

"github.com/Dreamacro/clash/common/convert"
"github.com/Dreamacro/clash/component/dialer"
Expand Down Expand Up @@ -267,19 +268,19 @@ func (v *Vmess) ListenPacketContext(ctx context.Context, metadata *C.Metadata, o
}

if v.option.PacketAddr {
return newPacketConn(packetaddr.NewBindClient(c), v), nil
return newPacketConn(&threadSafePacketConn{PacketConn: packetaddr.NewBindClient(c)}, v), nil
} else if pc, ok := c.(net.PacketConn); ok {
return newPacketConn(pc, v), nil
return newPacketConn(&threadSafePacketConn{PacketConn: pc}, v), nil
}
return newPacketConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
}

// ListenPacketOnStreamConn implements C.ProxyAdapter
func (v *Vmess) ListenPacketOnStreamConn(c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
if v.option.PacketAddr {
return newPacketConn(packetaddr.NewBindClient(c), v), nil
return newPacketConn(&threadSafePacketConn{PacketConn: packetaddr.NewBindClient(c)}, v), nil
} else if pc, ok := c.(net.PacketConn); ok {
return newPacketConn(pc, v), nil
return newPacketConn(&threadSafePacketConn{PacketConn: pc}, v), nil
}
return newPacketConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
}
Expand Down Expand Up @@ -357,12 +358,26 @@ func NewVmess(option VmessOption) (*Vmess, error) {
return v, nil
}

type threadSafePacketConn struct {
net.PacketConn
access sync.Mutex
}

func (c *threadSafePacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
c.access.Lock()
defer c.access.Unlock()
return c.PacketConn.WriteTo(b, addr)
}

type vmessPacketConn struct {
net.Conn
rAddr net.Addr
rAddr net.Addr
access sync.Mutex
}

func (uc *vmessPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
uc.access.Lock()
defer uc.access.Unlock()
return uc.Conn.Write(b)
}

Expand Down

0 comments on commit 6b44178

Please sign in to comment.