From e87fe6b129d830f29c781dc9f12808edea45abaf Mon Sep 17 00:00:00 2001
From: yanue <yanue@outlook.com>
Date: Mon, 17 Jul 2023 11:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dss-security=E4=B8=BAnone,?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5reality-serverName=E4=B8=BA?=
 =?UTF-8?q?sni?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 V2rayU/Import.swift            | 14 +++++++++-----
 V2rayU/Uri.swift               |  4 ++++
 V2rayU/v2ray/V2rayConfig.swift |  5 +++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/V2rayU/Import.swift b/V2rayU/Import.swift
index 115432f..d2c7731 100644
--- a/V2rayU/Import.swift
+++ b/V2rayU/Import.swift
@@ -87,6 +87,9 @@ class ImportUri {
         }
 
         let v2ray = V2rayConfig()
+        v2ray.streamNetwork = "tcp" // 必须为tcp
+        v2ray.streamSecurity = "none" // ss 必须为 none
+
         var ssServer = V2rayOutboundShadowsockServer()
         ssServer.address = ss.host
         ssServer.port = ss.port
@@ -123,6 +126,9 @@ class ImportUri {
         self.remark = ssr.remark
 
         let v2ray = V2rayConfig()
+        v2ray.streamNetwork = "tcp" // 必须为tcp
+        v2ray.streamSecurity = "none" // ss 必须为 none
+
         var ssServer = V2rayOutboundShadowsockServer()
         ssServer.address = ssr.host
         ssServer.port = ssr.port
@@ -253,16 +259,13 @@ class ImportUri {
         // stream
         v2ray.streamNetwork = vmess.type
         v2ray.streamSecurity = vmess.security
-        v2ray.securityTls.serverName = vmess.host
-        if vmess.host.count == 0 {
-            v2ray.securityTls.serverName = vmess.address
-        }
+        v2ray.securityTls.serverName = vmess.sni // default tls sni
 
         if v2ray.streamSecurity == "reality" {
             v2ray.securityReality.publicKey = vmess.pbk
             v2ray.securityReality.fingerprint = vmess.fp
             v2ray.securityReality.shortId = vmess.sid
-            v2ray.securityReality.serverName = vmess.address
+            v2ray.securityReality.serverName = vmess.sni
         }
 
         // kcp
@@ -325,6 +328,7 @@ class ImportUri {
         v2ray.streamNetwork = "tcp"
         v2ray.streamSecurity = trojan.security
         v2ray.securityTls.allowInsecure = true
+        v2ray.securityTls.serverName = svr.sni // default tls sni
 
         v2ray.serverProtocol = V2rayProtocolOutbound.trojan.rawValue
         // check is valid
diff --git a/V2rayU/Uri.swift b/V2rayU/Uri.swift
index 7115c98..8d4ab83 100644
--- a/V2rayU/Uri.swift
+++ b/V2rayU/Uri.swift
@@ -588,6 +588,10 @@ class VlessUri {
             }
         }
 
+        if vmess.sni.count == 0 {
+            vmess.sni = address
+        }
+
         self.remark = (url.fragment ?? "vless").urlDecoded()
     }
 }
diff --git a/V2rayU/v2ray/V2rayConfig.swift b/V2rayU/v2ray/V2rayConfig.swift
index 1f9be70..3df5b1b 100644
--- a/V2rayU/v2ray/V2rayConfig.swift
+++ b/V2rayU/v2ray/V2rayConfig.swift
@@ -125,8 +125,8 @@ class V2rayConfig: NSObject {
     var streamQuic = QuicSettings()
     var routing = V2rayRouting()
 
-    // tls
-    var streamSecurity = "tls" // none|tls|xtls|reality
+    // tls 默认需为none,shadowsocks需为none
+    var streamSecurity = "none" // none|tls|xtls|reality
     var securityTls = TlsSettings() // tls|xtls
     var securityReality = RealitySettings() // reality
     
@@ -474,6 +474,7 @@ class V2rayConfig: NSObject {
                 self.error = "missing shadowsocks.method";
                 return
             }
+            s.security = "none" // 需为none
             break
         case V2rayProtocolOutbound.socks.rawValue:
             if self.serverSocks5.servers.count == 0 {