go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

default to smux version 2 for tunnel

Browse Source
This commit is contained in:
ginuerzh 2023-10-17 22:15:23 +08:00
parent 1759c95e78
commit 0a565120df
5 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connector/relay/metadata.go
View File

@ -11,7 +11,7 @@ import (
) )
const ( const (
defaultMuxVersion = 2 defaultMuxVersion = 1
) )
type metadata struct { type metadata struct {

2
connector/tunnel/bind.go
View File

@ -21,7 +21,7 @@ func (c *tunnelConnector) Bind(ctx context.Context, conn net.Conn, network, addr
} }
log.Infof("create tunnel on %s/%s OK, tunnel=%s, connector=%s", addr, network, c.md.tunnelID.String(), cid) log.Infof("create tunnel on %s/%s OK, tunnel=%s, connector=%s", addr, network, c.md.tunnelID.String(), cid)
session, err := mux.ServerSession(conn, nil) session, err := mux.ServerSession(conn, c.md.muxCfg)
if err != nil { if err != nil {
return nil, err return nil, err
} }

26
connector/tunnel/metadata.go
View File

@ -7,9 +7,14 @@ import (
mdata "github.com/go-gost/core/metadata" mdata "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/core/metadata/util" mdutil "github.com/go-gost/core/metadata/util"
"github.com/go-gost/relay" "github.com/go-gost/relay"
"github.com/go-gost/x/internal/util/mux"
"github.com/google/uuid" "github.com/google/uuid"
) )
const (
defaultMuxVersion = 2
)
var ( var (
ErrInvalidTunnelID = errors.New("tunnel: invalid tunnel ID") ErrInvalidTunnelID = errors.New("tunnel: invalid tunnel ID")
) )
@ -18,14 +23,11 @@ type metadata struct {
connectTimeout time.Duration connectTimeout time.Duration
tunnelID relay.TunnelID tunnelID relay.TunnelID
noDelay bool noDelay bool
muxCfg *mux.Config
} }
func (c *tunnelConnector) parseMetadata(md mdata.Metadata) (err error) { func (c *tunnelConnector) parseMetadata(md mdata.Metadata) (err error) {
const ( c.md.connectTimeout = mdutil.GetDuration(md, "connectTimeout")
connectTimeout = "connectTimeout"
)
c.md.connectTimeout = mdutil.GetDuration(md, connectTimeout)
c.md.noDelay = mdutil.GetBool(md, "nodelay") c.md.noDelay = mdutil.GetBool(md, "nodelay")
if s := mdutil.GetString(md, "tunnelID", "tunnel.id"); s != "" { if s := mdutil.GetString(md, "tunnelID", "tunnel.id"); s != "" {
@ -39,5 +41,19 @@ func (c *tunnelConnector) parseMetadata(md mdata.Metadata) (err error) {
if c.md.tunnelID.IsZero() { if c.md.tunnelID.IsZero() {
return ErrInvalidTunnelID return ErrInvalidTunnelID
} }
c.md.muxCfg = &mux.Config{
Version: mdutil.GetInt(md, "mux.version"),
KeepAliveInterval: mdutil.GetDuration(md, "mux.keepaliveInterval"),
KeepAliveDisabled: mdutil.GetBool(md, "mux.keepaliveDisabled"),
KeepAliveTimeout: mdutil.GetDuration(md, "mux.keepaliveTimeout"),
MaxFrameSize: mdutil.GetInt(md, "mux.maxFrameSize"),
MaxReceiveBuffer: mdutil.GetInt(md, "mux.maxReceiveBuffer"),
MaxStreamBuffer: mdutil.GetInt(md, "mux.maxStreamBuffer"),
}
if c.md.muxCfg.Version == 0 {
c.md.muxCfg.Version = defaultMuxVersion
}
return return
} }

4
handler/relay/bind.go
View File

@ -81,7 +81,7 @@ func (h *relayHandler) bindTCP(ctx context.Context, conn net.Conn, network, addr
} }
// Upgrade connection to multiplex session. // Upgrade connection to multiplex session.
session, err := mux.ClientSession(conn, nil) session, err := mux.ClientSession(conn, h.md.muxCfg)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
return err return err
@ -219,7 +219,7 @@ func (h *relayHandler) handleBindTunnel(ctx context.Context, conn net.Conn, netw
resp.WriteTo(conn) resp.WriteTo(conn)
// Upgrade connection to multiplex session. // Upgrade connection to multiplex session.
session, err := mux.ClientSession(conn, nil) session, err := mux.ClientSession(conn, h.md.muxCfg)
if err != nil { if err != nil {
return return
} }

12
handler/relay/metadata.go
View File

@ -10,6 +10,7 @@ import (
mdata "github.com/go-gost/core/metadata" mdata "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/core/metadata/util" mdutil "github.com/go-gost/core/metadata/util"
xingress "github.com/go-gost/x/ingress" xingress "github.com/go-gost/x/ingress"
"github.com/go-gost/x/internal/util/mux"
"github.com/go-gost/x/registry" "github.com/go-gost/x/registry"
) )
@ -23,6 +24,7 @@ type metadata struct {
entryPoint string entryPoint string
entryPointProxyProtocol int entryPointProxyProtocol int
ingress ingress.Ingress ingress ingress.Ingress
muxCfg *mux.Config
} }
func (h *relayHandler) parseMetadata(md mdata.Metadata) (err error) { func (h *relayHandler) parseMetadata(md mdata.Metadata) (err error) {
@ -76,5 +78,15 @@ func (h *relayHandler) parseMetadata(md mdata.Metadata) (err error) {
} }
} }
h.md.muxCfg = &mux.Config{
Version: mdutil.GetInt(md, "mux.version"),
KeepAliveInterval: mdutil.GetDuration(md, "mux.keepaliveInterval"),
KeepAliveDisabled: mdutil.GetBool(md, "mux.keepaliveDisabled"),
KeepAliveTimeout: mdutil.GetDuration(md, "mux.keepaliveTimeout"),
MaxFrameSize: mdutil.GetInt(md, "mux.maxFrameSize"),
MaxReceiveBuffer: mdutil.GetInt(md, "mux.maxReceiveBuffer"),
MaxStreamBuffer: mdutil.GetInt(md, "mux.maxStreamBuffer"),
}
return return
} }