github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

bug fixes

pull/3492/head^2
2dust 2023-03-10 11:25:34 +08:00
parent 3f5729044f
commit 83efe66f3e
2 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
v2rayN/v2rayN/Handler/CoreConfigHandler.cs
View File

@ -458,14 +458,7 @@ namespace v2rayN.Handler
if (node.streamSecurity == Global.StreamSecurityReality)
{
if (Utils.IsNullOrEmpty(node.flow))
{
usersItem.flow = Global.flows[1];
}
else
{
usersItem.flow = node.flow;
}
usersItem.flow = node.flow;
outbound.mux.enabled = false;
outbound.mux.concurrency = -1;
@ -502,7 +495,7 @@ namespace v2rayN.Handler
serversItem.flow = string.Empty;
serversItem.ota = false;
serversItem.level = 1;
serversItem.level = 1;
outbound.mux.enabled = false;
outbound.mux.concurrency = -1;
@ -569,7 +562,7 @@ namespace v2rayN.Handler
{
streamSettings.security = node.streamSecurity;
RealitySettings realitySettings = new()
TlsSettings realitySettings = new()
{
fingerprint = node.fingerprint.IsNullOrEmpty() ? config.coreBasicItem.defFingerprint : node.fingerprint,
serverName = sni,
@ -638,13 +631,6 @@ namespace v2rayN.Handler
}
streamSettings.wsSettings = wsSettings;
//TlsSettings tlsSettings = new TlsSettings();
//tlsSettings.allowInsecure = config.allowInsecure();
//if (!string.IsNullOrWhiteSpace(host))
//{
// tlsSettings.serverName = host;
//}
//streamSettings.tlsSettings = tlsSettings;
break;
//h2
case "h2":
@ -658,9 +644,6 @@ namespace v2rayN.Handler
streamSettings.httpSettings = httpSettings;
//TlsSettings tlsSettings2 = new TlsSettings();
//tlsSettings2.allowInsecure = config.allowInsecure();
//streamSettings.tlsSettings = tlsSettings2;
break;
//quic
case "quic":
@ -696,7 +679,6 @@ namespace v2rayN.Handler
permit_without_stream = config.grpcItem.permit_without_stream,
initial_windows_size = config.grpcItem.initial_windows_size,
};
streamSettings.grpcSettings = grpcSettings;
break;
default:

30
v2rayN/v2rayN/Mode/V2rayConfig.cs
View File

@ -391,7 +391,7 @@ namespace v2rayN.Mode
/// <summary>
/// VLESS only
/// </summary>
public RealitySettings realitySettings { get; set; }
public TlsSettings realitySettings { get; set; }
/// <summary>
/// grpc
/// </summary>
@ -404,34 +404,24 @@ namespace v2rayN.Mode
/// <summary>
/// 是否允许不安全连接（用于客户端）
/// </summary>
public bool allowInsecure { get; set; }
public bool? allowInsecure { get; set; }
/// <summary>
///
/// </summary>
public string serverName { get; set; }
public string? serverName { get; set; }
/// <summary>
///
/// </summary>
public List<string> alpn
{
get; set;
}
public List<string>? alpn { get; set; }
/// <summary>
/// "chrome" | "firefox" | "safari" | "randomized"
/// </summary>
public string fingerprint { get; set; }
public string? fingerprint { get; set; }
public bool? show { get; set; } = false;
public string? publicKey { get; set; }
public string? shortId { get; set; }
public string? spiderX { get; set; }
}
public class RealitySettings
{
public bool show { get; set; } = false;
public string fingerprint { get; set; }
public string serverName { get; set; }
public string publicKey { get; set; }
public string shortId { get; set; }
public string spiderX { get; set; }
}
public class TcpSettings