cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add option for sslsecurity

Browse Source
This commit is contained in:
Erik 2016-06-14 16:11:37 -04:00
parent 2c059e1a6e
commit e163598ee6
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/SocketEngine.swift
View File

@ -76,6 +76,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
private var pongsMissedMax = 0 private var pongsMissedMax = 0
private var probeWait = ProbeWaitQueue() private var probeWait = ProbeWaitQueue()
private var secure = false private var secure = false
private var security: SSLSecurity?
private var selfSigned = false private var selfSigned = false
private var voipEnabled = false private var voipEnabled = false
@ -105,6 +106,8 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
voipEnabled = enable voipEnabled = enable
case let .Secure(secure): case let .Secure(secure):
self.secure = secure self.secure = secure
case let .Security(security):
self.security = security
case let .SelfSigned(selfSigned): case let .SelfSigned(selfSigned):
self.selfSigned = selfSigned self.selfSigned = selfSigned
default: default:
@ -265,6 +268,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
ws?.voipEnabled = voipEnabled ws?.voipEnabled = voipEnabled
ws?.delegate = self ws?.delegate = self
ws?.selfSignedSSL = selfSigned ws?.selfSignedSSL = selfSigned
ws?.security = security
ws?.connect() ws?.connect()
} }

7
Source/SocketIOClientOption.swift
View File

@ -45,6 +45,7 @@ public enum SocketIOClientOption : ClientOption {
case ReconnectAttempts(Int) case ReconnectAttempts(Int)
case ReconnectWait(Int) case ReconnectWait(Int)
case Secure(Bool) case Secure(Bool)
case Security(SSLSecurity)
case SelfSigned(Bool) case SelfSigned(Bool)
case SessionDelegate(NSURLSessionDelegate) case SessionDelegate(NSURLSessionDelegate)
case VoipEnabled(Bool) case VoipEnabled(Bool)
@ -85,6 +86,8 @@ public enum SocketIOClientOption : ClientOption {
description = "reconnectWait" description = "reconnectWait"
case .Secure: case .Secure:
description = "secure" description = "secure"
case .Security:
description = "security"
case .SelfSigned: case .SelfSigned:
description = "selfSigned" description = "selfSigned"
case .SessionDelegate: case .SessionDelegate:
@ -136,6 +139,8 @@ public enum SocketIOClientOption : ClientOption {
value = wait value = wait
case let .Secure(secure): case let .Secure(secure):
value = secure value = secure
case let .Security(security):
value = security
case let .SelfSigned(signed): case let .SelfSigned(signed):
value = signed value = signed
case let .SessionDelegate(delegate): case let .SessionDelegate(delegate):
@ -195,6 +200,8 @@ extension NSDictionary {
return .ReconnectWait(wait) return .ReconnectWait(wait)
case let ("secure", secure as Bool): case let ("secure", secure as Bool):
return .Secure(secure) return .Secure(secure)
case let ("security", security as SSLSecurity):
return .Security(security)
case let ("selfSigned", selfSigned as Bool): case let ("selfSigned", selfSigned as Bool):
return .SelfSigned(selfSigned) return .SelfSigned(selfSigned)
case let ("sessionDelegate", delegate as NSURLSessionDelegate): case let ("sessionDelegate", delegate as NSURLSessionDelegate):