Skip to content

Commit 5d6205c

Browse files
yanueyanue
committed
修复reality
1 parent 73be77c commit 5d6205c

File tree

6 files changed

+28
-55
lines changed

6 files changed

+28
-55
lines changed

‎Build/v2ray-core/.DS_Store

6 KB
Binary file not shown.

‎Build/v2ray-core/v2ray

26.6 MB
Binary file not shown.

‎Build/v2ray-core/v2ray-arm64

26.4 MB
Binary file not shown.

‎V2rayU.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@
951951
CODE_SIGN_STYLE = Manual;
952952
COMBINE_HIDPI_IMAGES = YES;
953953
COPY_PHASE_STRIP = NO;
954-
CURRENT_PROJECT_VERSION = 3.5.0;
954+
CURRENT_PROJECT_VERSION = 3.6.0;
955955
DEFINES_MODULE = YES;
956956
DEVELOPMENT_ASSET_PATHS = "";
957957
DEVELOPMENT_TEAM = "";
@@ -964,7 +964,7 @@
964964
"@executable_path/../Frameworks",
965965
);
966966
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
967-
MARKETING_VERSION = 3.5.0;
967+
MARKETING_VERSION = 3.6.0;
968968
ONLY_ACTIVE_ARCH = YES;
969969
PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU;
970970
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -989,7 +989,7 @@
989989
CODE_SIGN_STYLE = Manual;
990990
COMBINE_HIDPI_IMAGES = YES;
991991
COPY_PHASE_STRIP = NO;
992-
CURRENT_PROJECT_VERSION = 3.5.0;
992+
CURRENT_PROJECT_VERSION = 3.6.0;
993993
DEFINES_MODULE = YES;
994994
DEVELOPMENT_ASSET_PATHS = "";
995995
DEVELOPMENT_TEAM = "";
@@ -1002,7 +1002,7 @@
10021002
"@executable_path/../Frameworks",
10031003
);
10041004
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
1005-
MARKETING_VERSION = 3.5.0;
1005+
MARKETING_VERSION = 3.6.0;
10061006
ONLY_ACTIVE_ARCH = NO;
10071007
PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU;
10081008
PRODUCT_NAME = "$(TARGET_NAME)";

‎V2rayU/ConfigWindow.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,10 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
463463
self.streamTlsAllowInsecure.intValue = v2rayConfig.securityTls.allowInsecure ? 1 : 0
464464
self.streamTlsServerName.stringValue = v2rayConfig.securityTls.serverName
465465

466+
print("v2rayConfig.securityReality",v2rayConfig.securityReality)
466467
// reality
467468
self.streamRealityServerName.stringValue = v2rayConfig.securityReality.serverName
468469
self.streamRealityPublicKey.stringValue = v2rayConfig.securityReality.publicKey
469-
self.streamRealityPublicKey.stringValue = v2rayConfig.securityReality.publicKey
470470
self.streamRealityShortId.stringValue = v2rayConfig.securityReality.shortId
471471
self.streamRealitySpiderX.stringValue = v2rayConfig.securityReality.spiderX
472472

‎V2rayU/v2ray/V2rayConfig.swift

+23-50
Original file line numberDiff line numberDiff line change
@@ -602,15 +602,13 @@ class V2rayConfig: NSObject {
602602
}
603603

604604
if self.streamSecurity == "tls" {
605-
var tls = self.securityTls
606605
streamSettings.security = .tls
607-
streamSettings.tlsSettings = tls
606+
streamSettings.tlsSettings = self.securityTls
608607
}
609608

610609
if self.streamSecurity == "xtls" {
611-
var tls = self.securityTls
612610
streamSettings.security = .xtls
613-
streamSettings.xtlsSettings = tls
611+
streamSettings.xtlsSettings = self.securityTls
614612
}
615613

