Skip to content

TUN & WireGuard inbounds: Ignore b.UDP's domain when receiving it from outbound #6285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RPRX merged 2 commits into from
Jun 9, 2026
Merged

TUN & WireGuard inbounds: Ignore b.UDP's domain when receiving it from outbound #6285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49ce048
1
Jun 7, 2026
4db639d
chore
Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions proxy/tun/udp_fullcone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,22 @@ type udpConn struct {
}

func (c *udpConn) ReadMultiBuffer() (buf.MultiBuffer, error) {
e, ok := <-c.egress
if !ok {
return nil, io.EOF
}
for {
e, ok := <-c.egress
if !ok {
return nil, io.EOF
}

b := buf.New()
if _, err := b.Write(e.data); err != nil {
return nil, err
}
b.UDP = e.dest
b := buf.New()
if _, err := b.Write(e.data); err != nil {
errors.LogErrorInner(context.Background(), err, "drop packet to ", e.dest, " with size ", len(e.data))
b.Release()
continue
}
b.UDP = e.dest

return buf.MultiBuffer{b}, nil
return buf.MultiBuffer{b}, nil
}
}

// Read packets from the connection
Expand All @@ -129,7 +133,11 @@ func (c *udpConn) WriteMultiBuffer(mb buf.MultiBuffer) error {
for i, b := range mb {
dst := c.dst
if b.UDP != nil {
dst = *b.UDP
if b.UDP.Address.Family().IsDomain() {
errors.LogError(context.Background(), "impossible domain packet ", b.UDP, " reply via original target ", dst)
} else {
dst = *b.UDP
}
}
err := c.handler.writePacket(b.Bytes(), dst, c.src)
if err != nil {
Expand Down
30 changes: 19 additions & 11 deletions proxy/wireguard/tun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,19 +345,23 @@ type udpConn struct {
}

func (c *udpConn) ReadMultiBuffer() (buf.MultiBuffer, error) {
q, ok := <-c.queue
if !ok {
return nil, io.EOF
}
for {
q, ok := <-c.queue
if !ok {
return nil, io.EOF
}

b := buf.New()
if _, err := b.Write(q.p); err != nil {
return nil, err
}
b := buf.New()
if _, err := b.Write(q.p); err != nil {
errors.LogErrorInner(context.Background(), err, "drop packet to ", q.dest, " with size ", len(q.p))
b.Release()
continue
}

b.UDP = q.dest
b.UDP = q.dest

return buf.MultiBuffer{b}, nil
return buf.MultiBuffer{b}, nil
}
}

func (c *udpConn) Read(p []byte) (int, error) {
Expand All @@ -376,7 +380,11 @@ func (c *udpConn) WriteMultiBuffer(mb buf.MultiBuffer) error {
for i, b := range mb {
dst := c.dst
if b.UDP != nil {
dst = *b.UDP
if b.UDP.Address.Family().IsDomain() {
errors.LogError(context.Background(), "impossible domain packet ", b.UDP, " reply via original target ", dst)
} else {
dst = *b.UDP
}
}
err := c.writeFunc(b.Bytes(), dst, c.src)
if err != nil {
Expand Down
Loading