From 64071721d856462ea1a1ed11e63b2130225260b8 Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:40:12 +0800 Subject: [PATCH] Fix xray invalid tcp type none --- Netch/Servers/V2ray/Utils/V2rayConfigUtils.cs | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Netch/Servers/V2ray/Utils/V2rayConfigUtils.cs b/Netch/Servers/V2ray/Utils/V2rayConfigUtils.cs index e2d32587..056ccdb1 100644 --- a/Netch/Servers/V2ray/Utils/V2rayConfigUtils.cs +++ b/Netch/Servers/V2ray/Utils/V2rayConfigUtils.cs @@ -57,7 +57,7 @@ namespace Netch.Servers.Utils new { users = socks5.Auth() - ? new [] + ? new[] { new { @@ -147,6 +147,8 @@ namespace Netch.Servers.Utils private static void boundStreamSettings(VMess server, ref StreamSettings streamSettings) { + // https://xtls.github.io/config/transports + streamSettings.network = server.TransferProtocol; streamSettings.security = server.TLSSecureType; @@ -172,13 +174,14 @@ namespace Netch.Servers.Utils switch (server.TransferProtocol) { case "tcp": - if (server.FakeType == "http") + + streamSettings.tcpSettings = new TcpSettings { - streamSettings.tcpSettings = new TcpSettings + header = new { - header = new - { - request = new + type = server.FakeType, + request = server.FakeType is "http" + ? new { path = server.Path.SplitOrDefault(), headers = new @@ -186,13 +189,9 @@ namespace Netch.Servers.Utils Host = server.Host.SplitOrDefault() } } - } - }; - } - else - { - throw new MessageException($"invalid tcp type {server.FakeType}"); - } + : null + } + }; break; case "ws": @@ -200,7 +199,10 @@ namespace Netch.Servers.Utils streamSettings.wsSettings = new WsSettings { path = server.Path.ValueOrDefault(), - headers = new { Host = server.Host.ValueOrDefault() }, + headers = new + { + Host = server.Host.ValueOrDefault() + } }; break;