Compare commits

..
Author SHA1 Message Date
Fangliding 87bd03816a TLS handshake timeout 2026-11-16 08:43:03 +08:00
5 changed files with 22 additions and 10 deletions
-4
View File
@@ -236,10 +236,6 @@ func (w *BufferedWriter) Close() error {
return common.Close(w.writer)
}
func (w *BufferedWriter) Interrupt() {
common.Interrupt(w.writer)
}
// SequentialWriter is a Writer that writes MultiBuffer sequentially into the underlying io.Writer.
type SequentialWriter struct {
io.Writer
+1 -3
View File
@@ -188,9 +188,7 @@ var (
// NewClientWorker creates a new mux.Client.
func NewClientWorker(stream transport.Link, s ClientStrategy) (*ClientWorker, error) {
writer := buf.NewBufferedWriter(stream.Writer)
writer.SetBuffered(false)
stream.Writer = writer
stream.Writer = &MutexWriter{Writer: stream.Writer}
c := &ClientWorker{
sessionManager: NewSessionManager(),
link: stream,
+1 -3
View File
@@ -93,11 +93,9 @@ type ServerWorker struct {
}
func NewServerWorker(ctx context.Context, d routing.Dispatcher, link *transport.Link) (*ServerWorker, error) {
writer := buf.NewBufferedWriter(link.Writer)
writer.SetBuffered(false)
worker := &ServerWorker{
dispatcher: d,
link: &transport.Link{Reader: link.Reader, Writer: writer},
link: &transport.Link{Reader: link.Reader, Writer: &MutexWriter{Writer: link.Writer}},
sessionManager: NewSessionManager(),
done: done.New(),
timer: time.NewTicker(60 * time.Second),
+13
View File
@@ -1,6 +1,8 @@
package mux
import (
"sync"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/net"
@@ -9,6 +11,17 @@ import (
"github.com/xtls/xray-core/common/session"
)
type MutexWriter struct {
sync.Mutex
buf.Writer
}
func (w *MutexWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
w.Lock()
defer w.Unlock()
return w.Writer.WriteMultiBuffer(mb)
}
type Writer struct {
dest net.Destination
writer buf.Writer
+7
View File
@@ -103,6 +103,13 @@ func (c *UConn) Close() error {
return c.Conn.Close()
}
func (c *UConn) HandshakeContext(ctx context.Context) error {
// Chrome の default handshake timeout
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()
return c.UConn.HandshakeContext(ctx)
}
func (c *UConn) HandshakeContextServerName(ctx context.Context) string {
if err := c.HandshakeContext(ctx); err != nil {
return ""