changed connection process behavior

Gagnant · Sep 25, 2016 · b975470 · b975470
1 parent a701370
commit b975470
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...t.xcodeproj/project.xcworkspace/xcuserdata/MAC.xcuserdatad/UserInterfaceState.xcuserstate b/...t.xcodeproj/project.xcworkspace/xcuserdata/MAC.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Socket/TCPSocket.swift b/Socket/TCPSocket.swift
@@ -24,6 +24,8 @@ public class TCPSocket {
 
    public var delegate: TCPSocketDelegate?
    public var status:   Status
+   public var host:     String
+   public var port:     Int
 
    fileprivate var outputStreamDelegate: StreamDelegate?
    fileprivate var inputStreamDelegate:  StreamDelegate?
@@ -32,26 +34,36 @@ public class TCPSocket {
    fileprivate var runLoop:              RunLoop?
    fileprivate var options:              Settings
 
-   public init(delegate: TCPSocketDelegate? = nil) {
+   public init(host: String, port: Int) {
 
       options = [
          SocketSecurityLevel:SocketSecurityLevelNegotiated as AnyObject,
          SocketValidatesCertificateChain:true as AnyObject
       ]
 
       self.runLoop  = nil
+      self.delegate = nil
       self.status   = .closed
-      self.delegate = delegate
+      self.port     = port
+      self.host     = host
 
       inputStreamDelegate  = StreamDelegate(cInputStream )
       outputStreamDelegate = StreamDelegate(cOutputStream)
    }
+
+   public convenience init(host: String, port: Int, settings: Settings) {
+      self.init(host: host, port: port)
+
+      settings.forEach { (key, value) in
+         options[key] = value
+      }
+   }
 
    deinit {
       disconnect()
    }
 
-   open func connect(_ host: String, port: Int, settings: Settings = Settings()) {
+   open func connect() {
 
       if self.status != .closed {
          self.disconnect()
@@ -65,7 +77,7 @@ public class TCPSocket {
       inputStream! .delegate = inputStreamDelegate       
       outputStream!.delegate = outputStreamDelegate       
 
-      self.parseSettings(settings)
+      self.parseSettings()
 
       queue.async {
 
@@ -152,9 +164,7 @@ public class TCPSocket {
       }
    }
 
-   fileprivate func parseSettings(_ settings: Settings) {
-
-      settings.forEach({ options[$0] = $1 })
+   fileprivate func parseSettings() {
 
       if options[SocketSecurityLevel] as? String == SocketSecurityLevelNegotiated {