mirror of
https://github.com/MetaCubeX/mihomo.git
synced 2025-12-24 12:12:43 +08:00
fix: race in close grpc transport
Some checks failed
Build / build (map[abi:1 debian:loongarch64 goarch:loong64 goos:linux output:loong64-abi1 rpm:loongarch64]) (push) Has been cancelled
Build / build (map[abi:2 debian:loong64 goarch:loong64 goos:linux output:loong64-abi2 rpm:loong64]) (push) Has been cancelled
Build / build (map[debian:amd64 goamd64:v3 goarch:amd64 goos:linux output:amd64 pacman:x86_64 rpm:x86_64]) (push) Has been cancelled
Build / build (map[debian:arm64 goarch:arm64 goos:linux output:arm64 pacman:aarch64 rpm:aarch64]) (push) Has been cancelled
Build / build (map[debian:armel goarch:arm goarm:6 goos:linux output:armv6 rpm:armv6hl]) (push) Has been cancelled
Build / build (map[debian:armhf goarch:arm goarm:7 goos:linux output:armv7 pacman:armv7hl rpm:armv7hl]) (push) Has been cancelled
Build / build (map[debian:i386 go386:sse2 goarch:386 goos:linux output:386 rpm:i386]) (push) Has been cancelled
Build / build (map[debian:mips64el goarch:mips64le goos:linux output:mips64le rpm:mips64el]) (push) Has been cancelled
Build / build (map[debian:ppc64el goarch:ppc64le goos:linux output:ppc64le rpm:ppc64le]) (push) Has been cancelled
Build / build (map[debian:riscv64 goarch:riscv64 goos:linux output:riscv64 rpm:riscv64]) (push) Has been cancelled
Build / build (map[debian:s390x goarch:s390x goos:linux output:s390x rpm:s390x]) (push) Has been cancelled
Build / build (map[go386:softfloat goarch:386 goos:linux output:386-softfloat]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin goversion:1.20 output:amd64-compatible-go120]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin goversion:1.22 output:amd64-compatible-go122]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:freebsd output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux goversion:1.20 output:amd64-compatible-go120 test:test]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux goversion:1.23 output:amd64-compatible-go123 test:test]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux output:amd64-compatible test:test]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.20 output:amd64-compatible-go120]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.21 output:amd64-compatible-go121]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.22 output:amd64-compatible-go122]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.23 output:amd64-compatible-go123]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin goversion:1.20 output:amd64-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin goversion:1.22 output:amd64-go122]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin output:amd64]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:freebsd output:amd64]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:linux goversion:1.20 output:amd64-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:linux goversion:1.23 output:amd64-go123]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.20 output:amd64-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.21 output:amd64-go121]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.22 output:amd64-go122]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.23 output:amd64-go123]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows output:amd64]) (push) Has been cancelled
Build / build (map[goarch:386 goos:android ndk:i686-linux-android34 output:386]) (push) Has been cancelled
Build / build (map[goarch:386 goos:freebsd output:386]) (push) Has been cancelled
Build / build (map[goarch:386 goos:linux goversion:1.20 output:386-go120]) (push) Has been cancelled
Build / build (map[goarch:386 goos:linux goversion:1.23 output:386-go123]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.20 output:386-go120]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.21 output:386-go121]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.22 output:386-go122]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.23 output:386-go123]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows output:386]) (push) Has been cancelled
Build / build (map[goarch:amd64 goos:android ndk:x86_64-linux-android34 output:amd64]) (push) Has been cancelled
Build / build (map[goarch:arm goarm:5 goos:linux output:armv5]) (push) Has been cancelled
Build / build (map[goarch:arm goos:android ndk:armv7a-linux-androideabi34 output:armv7]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:android ndk:aarch64-linux-android34 output:arm64-v8]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin goversion:1.20 output:arm64-go120]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin goversion:1.22 output:arm64-go122]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin output:arm64]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:freebsd output:arm64]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:windows output:arm64]) (push) Has been cancelled
Build / build (map[goarch:mips gomips:hardfloat goos:linux output:mips-hardfloat]) (push) Has been cancelled
Build / build (map[goarch:mips gomips:softfloat goos:linux output:mips-softfloat]) (push) Has been cancelled
Build / build (map[goarch:mips64 goos:linux output:mips64]) (push) Has been cancelled
Build / build (map[goarch:mipsle gomips:hardfloat goos:linux output:mipsle-hardfloat]) (push) Has been cancelled
Build / build (map[goarch:mipsle gomips:softfloat goos:linux output:mipsle-softfloat]) (push) Has been cancelled
Build / Upload-Prerelease (push) Has been cancelled
Build / Upload-Release (push) Has been cancelled
Build / Docker (push) Has been cancelled
Test / test (1.20, macos-13) (push) Has been cancelled
Test / test (1.20, macos-latest) (push) Has been cancelled
Test / test (1.20, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.20, ubuntu-latest) (push) Has been cancelled
Test / test (1.20, windows-latest) (push) Has been cancelled
Test / test (1.21, macos-13) (push) Has been cancelled
Test / test (1.21, macos-latest) (push) Has been cancelled
Test / test (1.21, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.21, ubuntu-latest) (push) Has been cancelled
Test / test (1.21, windows-latest) (push) Has been cancelled
Test / test (1.22, macos-13) (push) Has been cancelled
Test / test (1.22, macos-latest) (push) Has been cancelled
Test / test (1.22, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.22, ubuntu-latest) (push) Has been cancelled
Test / test (1.22, windows-latest) (push) Has been cancelled
Test / test (1.23, macos-13) (push) Has been cancelled
Test / test (1.23, macos-latest) (push) Has been cancelled
Test / test (1.23, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.23, ubuntu-latest) (push) Has been cancelled
Test / test (1.23, windows-latest) (push) Has been cancelled
Test / test (1.24, macos-13) (push) Has been cancelled
Test / test (1.24, macos-latest) (push) Has been cancelled
Test / test (1.24, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.24, ubuntu-latest) (push) Has been cancelled
Test / test (1.24, windows-latest) (push) Has been cancelled
Trigger CMFA Update / trigger-CMFA-update (push) Has been cancelled
Some checks failed
Build / build (map[abi:1 debian:loongarch64 goarch:loong64 goos:linux output:loong64-abi1 rpm:loongarch64]) (push) Has been cancelled
Build / build (map[abi:2 debian:loong64 goarch:loong64 goos:linux output:loong64-abi2 rpm:loong64]) (push) Has been cancelled
Build / build (map[debian:amd64 goamd64:v3 goarch:amd64 goos:linux output:amd64 pacman:x86_64 rpm:x86_64]) (push) Has been cancelled
Build / build (map[debian:arm64 goarch:arm64 goos:linux output:arm64 pacman:aarch64 rpm:aarch64]) (push) Has been cancelled
Build / build (map[debian:armel goarch:arm goarm:6 goos:linux output:armv6 rpm:armv6hl]) (push) Has been cancelled
Build / build (map[debian:armhf goarch:arm goarm:7 goos:linux output:armv7 pacman:armv7hl rpm:armv7hl]) (push) Has been cancelled
Build / build (map[debian:i386 go386:sse2 goarch:386 goos:linux output:386 rpm:i386]) (push) Has been cancelled
Build / build (map[debian:mips64el goarch:mips64le goos:linux output:mips64le rpm:mips64el]) (push) Has been cancelled
Build / build (map[debian:ppc64el goarch:ppc64le goos:linux output:ppc64le rpm:ppc64le]) (push) Has been cancelled
Build / build (map[debian:riscv64 goarch:riscv64 goos:linux output:riscv64 rpm:riscv64]) (push) Has been cancelled
Build / build (map[debian:s390x goarch:s390x goos:linux output:s390x rpm:s390x]) (push) Has been cancelled
Build / build (map[go386:softfloat goarch:386 goos:linux output:386-softfloat]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin goversion:1.20 output:amd64-compatible-go120]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin goversion:1.22 output:amd64-compatible-go122]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:freebsd output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux goversion:1.20 output:amd64-compatible-go120 test:test]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux goversion:1.23 output:amd64-compatible-go123 test:test]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux output:amd64-compatible test:test]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.20 output:amd64-compatible-go120]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.21 output:amd64-compatible-go121]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.22 output:amd64-compatible-go122]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.23 output:amd64-compatible-go123]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin goversion:1.20 output:amd64-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin goversion:1.22 output:amd64-go122]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin output:amd64]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:freebsd output:amd64]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:linux goversion:1.20 output:amd64-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:linux goversion:1.23 output:amd64-go123]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.20 output:amd64-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.21 output:amd64-go121]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.22 output:amd64-go122]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.23 output:amd64-go123]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows output:amd64]) (push) Has been cancelled
Build / build (map[goarch:386 goos:android ndk:i686-linux-android34 output:386]) (push) Has been cancelled
Build / build (map[goarch:386 goos:freebsd output:386]) (push) Has been cancelled
Build / build (map[goarch:386 goos:linux goversion:1.20 output:386-go120]) (push) Has been cancelled
Build / build (map[goarch:386 goos:linux goversion:1.23 output:386-go123]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.20 output:386-go120]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.21 output:386-go121]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.22 output:386-go122]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.23 output:386-go123]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows output:386]) (push) Has been cancelled
Build / build (map[goarch:amd64 goos:android ndk:x86_64-linux-android34 output:amd64]) (push) Has been cancelled
Build / build (map[goarch:arm goarm:5 goos:linux output:armv5]) (push) Has been cancelled
Build / build (map[goarch:arm goos:android ndk:armv7a-linux-androideabi34 output:armv7]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:android ndk:aarch64-linux-android34 output:arm64-v8]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin goversion:1.20 output:arm64-go120]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin goversion:1.22 output:arm64-go122]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin output:arm64]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:freebsd output:arm64]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:windows output:arm64]) (push) Has been cancelled
Build / build (map[goarch:mips gomips:hardfloat goos:linux output:mips-hardfloat]) (push) Has been cancelled
Build / build (map[goarch:mips gomips:softfloat goos:linux output:mips-softfloat]) (push) Has been cancelled
Build / build (map[goarch:mips64 goos:linux output:mips64]) (push) Has been cancelled
Build / build (map[goarch:mipsle gomips:hardfloat goos:linux output:mipsle-hardfloat]) (push) Has been cancelled
Build / build (map[goarch:mipsle gomips:softfloat goos:linux output:mipsle-softfloat]) (push) Has been cancelled
Build / Upload-Prerelease (push) Has been cancelled
Build / Upload-Release (push) Has been cancelled
Build / Docker (push) Has been cancelled
Test / test (1.20, macos-13) (push) Has been cancelled
Test / test (1.20, macos-latest) (push) Has been cancelled
Test / test (1.20, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.20, ubuntu-latest) (push) Has been cancelled
Test / test (1.20, windows-latest) (push) Has been cancelled
Test / test (1.21, macos-13) (push) Has been cancelled
Test / test (1.21, macos-latest) (push) Has been cancelled
Test / test (1.21, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.21, ubuntu-latest) (push) Has been cancelled
Test / test (1.21, windows-latest) (push) Has been cancelled
Test / test (1.22, macos-13) (push) Has been cancelled
Test / test (1.22, macos-latest) (push) Has been cancelled
Test / test (1.22, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.22, ubuntu-latest) (push) Has been cancelled
Test / test (1.22, windows-latest) (push) Has been cancelled
Test / test (1.23, macos-13) (push) Has been cancelled
Test / test (1.23, macos-latest) (push) Has been cancelled
Test / test (1.23, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.23, ubuntu-latest) (push) Has been cancelled
Test / test (1.23, windows-latest) (push) Has been cancelled
Test / test (1.24, macos-13) (push) Has been cancelled
Test / test (1.24, macos-latest) (push) Has been cancelled
Test / test (1.24, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.24, ubuntu-latest) (push) Has been cancelled
Test / test (1.24, windows-latest) (push) Has been cancelled
Trigger CMFA Update / trigger-CMFA-update (push) Has been cancelled
This commit is contained in:
@@ -18,7 +18,6 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/metacubex/mihomo/common/atomic"
|
||||
"github.com/metacubex/mihomo/common/buf"
|
||||
"github.com/metacubex/mihomo/common/pool"
|
||||
"github.com/metacubex/mihomo/component/ech"
|
||||
@@ -42,16 +41,19 @@ type DialFn = func(ctx context.Context, network, addr string) (net.Conn, error)
|
||||
|
||||
type Conn struct {
|
||||
initFn func() (io.ReadCloser, netAddr, error)
|
||||
writer io.Writer
|
||||
writer io.Writer // writer must not nil
|
||||
closer io.Closer
|
||||
netAddr
|
||||
|
||||
reader io.ReadCloser
|
||||
once sync.Once
|
||||
closed atomic.Bool
|
||||
err error
|
||||
remain int
|
||||
br *bufio.Reader
|
||||
initOnce sync.Once
|
||||
initErr error
|
||||
reader io.ReadCloser
|
||||
br *bufio.Reader
|
||||
remain int
|
||||
|
||||
closeMutex sync.Mutex
|
||||
closed bool
|
||||
|
||||
// deadlines
|
||||
deadline *time.Timer
|
||||
}
|
||||
@@ -65,7 +67,7 @@ type Config struct {
|
||||
func (g *Conn) initReader() {
|
||||
reader, addr, err := g.initFn()
|
||||
if err != nil {
|
||||
g.err = err
|
||||
g.initErr = err
|
||||
if closer, ok := g.writer.(io.Closer); ok {
|
||||
closer.Close()
|
||||
}
|
||||
@@ -73,17 +75,21 @@ func (g *Conn) initReader() {
|
||||
}
|
||||
g.netAddr = addr
|
||||
|
||||
if !g.closed.Load() {
|
||||
g.reader = reader
|
||||
g.br = bufio.NewReader(reader)
|
||||
} else {
|
||||
reader.Close()
|
||||
g.closeMutex.Lock()
|
||||
defer g.closeMutex.Unlock()
|
||||
if g.closed { // if g.Close() be called between g.initFn(), direct close the initFn returned reader
|
||||
_ = reader.Close()
|
||||
g.initErr = net.ErrClosed
|
||||
return
|
||||
}
|
||||
|
||||
g.reader = reader
|
||||
g.br = bufio.NewReader(reader)
|
||||
}
|
||||
|
||||
func (g *Conn) Init() error {
|
||||
g.once.Do(g.initReader)
|
||||
return g.err
|
||||
g.initOnce.Do(g.initReader)
|
||||
return g.initErr
|
||||
}
|
||||
|
||||
func (g *Conn) Read(b []byte) (n int, err error) {
|
||||
@@ -100,8 +106,6 @@ func (g *Conn) Read(b []byte) (n int, err error) {
|
||||
n, err = io.ReadFull(g.br, b[:size])
|
||||
g.remain -= n
|
||||
return
|
||||
} else if g.reader == nil {
|
||||
return 0, net.ErrClosed
|
||||
}
|
||||
|
||||
// 0x00 grpclength(uint32) 0x0A uleb128 payload
|
||||
@@ -147,8 +151,8 @@ func (g *Conn) Write(b []byte) (n int, err error) {
|
||||
buf.Write(b)
|
||||
|
||||
_, err = g.writer.Write(buf.Bytes())
|
||||
if err == io.ErrClosedPipe && g.err != nil {
|
||||
err = g.err
|
||||
if err == io.ErrClosedPipe && g.initErr != nil {
|
||||
err = g.initErr
|
||||
}
|
||||
|
||||
if flusher, ok := g.writer.(http.Flusher); ok {
|
||||
@@ -170,8 +174,8 @@ func (g *Conn) WriteBuffer(buffer *buf.Buffer) error {
|
||||
binary.PutUvarint(header[6:], uint64(dataLen))
|
||||
_, err := g.writer.Write(buffer.Bytes())
|
||||
|
||||
if err == io.ErrClosedPipe && g.err != nil {
|
||||
err = g.err
|
||||
if err == io.ErrClosedPipe && g.initErr != nil {
|
||||
err = g.initErr
|
||||
}
|
||||
|
||||
if flusher, ok := g.writer.(http.Flusher); ok {
|
||||
@@ -186,7 +190,17 @@ func (g *Conn) FrontHeadroom() int {
|
||||
}
|
||||
|
||||
func (g *Conn) Close() error {
|
||||
g.closed.Store(true)
|
||||
g.initOnce.Do(func() { // if initReader not called, it should not be run anymore
|
||||
g.initErr = net.ErrClosed
|
||||
})
|
||||
|
||||
g.closeMutex.Lock()
|
||||
defer g.closeMutex.Unlock()
|
||||
if g.closed {
|
||||
return nil
|
||||
}
|
||||
g.closed = true
|
||||
|
||||
var errorArr []error
|
||||
|
||||
if reader := g.reader; reader != nil {
|
||||
|
||||
Reference in New Issue
Block a user