Files
sing-box/service/usbip/server_shared.go
T
世界 e59e14d89d usbip: drop defensive WaitGroup waits in service Close
The server's pendingConnsWG/sessionsWG and the client's wg + 15s shutdown
timer only delayed Close until goroutines settled; they did not own any
resource release. closeConnOnContextDone already closes each accepted or
dialed conn on ctx cancel, so reads/writes error out and the goroutines
exit on their own. Cancel ctx, close the listener and sessions, call
host.Close, return -- no Wait. Keep darwinServerDataSession.wg: it gates
in-flight cgo submit goroutines against device close and is a correctness
barrier, not shutdown defense.
2026-06-09 10:42:34 +08:00

84 lines
1.8 KiB
Go

//go:build linux || (darwin && cgo)
package usbip
import (
"bytes"
"io"
"net"
"time"
E "github.com/sagernet/sing/common/exceptions"
)
func (s *ServerService) acceptLoop(ln net.Listener) {
for {
conn, err := ln.Accept()
if err != nil {
select {
case <-s.ctx.Done():
return
default:
}
if E.IsClosed(err) {
return
}
//nolint:staticcheck // net.Error.Temporary predates net.ErrClosed; replacement needs a separate audit.
if netError, isNetError := err.(net.Error); isNetError && netError.Temporary() {
s.logger.Error("accept: ", err)
if !sleepCtx(s.ctx, 200*time.Millisecond) {
return
}
continue
}
s.logger.Error("accept: ", err)
return
}
go s.dispatchConn(conn)
}
}
func (s *ServerService) dispatchConn(conn net.Conn) {
cancelClose := closeConnOnContextDone(s.ctx, conn)
defer cancelClose()
var prefix [controlPrefaceSize]byte
_, err := io.ReadFull(conn, prefix[:])
if err != nil {
s.logger.Debug("read connection preface: ", err)
_ = conn.Close()
return
}
if bytes.Equal(prefix[:], controlPreface[:]) {
s.handleControlConn(conn)
return
}
s.handleStandardConn(conn, ParseOpHeader(prefix[:]))
}
func (s *ServerService) readControlConn(sub *exportSubscriber, done chan<- struct{}) {
defer close(done)
var reader controlReader
for {
message, err := reader.read(sub.conn)
if err != nil {
return
}
frame := message.Frame
switch frame.Type {
case controlFramePing:
s.ledger.enqueueFrame(sub, controlFrame{
Type: controlFramePong,
Version: controlProtocolVersion,
})
case controlFrameLeaseRequest:
if supportsControlExtensions(sub.capabilities) {
s.ledger.HandleControlLeaseRequest(sub, message.Payload)
continue
}
return
default:
return
}
}
}