mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-05-08 13:18:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add smux support

Browse source
This commit is contained in:
世界 2023-04-23 19:27:32 +08:00
parent 18e5b0963f
commit 837d7d885f
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
7 changed files with 293 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

40
infra/conf/xray.go
View file

@ -130,6 +130,24 @@ func (m *MuxConfig) Build() (*proxyman.MultiplexingConfig, error) {
}, nil
}
type SingMuxConfig struct {
Enabled bool `json:"enabled"`
Protocol string `json:"protocol"`
MaxConnections int `json:"max_connections"`
MinStreams int `json:"min_streams"`
MaxStreams int `json:"max_streams"`
}
func (m *SingMuxConfig) Build() (*proxyman.SingMultiplexConfig, error) {
return &proxyman.SingMultiplexConfig{
Enabled: m.Enabled,
Protocol: m.Protocol,
MaxConnections: int32(m.MaxConnections),
MinStreams: int32(m.MinStreams),
MaxStreams: int32(m.MaxStreams),
}, nil
}
type InboundDetourAllocationConfig struct {
Strategy string `json:"strategy"`
Concurrency *uint32 `json:"concurrency"`
@ -278,13 +296,14 @@ func (c *InboundDetourConfig) Build() (*core.InboundHandlerConfig, error) {
}
type OutboundDetourConfig struct {
Protocol string `json:"protocol"`
SendThrough *Address `json:"sendThrough"`
Tag string `json:"tag"`
Settings *json.RawMessage `json:"settings"`
StreamSetting *StreamConfig `json:"streamSettings"`
ProxySettings *ProxyConfig `json:"proxySettings"`
MuxSettings *MuxConfig `json:"mux"`
Protocol string `json:"protocol"`
SendThrough *Address `json:"sendThrough"`
Tag string `json:"tag"`
Settings *json.RawMessage `json:"settings"`
StreamSetting *StreamConfig `json:"streamSettings"`
ProxySettings *ProxyConfig `json:"proxySettings"`
MuxSettings *MuxConfig `json:"mux"`
SingMuxSettings *SingMuxConfig `json:"smux"`
}
func (c *OutboundDetourConfig) checkChainProxyConfig() error {
@ -347,6 +366,13 @@ func (c *OutboundDetourConfig) Build() (*core.OutboundHandlerConfig, error) {
}
senderSettings.MultiplexSettings = ms
}
if c.SingMuxSettings != nil {
ms, err := c.SingMuxSettings.Build()
if err != nil {
return nil, newError("failed to build sing-mux config.").Base(err)
}
senderSettings.SmuxSettings = ms
}
settings := []byte("{}")
if c.Settings != nil {