xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add KcptunProfile.

Browse Source
This commit is contained in:
Charlie Qiu
2017-01-11 16:44:58 +08:00
parent 361742ba38
commit ad938a355a
6 changed files with 407 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ShadowsocksX-NG/ServerProfile.swift
View File

@ -19,7 +19,10 @@ class ServerProfile: NSObject, NSCopying {
var password:String = ""
var remark:String = ""
var ota: Bool = false // onetime authentication
var enabledKcptun: Bool = false
var kcptunProfile = KcptunProfile()
override init() {
uuid = UUID().uuidString
}
@ -104,6 +107,9 @@ class ServerProfile: NSObject, NSCopying {
if let ota = data["OTA"] {
profile.ota = ota as! Bool
}
if let kcptunData = data["KcptunProfile"] {
profile.kcptunProfile = KcptunProfile.fromDictionary(kcptunData as! [String:Any?])
}
}
if let id = data["Id"] as? String {
@ -126,23 +132,40 @@ class ServerProfile: NSObject, NSCopying {
d["Password"] = password as AnyObject?
d["Remark"] = remark as AnyObject?
d["OTA"] = ota as AnyObject?
d["EnabledKcptun"] = enabledKcptun as AnyObject
d["KcptunProfile"] = kcptunProfile.toDictionary() as AnyObject
return d
}
func toJsonConfig() -> [String: AnyObject] {
var conf: [String: AnyObject] = ["server": serverHost as AnyObject,
"server_port": NSNumber(value: serverPort as UInt16),
"password": password as AnyObject,
var conf: [String: AnyObject] = ["password": password as AnyObject,
"method": method as AnyObject,]
let defaults = UserDefaults.standard
conf["local_port"] = NSNumber(value: UInt16(defaults.integer(forKey: "LocalSocks5.ListenPort")) as UInt16)
conf["local_address"] = defaults.string(forKey: "LocalSocks5.ListenAddress") as AnyObject?
conf["timeout"] = NSNumber(value: UInt32(defaults.integer(forKey: "LocalSocks5.Timeout")) as UInt32)
conf["auth"] = NSNumber(value: ota as Bool)
if enabledKcptun {
let localHost = defaults.string(forKey: "Kcptun.LocalHost")
let localPort = uint16(defaults.integer(forKey: "Kcptun.LocalPort"))
conf["server"] = localHost as AnyObject
conf["server_port"] = NSNumber(value: localPort as UInt16)
} else {
conf["server"] = serverHost as AnyObject
conf["server_port"] = NSNumber(value: serverPort as UInt16)
}
return conf
}
func toKcptunJsonConfig() -> [String: AnyObject] {
var conf = kcptunProfile.toJsonConfig()
conf["remoteaddr"] = "\(serverHost):\(serverPort)" as AnyObject
return conf
}
func isValid() -> Bool {
func validateIpAddress(_ ipToValidate: String) -> Bool {