diff --git a/v2rayN/ServiceLib/Enums/ETransport.cs b/v2rayN/ServiceLib/Enums/ETransport.cs index b1166608..b315c5f0 100644 --- a/v2rayN/ServiceLib/Enums/ETransport.cs +++ b/v2rayN/ServiceLib/Enums/ETransport.cs @@ -2,7 +2,7 @@ namespace ServiceLib.Enums; public enum ETransport { - tcp, + raw, kcp, ws, httpupgrade, diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs index 1a7b136e..88c0376a 100644 --- a/v2rayN/ServiceLib/Global.cs +++ b/v2rayN/ServiceLib/Global.cs @@ -42,8 +42,8 @@ public class Global public const string SingboxFakeIPFilterFileName = NamespaceSample + "singbox_fakeip_filter"; public const string DefaultSecurity = "auto"; - public const string DefaultNetwork = "tcp"; - public const string TcpHeaderHttp = "http"; + public const string DefaultNetwork = "raw"; + public const string RawHeaderHttp = "http"; public const string None = "none"; public const string ProxyTag = "proxy"; public const string DirectTag = "direct"; @@ -182,7 +182,7 @@ public class Global @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/" ]; - public static readonly Dictionary TcpHttpUserAgentTexts = new() + public static readonly Dictionary RawHttpUserAgentTexts = new() { {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" }, {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" }, @@ -292,7 +292,7 @@ public class Global public static readonly List Networks = [ - "tcp", + "raw", "xhttp", "kcp", "grpc", diff --git a/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs b/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs index 48052de9..e94635b7 100644 --- a/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs +++ b/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs @@ -20,7 +20,7 @@ public class NodeValidator [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks]; private static readonly HashSet SingboxShadowsocksAllowedTransports = - [nameof(ETransport.tcp), nameof(ETransport.ws)]; + [nameof(ETransport.raw), nameof(ETransport.ws)]; public static NodeValidatorResult Validate(ProfileItem item, ECoreType coreType) { @@ -168,7 +168,7 @@ public class NodeValidator } // sing-box does not support non-tcp transports for protocols other than vmess/trojan/vless/shadowsocks - if (!SingboxTransportSupportedProtocols.Contains(configType) && net != nameof(ETransport.tcp)) + if (!SingboxTransportSupportedProtocols.Contains(configType) && net != nameof(ETransport.raw)) { return string.Format(ResUI.MsgCoreNotSupportProtocolTransport, nameof(ECoreType.sing_box), configType.ToString(), net); diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs index d7f769e6..402c5292 100644 --- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs +++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs @@ -1139,8 +1139,8 @@ public static class ConfigHandler && AreEqual(oProtocolExtra.SsMethod, nProtocolExtra.SsMethod) && AreEqual(oProtocolExtra.VmessSecurity, nProtocolExtra.VmessSecurity) && AreEqual(o.Network, n.Network) - && AreEqual(oTransport.TcpHeaderType, nTransport.TcpHeaderType) - && AreEqual(oTransport.TcpHost, nTransport.TcpHost) + && AreEqual(oTransport.RawHeaderType, nTransport.RawHeaderType) + && AreEqual(oTransport.RawHost, nTransport.RawHost) && AreEqual(oTransport.WsHost, nTransport.WsHost) && AreEqual(oTransport.WsPath, nTransport.WsPath) && AreEqual(oTransport.HttpupgradeHost, nTransport.HttpupgradeHost) diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs index 31bb22b8..cff88584 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs @@ -92,18 +92,18 @@ public class BaseFmt var network = item.GetNetwork(); if (!Global.Networks.Contains(network)) { - network = nameof(ETransport.tcp); + network = nameof(ETransport.raw); } dicQuery.Add("type", network); switch (network) { - case nameof(ETransport.tcp): - dicQuery.Add("headerType", transport.TcpHeaderType.IsNotEmpty() ? transport.TcpHeaderType : Global.None); - if (transport.TcpHost.IsNotEmpty()) + case nameof(ETransport.raw): + dicQuery.Add("headerType", transport.RawHeaderType.IsNotEmpty() ? transport.RawHeaderType : Global.None); + if (transport.RawHost.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(transport.TcpHost)); + dicQuery.Add("host", Utils.UrlEncode(transport.RawHost)); } break; @@ -259,20 +259,20 @@ public class BaseFmt item.AllowInsecure = string.Empty; } - var net = GetQueryValue(query, "type", nameof(ETransport.tcp)); + var net = GetQueryValue(query, "type", nameof(ETransport.raw)); if (!Global.Networks.Contains(net)) { - net = nameof(ETransport.tcp); + net = nameof(ETransport.raw); } item.Network = net; switch (item.Network) { - case nameof(ETransport.tcp): + case nameof(ETransport.raw): transport = transport with { - TcpHeaderType = GetQueryValue(query, "headerType", Global.None), - TcpHost = GetQueryDecoded(query, "host"), + RawHeaderType = GetQueryValue(query, "headerType", Global.None), + RawHost = GetQueryDecoded(query, "host"), }; break; @@ -336,7 +336,7 @@ public class BaseFmt break; default: - item.Network = nameof(ETransport.tcp); + item.Network = nameof(ETransport.raw); break; } diff --git a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs index ae3e6664..d24a9237 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs @@ -48,10 +48,10 @@ public class ShadowsocksFmt : BaseFmt var plugin = string.Empty; var pluginArgs = string.Empty; - if (item.Network == nameof(ETransport.tcp) && transport.TcpHeaderType == Global.TcpHeaderHttp) + if (item.Network == nameof(ETransport.raw) && transport.RawHeaderType == Global.RawHeaderHttp) { plugin = "obfs-local"; - pluginArgs = $"obfs=http;obfs-host={transport.TcpHost};"; + pluginArgs = $"obfs=http;obfs-host={transport.RawHost};"; } else { @@ -212,8 +212,8 @@ public class ShadowsocksFmt : BaseFmt item.Network = Global.DefaultNetwork; item.SetTransportExtra(item.GetTransportExtra() with { - TcpHeaderType = Global.TcpHeaderHttp, - TcpHost = obfsHost, + RawHeaderType = Global.RawHeaderHttp, + RawHost = obfsHost, }); } } diff --git a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs index c5f98009..3f30b370 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs @@ -37,7 +37,7 @@ public class VmessFmt : BaseFmt net = item.Network, type = item.GetNetwork() switch { - nameof(ETransport.tcp) => item.GetTransportExtra().TcpHeaderType, + nameof(ETransport.raw) => item.GetTransportExtra().RawHeaderType, nameof(ETransport.kcp) => item.GetTransportExtra().KcpHeaderType, nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpMode, nameof(ETransport.grpc) => item.GetTransportExtra().GrpcMode, @@ -45,7 +45,7 @@ public class VmessFmt : BaseFmt }, host = item.GetNetwork() switch { - nameof(ETransport.tcp) => item.GetTransportExtra().TcpHost, + nameof(ETransport.raw) => item.GetTransportExtra().RawHost, nameof(ETransport.ws) => item.GetTransportExtra().WsHost, nameof(ETransport.httpupgrade) => item.GetTransportExtra().HttpupgradeHost, nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpHost, @@ -96,7 +96,7 @@ public class VmessFmt : BaseFmt item.Network = Global.DefaultNetwork; var transport = new TransportExtra { - TcpHeaderType = Global.None, + RawHeaderType = Global.None, }; //item.ConfigVersion = vmessQRCode.v; @@ -117,7 +117,7 @@ public class VmessFmt : BaseFmt { transport = item.GetNetwork() switch { - nameof(ETransport.tcp) => transport with { TcpHeaderType = vmessQRCode.type }, + nameof(ETransport.raw) => transport with { RawHeaderType = vmessQRCode.type }, nameof(ETransport.kcp) => transport with { KcpHeaderType = vmessQRCode.type }, nameof(ETransport.xhttp) => transport with { XhttpMode = vmessQRCode.type }, nameof(ETransport.grpc) => transport with { GrpcMode = vmessQRCode.type }, @@ -126,7 +126,7 @@ public class VmessFmt : BaseFmt } transport = item.GetNetwork() switch { - nameof(ETransport.tcp) => transport with { TcpHost = Utils.ToString(vmessQRCode.host) }, + nameof(ETransport.raw) => transport with { RawHost = Utils.ToString(vmessQRCode.host) }, nameof(ETransport.kcp) => transport with { KcpSeed = Utils.ToString(vmessQRCode.path) }, nameof(ETransport.ws) => transport with { WsHost = Utils.ToString(vmessQRCode.host), WsPath = Utils.ToString(vmessQRCode.path) }, nameof(ETransport.httpupgrade) => transport with { HttpupgradeHost = Utils.ToString(vmessQRCode.host), HttpupgradePath = Utils.ToString(vmessQRCode.path) }, diff --git a/v2rayN/ServiceLib/Manager/AppManager.cs b/v2rayN/ServiceLib/Manager/AppManager.cs index bd06fa77..9122015e 100644 --- a/v2rayN/ServiceLib/Manager/AppManager.cs +++ b/v2rayN/ServiceLib/Manager/AppManager.cs @@ -365,14 +365,19 @@ public sealed class AppManager var extra = item.GetProtocolExtra(); var transport = extra.Transport ?? new TransportExtra(); var network = item.GetNetwork(); + if (network == "tcp") + { + network = nameof(ETransport.raw); + item.Network = network; + } switch (network) { - case nameof(ETransport.tcp): + case nameof(ETransport.raw): transport = transport with { - TcpHeaderType = item.HeaderType.NullIfEmpty(), - TcpHost = item.RequestHost.NullIfEmpty(), + RawHeaderType = item.HeaderType.NullIfEmpty(), + RawHost = item.RequestHost.NullIfEmpty(), }; break; @@ -423,8 +428,8 @@ public sealed class AppManager item.Network = Global.DefaultNetwork; transport = transport with { - TcpHeaderType = item.HeaderType.NullIfEmpty(), - TcpHost = item.RequestHost.NullIfEmpty(), + RawHeaderType = item.HeaderType.NullIfEmpty(), + RawHost = item.RequestHost.NullIfEmpty(), }; break; } diff --git a/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayN/ServiceLib/Models/ProfileItem.cs index 2601b8e6..f9a87025 100644 --- a/v2rayN/ServiceLib/Models/ProfileItem.cs +++ b/v2rayN/ServiceLib/Models/ProfileItem.cs @@ -167,9 +167,9 @@ public class ProfileItem public string Password { get; set; } public string Username { get; set; } public string Network { get; set; } - [Obsolete("Use TransportExtra.TcpHeaderType/XhttpMode/GrpcMode/KcpHeaderType instead.")] + [Obsolete("Use TransportExtra.RawHeaderType/XhttpMode/GrpcMode/KcpHeaderType instead.")] public string HeaderType { get; set; } - [Obsolete("Use TransportExtra.TcpHost/WsHost/HttpupgradeHost/XhttpHost/GrpcAuthority instead.")] + [Obsolete("Use TransportExtra.RawHost/WsHost/HttpupgradeHost/XhttpHost/GrpcAuthority instead.")] public string RequestHost { get; set; } [Obsolete("Use TransportExtra.WsPath/HttpupgradePath/XhttpPath/GrpcServiceName/KcpSeed instead.")] public string Path { get; set; } diff --git a/v2rayN/ServiceLib/Models/TransportExtra.cs b/v2rayN/ServiceLib/Models/TransportExtra.cs index e5931eb7..e9c764c9 100644 --- a/v2rayN/ServiceLib/Models/TransportExtra.cs +++ b/v2rayN/ServiceLib/Models/TransportExtra.cs @@ -2,8 +2,8 @@ namespace ServiceLib.Models; public record TransportExtra { - public string? TcpHeaderType { get; init; } - public string? TcpHost { get; init; } + public string? RawHeaderType { get; init; } + public string? RawHost { get; init; } public string? WsHost { get; init; } public string? WsPath { get; init; } @@ -22,4 +22,4 @@ public record TransportExtra public string? KcpHeaderType { get; init; } public string? KcpSeed { get; init; } -} \ No newline at end of file +} diff --git a/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayN/ServiceLib/Models/V2rayConfig.cs index 1bde2dc2..c653f273 100644 --- a/v2rayN/ServiceLib/Models/V2rayConfig.cs +++ b/v2rayN/ServiceLib/Models/V2rayConfig.cs @@ -319,7 +319,7 @@ public class StreamSettings4Ray public TlsSettings4Ray? tlsSettings { get; set; } - public TcpSettings4Ray? tcpSettings { get; set; } + public RawSettings4Ray? rawSettings { get; set; } public KcpSettings4Ray? kcpSettings { get; set; } @@ -373,7 +373,7 @@ public class CertificateSettings4Ray public string? usage { get; set; } } -public class TcpSettings4Ray +public class RawSettings4Ray { public Header4Ray header { get; set; } } diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs index feeba7cd..4e9b2342 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs @@ -116,10 +116,10 @@ public partial class CoreConfigSingboxService outbound.password = _node.Password; outbound.udp_over_tcp = protocolExtra.Uot == true ? true : null; - if (network == nameof(ETransport.tcp) && transportExtra.TcpHeaderType == Global.TcpHeaderHttp) + if (network == nameof(ETransport.raw) && transportExtra.RawHeaderType == Global.RawHeaderHttp) { outbound.plugin = "obfs-local"; - outbound.plugin_opts = $"obfs=http;obfs-host={transportExtra.TcpHost};"; + outbound.plugin_opts = $"obfs=http;obfs-host={transportExtra.RawHost};"; } else { @@ -383,7 +383,7 @@ public partial class CoreConfigSingboxService { var host = _node.GetNetwork() switch { - nameof(ETransport.tcp) => _node.GetTransportExtra().TcpHost, + nameof(ETransport.raw) => _node.GetTransportExtra().RawHost, nameof(ETransport.ws) => _node.GetTransportExtra().WsHost, nameof(ETransport.httpupgrade) => _node.GetTransportExtra().HttpupgradeHost, nameof(ETransport.xhttp) => _node.GetTransportExtra().XhttpHost, @@ -449,11 +449,11 @@ public partial class CoreConfigSingboxService switch (_node.GetNetwork()) { - case nameof(ETransport.tcp): //http - if (transportExtra.TcpHeaderType == Global.TcpHeaderHttp) + case nameof(ETransport.raw): //http + if (transportExtra.RawHeaderType == Global.RawHeaderHttp) { transport.type = nameof(ETransport.http); - transport.host = transportExtra.TcpHost.IsNullOrEmpty() ? null : Utils.String2List(transportExtra.TcpHost); + transport.host = transportExtra.RawHost.IsNullOrEmpty() ? null : Utils.String2List(transportExtra.RawHost); } break; diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs index d493344d..a8ad213a 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs @@ -356,9 +356,9 @@ public partial class CoreConfigV2rayService var xhttpExtra = string.Empty; switch (network) { - case nameof(ETransport.tcp): - host = transport.TcpHost?.TrimEx() ?? string.Empty; - headerType = transport.TcpHeaderType?.TrimEx() ?? string.Empty; + case nameof(ETransport.raw): + host = transport.RawHost?.TrimEx() ?? string.Empty; + headerType = transport.RawHeaderType?.TrimEx() ?? string.Empty; break; case nameof(ETransport.kcp): @@ -641,11 +641,10 @@ public partial class CoreConfigV2rayService streamSettings.finalmask = hy2Finalmask; break; - default: - //tcp - if (headerType == Global.TcpHeaderHttp) + case nameof(ETransport.raw): + if (headerType == Global.RawHeaderHttp) { - TcpSettings4Ray tcpSettings = new() + RawSettings4Ray rawSettings = new() { header = new Header4Ray { @@ -655,7 +654,7 @@ public partial class CoreConfigV2rayService //request Host var request = EmbedUtils.GetEmbedText(Global.V2raySampleHttpRequestFileName); - var useragentValue = Global.TcpHttpUserAgentTexts.GetValueOrDefault(useragent, useragent); + var useragentValue = Global.RawHttpUserAgentTexts.GetValueOrDefault(useragent, useragent); var arrHost = host.Split(','); var host2 = string.Join(",".AppendQuotes(), arrHost); request = request.Replace("$requestHost$", $"{host2.AppendQuotes()}"); @@ -668,11 +667,14 @@ public partial class CoreConfigV2rayService pathHttp = string.Join(",".AppendQuotes(), arrPath); } request = request.Replace("$requestPath$", $"{pathHttp.AppendQuotes()}"); - tcpSettings.header.request = JsonUtils.Deserialize(request); + rawSettings.header.request = JsonUtils.Deserialize(request); - streamSettings.tcpSettings = tcpSettings; + streamSettings.rawSettings = rawSettings; } break; + + default: + break; } if (!_node.Finalmask.IsNullOrEmpty()) diff --git a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs index 69445b9b..fdc96ad4 100644 --- a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs @@ -74,10 +74,10 @@ public class AddServerViewModel : MyReactiveObject public bool NaiveQuic { get; set; } [Reactive] - public string TcpHeaderType { get; set; } + public string RawHeaderType { get; set; } [Reactive] - public string TcpHost { get; set; } + public string RawHost { get; set; } [Reactive] public string WsHost { get; set; } @@ -122,7 +122,7 @@ public class AddServerViewModel : MyReactiveObject { get => SelectedSource.GetNetwork() switch { - nameof(ETransport.tcp) => TcpHeaderType, + nameof(ETransport.raw) => RawHeaderType, nameof(ETransport.kcp) => KcpHeaderType, nameof(ETransport.xhttp) => XhttpMode, nameof(ETransport.grpc) => GrpcMode, @@ -132,8 +132,8 @@ public class AddServerViewModel : MyReactiveObject { switch (SelectedSource.GetNetwork()) { - case nameof(ETransport.tcp): - TcpHeaderType = value; + case nameof(ETransport.raw): + RawHeaderType = value; break; case nameof(ETransport.kcp): KcpHeaderType = value; @@ -153,7 +153,7 @@ public class AddServerViewModel : MyReactiveObject { get => SelectedSource.GetNetwork() switch { - nameof(ETransport.tcp) => TcpHost, + nameof(ETransport.raw) => RawHost, nameof(ETransport.ws) => WsHost, nameof(ETransport.httpupgrade) => HttpupgradeHost, nameof(ETransport.xhttp) => XhttpHost, @@ -164,8 +164,8 @@ public class AddServerViewModel : MyReactiveObject { switch (SelectedSource.GetNetwork()) { - case nameof(ETransport.tcp): - TcpHost = value; + case nameof(ETransport.raw): + RawHost = value; break; case nameof(ETransport.ws): WsHost = value; @@ -309,8 +309,8 @@ public class AddServerViewModel : MyReactiveObject InsecureConcurrency = protocolExtra?.InsecureConcurrency > 0 ? protocolExtra.InsecureConcurrency : null; NaiveQuic = protocolExtra?.NaiveQuic ?? false; - TcpHeaderType = transport.TcpHeaderType ?? Global.None; - TcpHost = transport.TcpHost ?? string.Empty; + RawHeaderType = transport.RawHeaderType ?? Global.None; + RawHost = transport.RawHost ?? string.Empty; WsHost = transport.WsHost ?? string.Empty; WsPath = transport.WsPath ?? string.Empty; HttpupgradeHost = transport.HttpupgradeHost ?? string.Empty; @@ -378,8 +378,8 @@ public class AddServerViewModel : MyReactiveObject var transport = new TransportExtra { - TcpHeaderType = TcpHeaderType.NullIfEmpty(), - TcpHost = TcpHost.NullIfEmpty(), + RawHeaderType = RawHeaderType.NullIfEmpty(), + RawHost = RawHost.NullIfEmpty(), WsHost = WsHost.NullIfEmpty(), WsPath = WsPath.NullIfEmpty(), HttpupgradeHost = HttpupgradeHost.NullIfEmpty(), @@ -517,7 +517,7 @@ public class AddServerViewModel : MyReactiveObject { return SelectedSource.GetNetwork() switch { - nameof(ETransport.tcp) => TcpHost, + nameof(ETransport.raw) => RawHost, nameof(ETransport.ws) => WsHost, nameof(ETransport.httpupgrade) => HttpupgradeHost, nameof(ETransport.xhttp) => XhttpHost, diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml index fe19b860..fe8d513f 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml @@ -717,7 +717,7 @@ @@ -728,7 +728,7 @@ VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbHeaderType}" /> break; } this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.TcpHeaderType, v => v.cmbHeaderTypeTcp.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.TcpHost, v => v.txtRequestHostTcp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.RawHeaderType, v => v.cmbHeaderTypeRaw.SelectedValue).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.RawHost, v => v.txtRequestHostRaw.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); @@ -301,7 +301,7 @@ public partial class AddServerWindow : WindowBase private void SetHeaderType() { - cmbHeaderTypeTcp.ItemsSource = new List { Global.None, Global.TcpHeaderHttp }; + cmbHeaderTypeRaw.ItemsSource = new List { Global.None, Global.RawHeaderHttp }; var kcpHeaderTypes = new List { Global.None }; kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); @@ -326,7 +326,7 @@ public partial class AddServerWindow : WindowBase network = Global.DefaultNetwork; } - gridTransportTcp.IsVisible = false; + gridTransportRaw.IsVisible = false; gridTransportKcp.IsVisible = false; gridTransportWs.IsVisible = false; gridTransportHttpupgrade.IsVisible = false; @@ -335,8 +335,8 @@ public partial class AddServerWindow : WindowBase switch (network) { - case nameof(ETransport.tcp): - gridTransportTcp.IsVisible = true; + case nameof(ETransport.raw): + gridTransportRaw.IsVisible = true; break; case nameof(ETransport.kcp): gridTransportKcp.IsVisible = true; @@ -354,7 +354,7 @@ public partial class AddServerWindow : WindowBase gridTransportGrpc.IsVisible = true; break; default: - gridTransportTcp.IsVisible = true; + gridTransportRaw.IsVisible = true; break; } } diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml index 4ffe4362..5ca1c67a 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml @@ -942,7 +942,7 @@ - + @@ -959,7 +959,7 @@ Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbHeaderType}" /> vm.SelectedSource.Network, v => v.cmbNetwork.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.TcpHeaderType, v => v.cmbHeaderTypeTcp.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.TcpHost, v => v.txtRequestHostTcp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.RawHeaderType, v => v.cmbHeaderTypeRaw.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.RawHost, v => v.txtRequestHostRaw.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); @@ -301,7 +301,7 @@ public partial class AddServerWindow private void SetHeaderType() { - cmbHeaderTypeTcp.ItemsSource = new List { Global.None, Global.TcpHeaderHttp }; + cmbHeaderTypeRaw.ItemsSource = new List { Global.None, Global.RawHeaderHttp }; var kcpHeaderTypes = new List { Global.None }; kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); @@ -326,7 +326,7 @@ public partial class AddServerWindow network = Global.DefaultNetwork; } - gridTransportTcp.Visibility = Visibility.Collapsed; + gridTransportRaw.Visibility = Visibility.Collapsed; gridTransportKcp.Visibility = Visibility.Collapsed; gridTransportWs.Visibility = Visibility.Collapsed; gridTransportHttpupgrade.Visibility = Visibility.Collapsed; @@ -335,8 +335,8 @@ public partial class AddServerWindow switch (network) { - case nameof(ETransport.tcp): - gridTransportTcp.Visibility = Visibility.Visible; + case nameof(ETransport.raw): + gridTransportRaw.Visibility = Visibility.Visible; break; case nameof(ETransport.kcp): gridTransportKcp.Visibility = Visibility.Visible; @@ -354,7 +354,7 @@ public partial class AddServerWindow gridTransportGrpc.Visibility = Visibility.Visible; break; default: - gridTransportTcp.Visibility = Visibility.Visible; + gridTransportRaw.Visibility = Visibility.Visible; break; } }