Merge tag 'v1.14.0'

protocol/naive/inbound.go

@@ -26,7 +26,7 @@ import (
 	sHttp "github.com/sagernet/sing/protocol/http"
 
 	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/h2c"
+	"golang.org/x/net/http2/h2c" //nolint:staticcheck
 )
 
 var (
@@ -59,6 +59,7 @@ func NewInbound(ctx context.Context, router adapter.Router, logger log.ContextLo
 		ctx:     ctx,
 		router:  uot.NewRouter(router, logger),
 		logger:  logger,
+		options: options,
 		listener: listener.New(listener.Options{
 			Context: ctx,
 			Logger:  logger,
@@ -102,6 +103,7 @@ func (n *Inbound) Start(stage adapter.StartStage) error {
 			return err
 		}
 		n.httpServer = &http.Server{
+			//nolint:staticcheck
 			Handler: h2c.NewHandler(n, &http2.Server{}),
 			BaseContext: func(listener net.Listener) context.Context {
 				return n.ctx

protocol/naive/outbound.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"encoding/pem"
 	"net"
-	"os"
 	"strings"
 
 	"github.com/sagernet/cronet-go"
@@ -25,6 +24,7 @@ import (
 	N "github.com/sagernet/sing/common/network"
 	"github.com/sagernet/sing/common/uot"
 	"github.com/sagernet/sing/service"
+	"github.com/sagernet/sing/service/filemanager"
 
 	mDNS "github.com/miekg/dns"
 )
@@ -109,7 +109,7 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
 	if len(options.TLS.Certificate) > 0 {
 		trustedRootCertificates = strings.Join(options.TLS.Certificate, "\n")
 	} else if options.TLS.CertificatePath != "" {
-		content, err := os.ReadFile(options.TLS.CertificatePath)
+		content, err := filemanager.ReadFile(ctx, options.TLS.CertificatePath)
 		if err != nil {
 			return nil, E.Cause(err, "read certificate")
 		}
@@ -146,7 +146,7 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
 		if len(options.TLS.ECH.Config) > 0 {
 			echConfig = []byte(strings.Join(options.TLS.ECH.Config, "\n"))
 		} else if options.TLS.ECH.ConfigPath != "" {
-			content, err := os.ReadFile(options.TLS.ECH.ConfigPath)
+			content, err := filemanager.ReadFile(ctx, options.TLS.ECH.ConfigPath)
 			if err != nil {
 				return nil, E.Cause(err, "read ECH config")
 			}
@@ -176,22 +176,24 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
 		return nil, E.New("unknown quic congestion control: ", options.QUICCongestionControl)
 	}
 	client, err := cronet.NewNaiveClient(cronet.NaiveClientOptions{
-		Context:                 ctx,
-		Logger:                  logger,
-		ServerAddress:           serverAddress,
-		ServerName:              serverName,
-		Username:                options.Username,
-		Password:                options.Password,
-		InsecureConcurrency:     options.InsecureConcurrency,
-		ExtraHeaders:            extraHeaders,
-		TrustedRootCertificates: trustedRootCertificates,
-		Dialer:                  outboundDialer,
-		DNSResolver:             dnsResolver,
-		ECHEnabled:              echEnabled,
-		ECHConfigList:           echConfigList,
-		ECHQueryServerName:      echQueryServerName,
-		QUIC:                    options.QUIC,
-		QUICCongestionControl:   quicCongestionControl,
+		Context:                  ctx,
+		Logger:                   logger,
+		ServerAddress:            serverAddress,
+		ServerName:               serverName,
+		Username:                 options.Username,
+		Password:                 options.Password,
+		InsecureConcurrency:      options.InsecureConcurrency,
+		ExtraHeaders:             extraHeaders,
+		ReceiveWindow:            options.ReceiveWindow.Value(),
+		TrustedRootCertificates:  trustedRootCertificates,
+		Dialer:                   outboundDialer,
+		DNSResolver:              dnsResolver,
+		ECHEnabled:               echEnabled,
+		ECHConfigList:            echConfigList,
+		ECHQueryServerName:       echQueryServerName,
+		QUIC:                     options.QUIC,
+		QUICCongestionControl:    quicCongestionControl,
+		QUICSessionReceiveWindow: options.QUICSessionReceiveWindow.Value(),
 	})
 	if err != nil {
 		return nil, err
@@ -254,8 +256,8 @@ func (h *Outbound) ListenPacket(ctx context.Context, destination M.Socksaddr) (n
 	return h.uotClient.ListenPacket(ctx, destination)
 }
 
-func (h *Outbound) InterfaceUpdated() {
-	h.client.Engine().CloseAllConnections()
+func (h *Outbound) InterfaceUpdated(ctx context.Context) {
+	h.client.CloseAllConnections()
 }
 
 func (h *Outbound) Close() error {

protocol/naive/quic/inbound_init.go

@@ -15,8 +15,6 @@ import (
 	"github.com/sagernet/sing-box/option"
 	"github.com/sagernet/sing-box/protocol/naive"
 	"github.com/sagernet/sing-quic"
-	"github.com/sagernet/sing-quic/congestion_bbr1"
-	"github.com/sagernet/sing-quic/congestion_bbr2"
 	congestion_meta1 "github.com/sagernet/sing-quic/congestion_meta1"
 	congestion_meta2 "github.com/sagernet/sing-quic/congestion_meta2"
 	"github.com/sagernet/sing/common"
@@ -48,44 +46,13 @@ func init() {
 		switch options.QUICCongestionControl {
 		case "", "bbr":
 			congestionControl = func(conn *quic.Conn) congestion.CongestionControl {
-				return congestion_meta2.NewBbrSender(
-					congestion_meta2.DefaultClock{TimeFunc: timeFunc},
-					congestion.ByteCount(conn.Config().InitialPacketSize),
-					congestion.ByteCount(congestion_meta1.InitialCongestionWindow),
-				)
-			}
-		case "bbr_standard":
-			congestionControl = func(conn *quic.Conn) congestion.CongestionControl {
-				return congestion_bbr1.NewBbrSender(
-					congestion_bbr1.DefaultClock{TimeFunc: timeFunc},
-					congestion.ByteCount(conn.Config().InitialPacketSize),
-					congestion_bbr1.InitialCongestionWindowPackets,
-					congestion_bbr1.MaxCongestionWindowPackets,
-				)
-			}
-		case "bbr2":
-			congestionControl = func(conn *quic.Conn) congestion.CongestionControl {
-				return congestion_bbr2.NewBBR2Sender(
-					congestion_bbr2.DefaultClock{TimeFunc: timeFunc},
-					congestion.ByteCount(conn.Config().InitialPacketSize),
-					0,
-					false,
-				)
-			}
-		case "bbr2_variant":
-			congestionControl = func(conn *quic.Conn) congestion.CongestionControl {
-				return congestion_bbr2.NewBBR2Sender(
-					congestion_bbr2.DefaultClock{TimeFunc: timeFunc},
-					congestion.ByteCount(conn.Config().InitialPacketSize),
-					32*congestion.ByteCount(conn.Config().InitialPacketSize),
-					true,
-				)
+				return congestion_meta2.NewBbrSenderWithProfile(conn.InitialPacketSize(), congestion_meta2.ProfileStandard)
 			}
 		case "cubic":
 			congestionControl = func(conn *quic.Conn) congestion.CongestionControl {
 				return congestion_meta1.NewCubicSender(
 					congestion_meta1.DefaultClock{TimeFunc: timeFunc},
-					congestion.ByteCount(conn.Config().InitialPacketSize),
+					conn.InitialPacketSize(),
 					false,
 				)
 			}
@@ -93,7 +60,7 @@ func init() {
 			congestionControl = func(conn *quic.Conn) congestion.CongestionControl {
 				return congestion_meta1.NewCubicSender(
 					congestion_meta1.DefaultClock{TimeFunc: timeFunc},
-					congestion.ByteCount(conn.Config().InitialPacketSize),
+					conn.InitialPacketSize(),
 					true,
 				)
 			}
@@ -104,6 +71,7 @@ func init() {
 		quicListener, err := qtls.ListenEarly(udpConn, tlsConfig, &quic.Config{
 			MaxIncomingStreams: 1 << 60,
 			Allow0RTT:          true,
+			DisablePathManager: true,
 		})
 		if err != nil {
 			udpConn.Close()