Skip to content
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

fix: close UDP associations once relay is done #238

Merged
merged 1 commit into from
Feb 11, 2025
Merged

fix: close UDP associations once relay is done #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 19 additions & 16 deletions service/udp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func (h *associationHandler) HandleAssociation(ctx context.Context, clientConn n
}
clientProxyBytes, err := clientConn.Read(readBuf)
if errors.Is(err, net.ErrClosed) || errors.Is(err, io.EOF) {
debugUDP(l, "Client closed connection")
debugUDP(l, "Client connection closed")
break
}
pkt := readBuf[:clientProxyBytes]
Expand Down Expand Up @@ -199,7 +199,10 @@ func (h *associationHandler) HandleAssociation(ctx context.Context, clientConn n
return onet.NewConnectionError("ERR_CREATE_SOCKET", "Failed to create a `PacketConn`", err)
}
l = l.With(slog.Any("tgtListener", targetConn.LocalAddr()))
go relayTargetToClient(targetConn, clientConn, cryptoKey, assocMetrics, l)
go func() {
relayTargetToClient(targetConn, clientConn, cryptoKey, assocMetrics, l)
clientConn.Close()
}()
} else {
unpackStart := time.Now()
textData, err := shadowsocks.Unpack(nil, pkt, cryptoKey)
Expand Down Expand Up @@ -348,8 +351,8 @@ type association struct {

var _ net.Conn = (*association)(nil)

func (c *association) Read(p []byte) (int, error) {
pkt, ok := <-c.readCh
func (a *association) Read(p []byte) (int, error) {
pkt, ok := <-a.readCh
if !ok {
return 0, net.ErrClosed
}
Expand All @@ -361,32 +364,32 @@ func (c *association) Read(p []byte) (int, error) {
return n, nil
}

func (c *association) Write(b []byte) (n int, err error) {
return c.pc.WriteTo(b, c.clientAddr)
func (a *association) Write(b []byte) (n int, err error) {
return a.pc.WriteTo(b, a.clientAddr)
}

func (c *association) Close() error {
close(c.readCh)
return c.pc.Close()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Who will close the PacketConn?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PacketConn is closed by the listener set:

outline-ss-server/cmd/outline-ss-server/main.go

Line 189 in 0387dfb

if err := listenerCloseFunc(); err != nil {

func (a *association) Close() error {
close(a.readCh)
return nil
}

func (c *association) LocalAddr() net.Addr {
return c.pc.LocalAddr()
func (a *association) LocalAddr() net.Addr {
return a.pc.LocalAddr()
}

func (c *association) RemoteAddr() net.Addr {
return c.clientAddr
func (a *association) RemoteAddr() net.Addr {
return a.clientAddr
}

func (c *association) SetDeadline(t time.Time) error {
func (a *association) SetDeadline(t time.Time) error {
return errors.ErrUnsupported
}

func (c *association) SetReadDeadline(t time.Time) error {
func (a *association) SetReadDeadline(t time.Time) error {
return errors.ErrUnsupported
}

func (c *association) SetWriteDeadline(t time.Time) error {
func (a *association) SetWriteDeadline(t time.Time) error {
return errors.ErrUnsupported
}

Expand Down