black-internet-days-ahead/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-14 20:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

XHTTP config: Add "extra" for sharing extra fields (#4000)

Browse source
This commit is contained in:
RPRX 2024-11-11 02:50:39 +00:00 committed by GitHub
parent 83bab5dd90
commit bd0841a75b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
infra/conf/transport_internet.go
View file

@ -234,6 +234,7 @@ type SplitHTTPConfig struct {
Xmux Xmux `json:"xmux"` Xmux Xmux `json:"xmux"`
DownloadSettings *StreamConfig `json:"downloadSettings"` DownloadSettings *StreamConfig `json:"downloadSettings"`
Mode string `json:"mode"` Mode string `json:"mode"`
Extra json.RawMessage `json:"extra"`
} }
type Xmux struct { type Xmux struct {
@ -259,6 +260,18 @@ func splithttpNewRandRangeConfig(input *Int32Range) *splithttp.RandRangeConfig {
// Build implements Buildable. // Build implements Buildable.
func (c *SplitHTTPConfig) Build() (proto.Message, error) { func (c *SplitHTTPConfig) Build() (proto.Message, error) {
if c.Extra != nil {
var extra SplitHTTPConfig
if err := json.Unmarshal(c.Extra, &extra); err != nil {
return nil, errors.New(`Failed to unmarshal "extra".`).Base(err)
}
extra.Host = c.Host
extra.Path = c.Path
extra.Mode = c.Mode
extra.Extra = c.Extra
c = &extra
}
// If http host is not set in the Host field, but in headers field, we add it to Host Field here. // If http host is not set in the Host field, but in headers field, we add it to Host Field here.
// If we don't do that, http host will be overwritten as address. // If we don't do that, http host will be overwritten as address.
// Host priority: Host field > headers field > address. // Host priority: Host field > headers field > address.
@ -312,6 +325,9 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
} }
var err error var err error
if c.DownloadSettings != nil { if c.DownloadSettings != nil {
if c.Extra != nil {
c.DownloadSettings.SocketSettings = nil
}
if config.DownloadSettings, err = c.DownloadSettings.Build(); err != nil { if config.DownloadSettings, err = c.DownloadSettings.Build(); err != nil {
return nil, errors.New(`Failed to build "downloadSettings".`).Base(err) return nil, errors.New(`Failed to build "downloadSettings".`).Base(err)
} }