616614
if self.streamSecurity == "reality" {
@@ -1132,11 +1130,6 @@ class V2rayConfig: NSObject {
11321130
settingVLess.vnext = vnext
11331131
v2rayOutbound.settingVLess = settingVLess
11341132

1135-
var mux = V2rayOutboundMux()
1136-
mux.enabled = self.enableMux
1137-
mux.concurrency = self.mux
1138-
v2rayOutbound.mux = mux
1139-
11401133
break
11411134

11421135
case .trojan:
@@ -1245,20 +1238,24 @@ class V2rayConfig: NSObject {
12451238
if preTxt == "outbound" {
12461239

12471240
if transport.xtlsSettings != nil {
1248-
if transport.xtlsSettings?.serverName != nil {
1249-
self.securityTls.serverName = transport.xtlsSettings!.serverName
1250-
self.securityTls.allowInsecure = transport.xtlsSettings!.allowInsecure
1251-
}
1241+
self.securityTls.serverName = transport.xtlsSettings!.serverName
1242+
self.securityTls.allowInsecure = transport.xtlsSettings!.allowInsecure
12521243
}
12531244

12541245
if transport.tlsSettings != nil {
1255-
// set data
1256-
if transport.tlsSettings?.serverName != nil {
1257-
self.securityTls.serverName = transport.tlsSettings!.serverName
1258-
self.securityTls.allowInsecure = transport.tlsSettings!.allowInsecure
1259-
}
1246+
self.securityTls.serverName = transport.tlsSettings!.serverName
1247+
self.securityTls.allowInsecure = transport.tlsSettings!.allowInsecure
12601248
}
1261-
1249+
1250+
if transport.realitySettings != nil {
1251+
self.securityReality.serverName = transport.realitySettings!.serverName
1252+
self.securityReality.show = transport.realitySettings!.show
1253+
self.securityReality.fingerprint = transport.realitySettings!.fingerprint
1254+
self.securityReality.publicKey = transport.realitySettings!.publicKey
1255+
self.securityReality.shortId = transport.realitySettings!.shortId
1256+
self.securityReality.spiderX = transport.realitySettings!.spiderX
1257+
}
1258+
12621259
if transport.tcpSettings != nil {
12631260
self.streamTcp = transport.tcpSettings!
12641261
}
@@ -1291,7 +1288,7 @@ class V2rayConfig: NSObject {
12911288
var stream = V2rayTransport()
12921289
// tlsSettings
12931290
if streamJson["tlsSettings"].dictionaryValue.count > 0 {
1294-
var settings = streamJson["tlsSettings"]
1291+
let settings = streamJson["tlsSettings"]
12951292
var tlsSettings = TlsSettings()
12961293
tlsSettings.serverName = settings["serverName"].stringValue
12971294
tlsSettings.alpn = settings["alpn"].stringValue
@@ -1315,31 +1312,7 @@ class V2rayConfig: NSObject {
13151312

13161313
// xtlsSettings
13171314
if streamJson["xtlsSettings"].dictionaryValue.count > 0 {
1318-
var settings = streamJson["xtlsSettings"]
1319-
var tlsSettings = TlsSettings()
1320-
tlsSettings.serverName = settings["serverName"].stringValue
1321-
tlsSettings.alpn = settings["alpn"].stringValue
1322-
tlsSettings.allowInsecure = settings["allowInsecure"].boolValue
1323-
tlsSettings.allowInsecureCiphers = settings["allowInsecureCiphers"].boolValue
1324-
// certificates
1325-
if settings["certificates"].dictionaryValue.count > 0 {
1326-
var certificates = TlsCertificates()
1327-
let usage = TlsCertificates.usage(rawValue: settings["certificates"]["usage"].stringValue)
1328-
if (usage != nil) {
1329-
certificates.usage = usage!
1330-
}
1331-
certificates.certificateFile = settings["certificates"]["certificateFile"].stringValue
1332-
certificates.keyFile = settings["certificates"]["keyFile"].stringValue
1333-
certificates.certificate = settings["certificates"]["certificate"].stringValue
1334-
certificates.key = settings["certificates"]["key"].stringValue
1335-
tlsSettings.certificates = certificates
1336-
}
1337-
stream.xtlsSettings = tlsSettings
1338-
}
1339-
1340-
// utlsSettings
1341-
if streamJson["utlsSettings"].dictionaryValue.count > 0 {
1342-
var settings = streamJson["utlsSettings"]
1315+
let settings = streamJson["xtlsSettings"]
13431316
var tlsSettings = TlsSettings()
13441317
tlsSettings.serverName = settings["serverName"].stringValue
13451318
tlsSettings.alpn = settings["alpn"].stringValue
@@ -1360,15 +1333,15 @@ class V2rayConfig: NSObject {
13601333
}
13611334
stream.xtlsSettings = tlsSettings
13621335
}
1363-
1336+
13641337
// reality
13651338
if streamJson["realitySettings"].dictionaryValue.count > 0 {
1366-
var settings = streamJson["realitySettings"]
1339+
let settings = streamJson["realitySettings"]
13671340
var realitySettings = RealitySettings()
13681341
realitySettings.show = settings["show"].boolValue
13691342
realitySettings.fingerprint = settings["fingerprint"].stringValue // 必填，使用 uTLS 库模拟客户端 TLS 指纹
1370-
realitySettings.serverName = settings["allowInsecure"].stringValue
1371-
realitySettings.publicKey = settings["allowInsecureCiphers"].stringValue
1343+
realitySettings.serverName = settings["serverName"].stringValue
1344+
realitySettings.publicKey = settings["publicKey"].stringValue
13721345
realitySettings.shortId = settings["shortId"].stringValue
13731346
realitySettings.spiderX = settings["spiderX"].stringValue
13741347

@@ -1393,7 +1366,7 @@ class V2rayConfig: NSObject {
13931366

13941367
// request
13951368
if streamJson["tcpSettings"]["header"]["request"].dictionaryValue.count > 0 {
1396-
var requestJson = streamJson["tcpSettings"]["header"]["request"]
1369+
let requestJson = streamJson["tcpSettings"]["header"]["request"]
13971370
var tcpRequest = TcpSettingHeaderRequest()
13981371
tcpRequest.version = requestJson["version"].stringValue
13991372
tcpRequest.method = requestJson["method"].stringValue

0 commit comments

Comments
 (0)