diff --git a/Sources/Sockets/TCP/TCPInternetSocket.swift b/Sources/Sockets/TCP/TCPInternetSocket.swift index 83afbc7..fbae480 100644 --- a/Sources/Sockets/TCP/TCPInternetSocket.swift +++ b/Sources/Sockets/TCP/TCPInternetSocket.swift @@ -1,6 +1,6 @@ import libc -public final class TCPInternetSocket: InternetSocket, TCPDuplexSocket, InternetStream, DuplexProgramStream { +public final class TCPInternetSocket { // program public let scheme: String @@ -129,3 +129,15 @@ public final class TCPInternetSocket: InternetSocket, TCPDuplexSocket, InternetS isClosed = true } } + +// MARK: Socks + +extension TCPInternetSocket: TCPReadableSocket { } +extension TCPInternetSocket: TCPWriteableSocket { } +extension TCPInternetSocket: InternetSocket { } + +// MARK: Transport + +extension TCPInternetSocket: ClientStream { } +extension TCPInternetSocket: ServerStream { } +extension TCPInternetSocket: InternetStream { } diff --git a/Sources/Transport/Streams/ProgramStream/InternetStream.swift b/Sources/Transport/Streams/ProgramStream/InternetStream.swift index 037df76..9bfa3e6 100644 --- a/Sources/Transport/Streams/ProgramStream/InternetStream.swift +++ b/Sources/Transport/Streams/ProgramStream/InternetStream.swift @@ -1,7 +1,3 @@ -public enum ProgramStreamError: Error { - case unsupportedSecurityLayer -} - public typealias DuplexProgramStream = ClientStream & ServerStream public typealias Port = UInt16 @@ -10,7 +6,6 @@ public protocol InternetStream { var scheme: String { get } var hostname: String { get } var port: Port { get } - init(scheme: String, hostname: String, port: Port) throws } extension Int { @@ -18,17 +13,3 @@ extension Int { return Port(self % Int(Port.max)) } } - -extension InternetStream { - public init() throws { - try self.init(scheme: "http", hostname: "0.0.0.0", port: 80) - } - - public init(hostname: String) throws { - try self.init(scheme: "http", hostname: hostname, port: 80) - } - - public init(hostname: String, port: Port) throws { - try self.init(scheme: "http", hostname: hostname, port: port) - } -}