Merge 3051f013f2 into de19f927e8

adapter/adapter.go

@@ -165,6 +165,8 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
 	mapping["udp"] = p.SupportUDP()
 	mapping["xudp"] = p.SupportXUDP()
 	mapping["tfo"] = p.SupportTFO()
+	mapping["mptcp"] = p.SupportMPTCP()
+	mapping["smux"] = p.SupportSMUX()
 	return json.Marshal(mapping)
 }
 

adapter/outbound/base.go

@@ -95,6 +95,16 @@ func (b *Base) SupportTFO() bool {
 	return b.tfo
 }
 
+// SupportMPTCP implements C.ProxyAdapter
+func (b *Base) SupportMPTCP() bool {
+	return b.mpTcp
+}
+
+// SupportSMUX implements C.ProxyAdapter
+func (b *Base) SupportSMUX() bool {
+	return false
+}
+
 // IsL3Protocol implements C.ProxyAdapter
 func (b *Base) IsL3Protocol(metadata *C.Metadata) bool {
 	return false

adapter/outbound/singmux.go

@@ -97,6 +97,10 @@ func (s *SingMux) SupportUOT() bool {
 	return true
 }
 
+func (s *SingMux) SupportSMUX() bool {
+	return true
+}
+
 func closeSingMux(s *SingMux) {
 	_ = s.client.Close()
 }

adapter/outbound/wireguard.go

@@ -625,6 +625,20 @@ func (r *refProxyAdapter) SupportTFO() bool {
 	return false
 }
 
+func (r *refProxyAdapter) SupportMPTCP() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportMPTCP()
+	}
+	return false
+}
+
+func (r *refProxyAdapter) SupportSMUX() bool {
+	if r.proxyAdapter != nil {
+		return r.proxyAdapter.SupportSMUX()
+	}
+	return false
+}
+
 func (r *refProxyAdapter) MarshalJSON() ([]byte, error) {
 	if r.proxyAdapter != nil {
 		return r.proxyAdapter.MarshalJSON()

constant/adapters.go

@@ -106,6 +106,8 @@ type ProxyAdapter interface {
 	SupportUDP() bool
 	SupportXUDP() bool
 	SupportTFO() bool
+	SupportMPTCP() bool
+	SupportSMUX() bool
 	MarshalJSON() ([]byte, error)
 
 	// Deprecated: use DialContextWithDialer and ListenPacketWithDialer instead.

transport/gun/gun.go

@@ -256,7 +256,7 @@ func NewHTTP2Client(dialFn DialFn, tlsConfig *tls.Config, Fingerprint string, re
 		TLSClientConfig:    tlsConfig,
 		AllowHTTP:          false,
 		DisableCompression: true,
-		PingTimeout:        0,
+		ReadIdleTimeout:    15 * time.Second,
 	}
 
 	return &wrap