yujunjun/V2rayU
1
0
Fork 0
mirror of https://github.com/yanue/V2rayU.git synced 2025-06-27 05:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #605 from LeeCenY/master

Browse Source 
Fix socks5 protocol can't connect without a user bug
This commit is contained in:
yanue 2020-06-10 13:35:43 +08:00 committed by GitHub
commit 01f41e8001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
V2rayU/ConfigWindow.swift
View File

@ -279,7 +279,11 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
var sockUser = V2rayOutboundSockUser()
sockUser.user = self.socks5User.stringValue
sockUser.pass = self.socks5Pass.stringValue
if self.socks5User.stringValue.count > 0 || self.socks5Pass.stringValue.count > 0 {
v2rayConfig.serverSocks5.servers[0].users = [sockUser]
} else {
v2rayConfig.serverSocks5.servers[0].users = nil
}
// ========================== server end =======================
// ========================== stream start =======================
@ -368,9 +372,9 @@ class ConfigWindowController: NSWindowController, NSWindowDelegate, NSTabViewDel
// socks5
self.socks5Addr.stringValue = v2rayConfig.serverSocks5.servers[0].address
self.socks5Port.stringValue = String(v2rayConfig.serverSocks5.servers[0].port)
if v2rayConfig.serverSocks5.servers[0].users.count > 0 {
self.socks5User.stringValue = v2rayConfig.serverSocks5.servers[0].users[0].user
self.socks5Pass.stringValue = v2rayConfig.serverSocks5.servers[0].users[0].pass
if let users = v2rayConfig.serverSocks5.servers[0].users, users.count > 0 {
self.socks5User.stringValue = users[0].user
self.socks5Pass.stringValue = users[0].pass
}
// ========================== server end =======================

2
V2rayU/v2ray/v2rayOutbound.swift
View File

@ -196,7 +196,7 @@ struct V2rayOutboundSocks: Codable {
struct V2rayOutboundSockServer: Codable {
var address: String = ""
var port: Int = 0
var users: [V2rayOutboundSockUser] = [V2rayOutboundSockUser()]
var users: [V2rayOutboundSockUser]?
}
struct V2rayOutboundSockUser: Codable {