diff --git a/v2rayN/ServiceLib/Enums/ETransport.cs b/v2rayN/ServiceLib/Enums/ETransport.cs index ccf3e7f8..2cd43821 100644 --- a/v2rayN/ServiceLib/Enums/ETransport.cs +++ b/v2rayN/ServiceLib/Enums/ETransport.cs @@ -6,7 +6,6 @@ kcp, ws, httpupgrade, - splithttp, xhttp, h2, http, diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs index cb2382d4..4e93b66a 100644 --- a/v2rayN/ServiceLib/Global.cs +++ b/v2rayN/ServiceLib/Global.cs @@ -179,7 +179,7 @@ public static readonly List SsSecuritiesInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" }; public static readonly List SsSecuritiesInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" }; public static readonly List Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" }; - public static readonly List Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "xhttp", "splithttp", "h2", "quic", "grpc" }; + public static readonly List Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "xhttp", "h2", "quic", "grpc" }; public static readonly List KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" }; public static readonly List CoreTypes = new() { "v2fly", "Xray", "sing_box" }; public static readonly List CoreTypes4VLESS = new() { "Xray", "sing_box" }; diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs index c39ffe01..7afa005a 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs @@ -93,7 +93,6 @@ namespace ServiceLib.Handler.Fmt } break; - case nameof(ETransport.splithttp): case nameof(ETransport.xhttp): if (Utils.IsNotEmpty(item.RequestHost)) { @@ -179,7 +178,6 @@ namespace ServiceLib.Handler.Fmt item.Path = Utils.UrlDecode(query["path"] ?? "/"); break; - case nameof(ETransport.splithttp): case nameof(ETransport.xhttp): item.RequestHost = Utils.UrlDecode(query["host"] ?? ""); item.Path = Utils.UrlDecode(query["path"] ?? "/"); diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs index 824a2a2c..a916f86b 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs @@ -26,7 +26,7 @@ namespace ServiceLib.Services.CoreConfig ret.Msg = ResUI.CheckServerSettings; return ret; } - if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.splithttp) or nameof(ETransport.xhttp)) + if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.xhttp)) { ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}"; return ret; diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs index dd89df58..f03be85e 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs @@ -911,8 +911,7 @@ namespace ServiceLib.Services.CoreConfig streamSettings.httpupgradeSettings = httpupgradeSettings; break; - //splithttp //xhttp - case nameof(ETransport.splithttp): + //xhttp case nameof(ETransport.xhttp): streamSettings.network = ETransport.xhttp.ToString(); XhttpSettings4Ray xhttpSettings = new() diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs index 65f79e0e..e9f00be9 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs +++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs @@ -300,7 +300,7 @@ namespace v2rayN.Desktop.Views cmbHeaderType.Items.Add(it); }); } - else if (network is nameof(ETransport.splithttp) or nameof(ETransport.xhttp)) + else if (network is nameof(ETransport.xhttp)) { Global.XhttpMode.ForEach(it => { @@ -350,7 +350,6 @@ namespace v2rayN.Desktop.Views tipPath.Text = ResUI.TransportPathTip1; break; - case nameof(ETransport.splithttp): case nameof(ETransport.xhttp): tipRequestHost.Text = ResUI.TransportRequestHostTip2; tipPath.Text = ResUI.TransportPathTip1; diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml index d78d082c..b22ea83b 100644 --- a/v2rayN/v2rayN/App.xaml +++ b/v2rayN/v2rayN/App.xaml @@ -1,9 +1,9 @@  diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs index 613618c7..80b26896 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs @@ -295,7 +295,7 @@ namespace v2rayN.Views cmbHeaderType.Items.Add(it); }); } - else if (network is nameof(ETransport.splithttp) or nameof(ETransport.xhttp)) + else if (network is nameof(ETransport.xhttp)) { Global.XhttpMode.ForEach(it => { @@ -345,7 +345,6 @@ namespace v2rayN.Views tipPath.Text = ResUI.TransportPathTip1; break; - case nameof(ETransport.splithttp): case nameof(ETransport.xhttp): tipRequestHost.Text = ResUI.TransportRequestHostTip2; tipPath.Text = ResUI.TransportPathTip1;