Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-05-02 21:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

bug fixes

Browse source
This commit is contained in:
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

20
v2rayN/v2rayN/Handler/CoreConfigHandler.cs
View file

@ -457,15 +457,8 @@ namespace v2rayN.Handler
boundStreamSettings(node, "out", outbound.streamSettings); boundStreamSettings(node, "out", outbound.streamSettings);
if (node.streamSecurity == Global.StreamSecurityReality) 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.enabled = false;
outbound.mux.concurrency = -1; outbound.mux.concurrency = -1;
@ -569,7 +562,7 @@ namespace v2rayN.Handler
{ {
streamSettings.security = node.streamSecurity; streamSettings.security = node.streamSecurity;
RealitySettings realitySettings = new() TlsSettings realitySettings = new()
{ {
fingerprint = node.fingerprint.IsNullOrEmpty() ? config.coreBasicItem.defFingerprint : node.fingerprint, fingerprint = node.fingerprint.IsNullOrEmpty() ? config.coreBasicItem.defFingerprint : node.fingerprint,
serverName = sni, serverName = sni,
@ -638,13 +631,6 @@ namespace v2rayN.Handler
} }
streamSettings.wsSettings = wsSettings; streamSettings.wsSettings = wsSettings;
//TlsSettings tlsSettings = new TlsSettings();
//tlsSettings.allowInsecure = config.allowInsecure();
//if (!string.IsNullOrWhiteSpace(host))
//{
// tlsSettings.serverName = host;
//}
//streamSettings.tlsSettings = tlsSettings;
break; break;
//h2 //h2
case "h2": case "h2":
@ -658,9 +644,6 @@ namespace v2rayN.Handler
streamSettings.httpSettings = httpSettings; streamSettings.httpSettings = httpSettings;
//TlsSettings tlsSettings2 = new TlsSettings();
//tlsSettings2.allowInsecure = config.allowInsecure();
//streamSettings.tlsSettings = tlsSettings2;
break; break;
//quic //quic
case "quic": case "quic":
@ -696,7 +679,6 @@ namespace v2rayN.Handler
permit_without_stream = config.grpcItem.permit_without_stream, permit_without_stream = config.grpcItem.permit_without_stream,
initial_windows_size = config.grpcItem.initial_windows_size, initial_windows_size = config.grpcItem.initial_windows_size,
}; };
streamSettings.grpcSettings = grpcSettings; streamSettings.grpcSettings = grpcSettings;
break; break;
default: default:

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

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