Commands: Fix dumping merged config for XHTTP

[vrnobody]

No description provided.

[RPRX]

这个没了

[vrnobody]

5f3b11e 和下面的讨论无关，那个 commit 只是把字符串 "0" 输出为数字 0 好看一点。

outbounds[0].streamSettings 下面有 sockopt 啊，这是把单元测试里面的配置 dump 出来的输出内容：

{
    "api": {
        "services": [
            "HandlerService",
            "StatsService"
        ],
        "tag": "api"
    },
    "inbounds": [
        {
            "listen": "127.0.0.1",
            "port": 18080,
            "protocol": "http",
            "settings": {},
            "tag": "agentin"
        },
        {
            "listen": "127.0.0.1",
            "port": 10085,
            "protocol": "dokodemo-door",
            "settings": {
                "address": "127.0.0.1"
            },
            "tag": "api-in"
        }
    ],
    "log": {
        "dnsLog": false,
        "loglevel": "debug"
    },
    "outbounds": [
        {
            "protocol": "vless",
            "settings": {
                "vnext": [
                    {
                        "address": "1.2.3.4",
                        "port": 1234,
                        "users": [
                            {
                                "id": "4784f9b8-a879-4fec-9718-ebddefa47750",
                                "encryption": "none"
                            }
                        ]
                    }
                ]
            },
            "streamSettings": {
                "network": "xhttp",
                "port": 0,
                "sockopt": {
                    "acceptProxyProtocol": false,
                    "mark": 0,
                    "penetrate": false,
                    "tcpCongestion": "bbr",
                    "tcpFastOpen": true,
                    "tcpKeepAliveIdle": 0,
                    "tcpKeepAliveInterval": 0,
                    "tcpMaxSeg": 0,
                    "tcpMptcp": true,
                    "tcpUserTimeout": 0,
                    "tcpWindowClamp": 0,
                    "v6only": false
                },
                "xhttpSettings": {
                    "extra": {
                        "noSSEHeader": false,
                        "scMaxEachPostBytes": 1000000,
                        "scMaxBufferedPosts": 30,
                        "xPaddingBytes": "100-1000"
                    },
                    "host": "bing.com",
                    "mode": "auto",
                    "noGRPCHeader": false,
                    "noSSEHeader": false,
                    "path": "/xhttp_client_upload",
                    "scMaxBufferedPosts": 0,
                    "scMaxEachPostBytes": 0,
                    "scMinPostsIntervalMs": 0,
                    "xPaddingBytes": 0,
                    "xmux": {
                        "cMaxReuseTimes": 0,
                        "hKeepAlivePeriod": 0,
                        "hMaxRequestTimes": 0,
                        "hMaxReusableSecs": 0,
                        "maxConcurrency": 0,
                        "maxConnections": 0
                    }
                }
            },
            "tag": "XHTTP_IN"
        }
    ],
    "policy": {
        "levels": {
            "0": {
                "statsUserDownlink": true,
                "statsUserOnline": false,
                "statsUserUplink": true
            }
        },
        "system": {
            "statsInboundDownlink": true,
            "statsInboundUplink": true,
            "statsOutboundDownlink": true,
            "statsOutboundUplink": true
        }
    },
    "routing": {
        "domainStrategy": "AsIs",
        "rules": [
            {
                "inboundTag": [
                    "api-in"
                ],
                "outboundTag": "api",
                "type": "field"
            }
        ]
    },
    "stats": {}
}

如果你指的是单元测试里面的输出，那个已经 build() 成 TypedMessage 分散到 socketSettings 和 transportSettings 里面了。

[RPRX]

我是说 tcpNoDelay 这个选项被删了，我等会儿看看，我可能直接改一下这个 PR

[vrnobody]

哦，那就是当时删这个功能的时候配置项没删干净了。好吧，你改下吧。

Xray-core/infra/conf/transport_internet.go

Line 678 in 4576f56

TFO interface{} `json:"tcpFastOpen"`

[RPRX]

你在说啥，我说的是 tcpNoDelay，你改吧

[vrnobody]

看错了。已删。