From 932fd330ce541574d9d463dca8710da362b09a18 Mon Sep 17 00:00:00 2001 From: "Kyrie@cedu.me" Date: Mon, 9 Mar 2020 17:19:34 +0800 Subject: [PATCH 1/2] fix quic server name --- .gitignore | 3 ++- v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b5d8031c..2bbc50d9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ /v2rayN/v2rayUpgrade/bin/Debug /v2rayN/v2rayUpgrade/obj/Debug /v2rayN/v2rayUpgrade/bin/Release -/v2rayN/v2rayUpgrade/obj/Release \ No newline at end of file +/v2rayN/v2rayUpgrade/obj/Release +/v2rayN/v2rayUpgrade/packages.config diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs index aea62d90..bda79fbc 100644 --- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs @@ -446,15 +446,7 @@ namespace v2rayN.Handler { //远程服务器底层传输配置 streamSettings.network = config.network(); - string host; - if (streamSettings.network != "quic") - { - host = config.requestHost(); - } - else - { - host = config.address(); - } + var host = config.requestHost(); //if tls if (config.streamSecurity() == Global.StreamSecurity) { @@ -548,7 +540,7 @@ namespace v2rayN.Handler quicsettings.key = config.path(); quicsettings.header = new Header(); quicsettings.header.type = config.headerType(); - + streamSettings.tlsSettings.serverName = config.address(); streamSettings.quicSettings = quicsettings; break; default: From 02607e116e38163d3a3ec2e8c447ffd385388c79 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 9 Mar 2020 19:22:28 +0800 Subject: [PATCH 2/2] Delete .gitignore --- .gitignore | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2bbc50d9..00000000 --- a/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 -################################################################################ - -/v2rayN/.vs/ -/v2rayN/v2rayN/bin/Debug/app.publish -/v2rayN/v2rayN/bin/Debug -/v2rayN/v2rayN/obj/Debug -/v2rayN/.vs/v2rayN/DesignTimeBuild -/v2rayN/v2rayN/bin/Release -/v2rayN/v2rayN/obj/Release -/v2rayN/packages -.vs/ProjectSettings.json -.vs/slnx.sqlite -.vs/VSWorkspaceState.json -/v2rayN/v2rayUpgrade/bin/Debug -/v2rayN/v2rayUpgrade/obj/Debug -/v2rayN/v2rayUpgrade/bin/Release -/v2rayN/v2rayUpgrade/obj/Release -/v2rayN/v2rayUpgrade/packages.config