From bd0841a75b40e77220a408f4988c988252836ef9 Mon Sep 17 00:00:00 2001
From: RPRX <63339210+RPRX@users.noreply.github.com>
Date: Mon, 11 Nov 2024 02:50:39 +0000
Subject: [PATCH] XHTTP config: Add "extra" for sharing extra fields (#4000)

---
 infra/conf/transport_internet.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
index f5a36328..d58763d1 100644
--- a/infra/conf/transport_internet.go
+++ b/infra/conf/transport_internet.go
@@ -234,6 +234,7 @@ type SplitHTTPConfig struct {
 	Xmux                 Xmux              `json:"xmux"`
 	DownloadSettings     *StreamConfig     `json:"downloadSettings"`
 	Mode                 string            `json:"mode"`
+	Extra                json.RawMessage   `json:"extra"`
 }
 
 type Xmux struct {
@@ -259,6 +260,18 @@ func splithttpNewRandRangeConfig(input *Int32Range) *splithttp.RandRangeConfig {
 
 // Build implements Buildable.
 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 we don't do that, http host will be overwritten as address.
 	// Host priority: Host field > headers field > address.
@@ -312,6 +325,9 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
 	}
 	var err error
 	if c.DownloadSettings != nil {
+		if c.Extra != nil {
+			c.DownloadSettings.SocketSettings = nil
+		}
 		if config.DownloadSettings, err = c.DownloadSettings.Build(); err != nil {
 			return nil, errors.New(`Failed to build "downloadSettings".`).Base(err)
 		}