From dd65c3fcaa75db9c51d2fd4e2f39b5bed13bedfb Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 19 Jun 2022 20:43:33 +0800
Subject: [PATCH] ss supports transport settings
---
v2rayN/v2rayN/Forms/AddServerForm.cs | 4 ++--
v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 24 +++++++--------------
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.cs b/v2rayN/v2rayN/Forms/AddServerForm.cs
index 8e731590..de447a33 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.cs
@@ -32,8 +32,8 @@ namespace v2rayN.Forms
case EConfigType.Shadowsocks:
panSs.Dock = DockStyle.Fill;
panSs.Visible = true;
- panTran.Visible = false;
- this.Height = this.Height - panTran.Height;
+ //panTran.Visible = false;
+ //this.Height = this.Height - panTran.Height;
cmbSecurity3.Items.AddRange(LazyConfig.Instance.GetShadowsocksSecuritys().ToArray());
break;
diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
index 5c48c630..8f1d7e83 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -406,9 +406,7 @@ namespace v2rayN.Handler
outbound.mux.enabled = config.muxEnabled;
outbound.mux.concurrency = config.muxEnabled ? 8 : -1;
- //远程服务器底层传输配置
- StreamSettings streamSettings = outbound.streamSettings;
- boundStreamSettings(node, "out", ref streamSettings);
+ boundStreamSettings(node, "out", outbound.streamSettings);
outbound.protocol = Global.vmessProtocolLite;
outbound.settings.servers = null;
@@ -445,6 +443,7 @@ namespace v2rayN.Handler
outbound.mux.enabled = false;
outbound.mux.concurrency = -1;
+ boundStreamSettings(node, "out", outbound.streamSettings);
outbound.protocol = Global.ssProtocolLite;
outbound.settings.vnext = null;
@@ -522,9 +521,7 @@ namespace v2rayN.Handler
outbound.mux.enabled = config.muxEnabled;
outbound.mux.concurrency = config.muxEnabled ? 8 : -1;
- //远程服务器底层传输配置
- StreamSettings streamSettings = outbound.streamSettings;
- boundStreamSettings(node, "out", ref streamSettings);
+ boundStreamSettings(node, "out", outbound.streamSettings);
//if xtls
if (node.streamSecurity == Global.StreamSecurityX)
@@ -585,10 +582,7 @@ namespace v2rayN.Handler
outbound.mux.enabled = false;
outbound.mux.concurrency = -1;
-
- //远程服务器底层传输配置
- StreamSettings streamSettings = outbound.streamSettings;
- boundStreamSettings(node, "out", ref streamSettings);
+ boundStreamSettings(node, "out", outbound.streamSettings);
outbound.protocol = Global.trojanProtocolLite;
outbound.settings.vnext = null;
@@ -601,18 +595,18 @@ namespace v2rayN.Handler
}
///
- /// vmess协议远程服务器底层传输配置
+ /// 底层传输配置
///
///
///
///
///
- private static int boundStreamSettings(VmessItem node, string iobound, ref StreamSettings streamSettings)
+ private static int boundStreamSettings(VmessItem node, string iobound, StreamSettings streamSettings)
{
try
{
var config = LazyConfig.Instance.GetConfig();
- //远程服务器底层传输配置
+
streamSettings.network = node.GetNetwork();
string host = node.requestHost.TrimEx();
string sni = node.sni;
@@ -1088,9 +1082,7 @@ namespace v2rayN.Handler
inbound.settings.decryption = node.security;
}
- //远程服务器底层传输配置
- StreamSettings streamSettings = inbound.streamSettings;
- boundStreamSettings(node, "in", ref streamSettings);
+ boundStreamSettings(node, "in", inbound.streamSettings);
}
catch
{