timamsk/sing-box
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Route cloudflare control plane through configurable dialer

Browse Source
This commit is contained in:
世界
2026-03-24 13:52:55 +08:00
parent d017cbe008
commit 2321e941e0
9 changed files with 75 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
protocol/cloudflare/connection_http2.go
View File

@@ -17,6 +17,7 @@ import (
"github.com/sagernet/sing-box/log"
E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/json"
M "github.com/sagernet/sing/common/metadata"
"github.com/google/uuid"
"golang.org/x/net/http2"
@@ -71,8 +72,7 @@ func NewHTTP2Connection(
ServerName: h2EdgeSNI,
}
dialer := &net.Dialer{}
tcpConn, err := dialer.DialContext(ctx, "tcp", edgeAddr.TCP.String())
tcpConn, err := inbound.controlDialer.DialContext(ctx, "tcp", M.SocksaddrFrom(edgeAddr.TCP.AddrPort().Addr(), edgeAddr.TCP.AddrPort().Port()))
if err != nil {
return nil, E.Cause(err, "dial edge TCP")
}
@@ -113,10 +113,13 @@ func (c *HTTP2Connection) Serve(ctx context.Context) error {
Handler: c,
})
if c.registrationResult != nil {
return nil
if ctx.Err() != nil {
return ctx.Err()
}
return E.New("edge connection closed before registration")
if c.registrationResult == nil {
return E.New("edge connection closed before registration")
}
return E.New("edge connection closed")
}
func (c *HTTP2Connection) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -167,6 +170,12 @@ func (c *HTTP2Connection) handleControlStream(ctx context.Context, r *http.Reque
" (connection ", result.ConnectionID, ")")
<-ctx.Done()
unregisterCtx, cancel := context.WithTimeout(context.Background(), c.gracePeriod)
defer cancel()
err = c.registrationClient.Unregister(unregisterCtx)
if err != nil {
c.logger.Debug("failed to unregister: ", err)
}
c.registrationClient.Close()
}