hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-11-06 10:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

name

Browse Source
This commit is contained in:
Fangliding
2026-10-31 19:18:23 +08:00
parent 7cea2b67a7
commit 90fc78ddda
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infra/conf/transport_method.go
+2 -2
View File
@@ -293,7 +293,7 @@ type SplitHTTPConfig struct {
ServerMaxHeaderBytes int32 `json:"serverMaxHeaderBytes"` ServerMaxHeaderBytes int32 `json:"serverMaxHeaderBytes"`
Xmux XmuxConfig `json:"xmux"` Xmux XmuxConfig `json:"xmux"`
DownloadSettings *StreamConfig `json:"downloadSettings"` DownloadSettings *StreamConfig `json:"downloadSettings"`
HTTP2 json.RawMessage `json:"http2"` H2Params json.RawMessage `json:"h2Params"`
Extra json.RawMessage `json:"extra"` Extra json.RawMessage `json:"extra"`
} }
@@ -496,7 +496,7 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
ServerMaxHeaderBytes: c.ServerMaxHeaderBytes, ServerMaxHeaderBytes: c.ServerMaxHeaderBytes,
SessionIDTable: c.SessionIDTable, SessionIDTable: c.SessionIDTable,
SessionIDLength: newRangeConfig(c.SessionIDLength), SessionIDLength: newRangeConfig(c.SessionIDLength),
Http2: c.HTTP2, H2Params: c.H2Params,
Xmux: &splithttp.XmuxConfig{ Xmux: &splithttp.XmuxConfig{
MaxConcurrency: newRangeConfig(c.Xmux.MaxConcurrency), MaxConcurrency: newRangeConfig(c.Xmux.MaxConcurrency),
MaxConnections: newRangeConfig(c.Xmux.MaxConnections), MaxConnections: newRangeConfig(c.Xmux.MaxConnections),
transport/internet/splithttp/config.pb.go
+6 -6
View File
@@ -189,7 +189,7 @@ type Config struct {
ServerMaxHeaderBytes int32 `protobuf:"varint,27,opt,name=serverMaxHeaderBytes,proto3" json:"serverMaxHeaderBytes,omitempty"` ServerMaxHeaderBytes int32 `protobuf:"varint,27,opt,name=serverMaxHeaderBytes,proto3" json:"serverMaxHeaderBytes,omitempty"`
SessionIDTable string `protobuf:"bytes,28,opt,name=sessionIDTable,proto3" json:"sessionIDTable,omitempty"` SessionIDTable string `protobuf:"bytes,28,opt,name=sessionIDTable,proto3" json:"sessionIDTable,omitempty"`
SessionIDLength *RangeConfig `protobuf:"bytes,29,opt,name=sessionIDLength,proto3" json:"sessionIDLength,omitempty"` SessionIDLength *RangeConfig `protobuf:"bytes,29,opt,name=sessionIDLength,proto3" json:"sessionIDLength,omitempty"`
Http2 []byte `protobuf:"bytes,30,opt,name=http2,proto3" json:"http2,omitempty"` H2Params []byte `protobuf:"bytes,30,opt,name=h2Params,proto3" json:"h2Params,omitempty"`
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
} }
@@ -427,9 +427,9 @@ func (x *Config) GetSessionIDLength() *RangeConfig {
return nil return nil
} }
func (x *Config) GetHttp2() []byte { func (x *Config) GetH2Params() []byte {
if x != nil { if x != nil {
return x.Http2 return x.H2Params
} }
return nil return nil
} }
@@ -449,7 +449,7 @@ const file_transport_internet_splithttp_config_proto_rawDesc = "" +
"\x0ecMaxReuseTimes\x18\x03 \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x0ecMaxReuseTimes\x12Z\n" + "\x0ecMaxReuseTimes\x18\x03 \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x0ecMaxReuseTimes\x12Z\n" +
"\x10hMaxRequestTimes\x18\x04 \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x10hMaxRequestTimes\x12Z\n" + "\x10hMaxRequestTimes\x18\x04 \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x10hMaxRequestTimes\x12Z\n" +
"\x10hMaxReusableSecs\x18\x05 \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x10hMaxReusableSecs\x12*\n" + "\x10hMaxReusableSecs\x18\x05 \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x10hMaxReusableSecs\x12*\n" +
"\x10hKeepAlivePeriod\x18\x06 \x01(\x03R\x10hKeepAlivePeriod\"\xe2\f\n" + "\x10hKeepAlivePeriod\x18\x06 \x01(\x03R\x10hKeepAlivePeriod\"\xe8\f\n" +
"\x06Config\x12\x12\n" + "\x06Config\x12\x12\n" +
"\x04host\x18\x01 \x01(\tR\x04host\x12\x12\n" + "\x04host\x18\x01 \x01(\tR\x04host\x12\x12\n" +
"\x04path\x18\x02 \x01(\tR\x04path\x12\x12\n" + "\x04path\x18\x02 \x01(\tR\x04path\x12\x12\n" +
@@ -480,8 +480,8 @@ const file_transport_internet_splithttp_config_proto_rawDesc = "" +
"\x0fuplinkChunkSize\x18\x1a \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x0fuplinkChunkSize\x122\n" + "\x0fuplinkChunkSize\x18\x1a \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x0fuplinkChunkSize\x122\n" +
"\x14serverMaxHeaderBytes\x18\x1b \x01(\x05R\x14serverMaxHeaderBytes\x12&\n" + "\x14serverMaxHeaderBytes\x18\x1b \x01(\x05R\x14serverMaxHeaderBytes\x12&\n" +
"\x0esessionIDTable\x18\x1c \x01(\tR\x0esessionIDTable\x12X\n" + "\x0esessionIDTable\x18\x1c \x01(\tR\x0esessionIDTable\x12X\n" +
"\x0fsessionIDLength\x18\x1d \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x0fsessionIDLength\x12\x14\n" + "\x0fsessionIDLength\x18\x1d \x01(\v2..xray.transport.internet.splithttp.RangeConfigR\x0fsessionIDLength\x12\x1a\n" +
"\x05http2\x18\x1e \x01(\fR\x05http2\x1a:\n" + "\bh2Params\x18\x1e \x01(\fR\bh2Params\x1a:\n" +
"\fHeadersEntry\x12\x10\n" + "\fHeadersEntry\x12\x10\n" +
"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\x85\x01\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01B\x85\x01\n" +
transport/internet/splithttp/config.proto
+1 -1
View File
@@ -52,5 +52,5 @@ message Config {
int32 serverMaxHeaderBytes = 27; int32 serverMaxHeaderBytes = 27;
string sessionIDTable = 28; string sessionIDTable = 28;
RangeConfig sessionIDLength = 29; RangeConfig sessionIDLength = 29;
bytes http2 = 30; bytes h2Params = 30;
} }
transport/internet/splithttp/hub.go
+2 -2
View File
@@ -555,9 +555,9 @@ func ListenXH(ctx context.Context, address net.Address, port net.Port, streamSet
handler.localAddr = l.listener.Addr() handler.localAddr = l.listener.Addr()
var http2Config *http.HTTP2Config var http2Config *http.HTTP2Config
if len(l.config.Http2) > 0 { if len(l.config.H2Params) > 0 {
http2Config = new(http.HTTP2Config) http2Config = new(http.HTTP2Config)
if err := json.Unmarshal(l.config.Http2, http2Config); err != nil { if err := json.Unmarshal(l.config.H2Params, http2Config); err != nil {
return nil, errors.New("failed to parse HTTP2Config").Base(err) return nil, errors.New("failed to parse HTTP2Config").Base(err)
} }
} }