black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-26 10:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TFO async write

Browse source
This commit is contained in:
世界 2023-09-09 19:51:10 +08:00
parent b1f289bce5
commit fe8d46cce5
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/dialer/tfo.go
View file

@ -7,6 +7,7 @@ import (
"io" "io"
"net" "net"
"os" "os"
"sync"
"time" "time"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
@ -24,6 +25,7 @@ type slowOpenConn struct {
destination M.Socksaddr destination M.Socksaddr
conn net.Conn conn net.Conn
create chan struct{} create chan struct{}
access sync.Mutex
err error err error
} }
@ -60,7 +62,19 @@ func (c *slowOpenConn) Read(b []byte) (n int, err error) {
} }
func (c *slowOpenConn) Write(b []byte) (n int, err error) { func (c *slowOpenConn) Write(b []byte) (n int, err error) {
if c.conn == nil { if c.conn != nil {
return c.conn.Write(b)
}
c.access.Lock()
defer c.access.Unlock()
select {
case <-c.create:
if c.err != nil {
return 0, c.err
}
return c.conn.Write(b)
default:
}
c.conn, err = c.dialer.DialContext(c.ctx, c.network, c.destination.String(), b) c.conn, err = c.dialer.DialContext(c.ctx, c.network, c.destination.String(), b)
if err != nil { if err != nil {
c.conn = nil c.conn = nil
@ -69,8 +83,6 @@ func (c *slowOpenConn) Write(b []byte) (n int, err error) {
close(c.create) close(c.create)
return return
} }
return c.conn.Write(b)
}
func (c *slowOpenConn) Close() error { func (c *slowOpenConn) Close() error {
return common.Close(c.conn) return common.Close(c.conn)