From e68317c6bd0279b158a24dedfffc87f4856fb214 Mon Sep 17 00:00:00 2001
From: MHSanaei <ho3ein.sanaei@gmail.com>
Date: Sun, 19 Mar 2023 12:39:14 +0330
Subject: [PATCH] xtls bug fixed

---
 web/assets/js/model/xray.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index b3127706..47c5b04b 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -1156,13 +1156,10 @@ class Inbound extends XrayCommonClass {
             }
         }
 		
-		 if (this.xtls) {
-            if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
-                address = this.stream.tls.server;
+		 if (this.XTLS) {
                 if (type === "tcp") {
                     params.set("flow", this.settings.vlesses[clientIndex].flow);
                 }
-			}
         }
 
         const link = `vless://${uuid}@${address}:${port}`;
@@ -1245,19 +1242,16 @@ class Inbound extends XrayCommonClass {
             params.set("alpn", this.stream.tls.alpn[0]);
             if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
                 address = this.stream.tls.server;
-                }
-            if (this.stream.tls.settings[0]['serverName'] !== ''){
-                params.set("sni", this.stream.tls.settings[0]['serverName']);
 			}
+			if (this.stream.tls.settings[0]['serverName'] !== ''){
+                params.set("sni", this.stream.tls.settings[0]['serverName']);
+            }
         }
 		
-		if (this.xtls) {
-            if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
-                address = this.stream.tls.server;
-                 if (type === "tcp" && this.settings.trojans[clientIndex].flow.length > 0) {
+		if (this.XTLS) {
+                if (type === "tcp" && this.settings.trojans[clientIndex].flow.length > 0) {
                     params.set("flow", this.settings.trojans[clientIndex].flow);
                 }
-			}
         }
         
         const link = `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark)}`;