Merge pull request #116 from vapor/2.0

2.0 + remove nonblocking

.gitignore

@@ -63,3 +63,5 @@ Carthage/Build
 fastlane/report.xml
 fastlane/screenshots
 
+Package.pins
+

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Honza Dvorsky
+Copyright (c) 2016 Qutheory, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.swift

@@ -1,25 +1,3 @@
 import PackageDescription
 
-let package = Package(
-    name: "Socks",
-    targets: [
-    	Target(name: "SocksCore"),
-    	Target(name: "Socks", dependencies: ["SocksCore"]),
-      //Target(name: "SocksCoreExampleTCPServer", dependencies: ["SocksCore"]),
-      //Target(name: "SocksCoreExampleTCPKeepAliveServer", dependencies: ["Socks"]),
-    	//Target(name: "SocksCoreExampleTCPClient", dependencies: ["SocksCore"]),
-    	//Target(name: "SocksExampleTCPServer", dependencies: ["Socks"]),
-    	//Target(name: "SocksExampleTCPClient", dependencies: ["Socks"]),
-    	//Target(name: "SocksExampleUDPClient", dependencies: ["Socks"]),
-    	//Target(name: "SocksExampleUDPServer", dependencies: ["Socks"]),
-    ],
-    exclude: [
-        "Sources/SocksCoreExampleTCPServer",
-        "Sources/SocksCoreExampleTCPKeepAliveServer",
-        "Sources/SocksCoreExampleTCPClient",
-        "Sources/SocksExampleTCPServer",
-        "Sources/SocksExampleTCPClient",
-        "Sources/SocksExampleUDPClient",
-        "Sources/SocksExampleUDPServer",
-    ]
-)
+let package = Package(name: "Socks")

Sources/Socks/TCPClient.swift → Sources/Socks/Client/TCPClient.swift

@@ -1,13 +1,3 @@
-//
-//  TCPClient.swift
-//  Socks
-//
-//  Created by Honza Dvorsky on 1/6/16.
-//
-//
-
-import SocksCore
-
 /// Represents an established TCP connection.
 public class TCPClient {
 

Sources/Socks/UDPClient.swift → Sources/Socks/Client/UDPClient.swift

@@ -1,13 +1,3 @@
-//
-//  UDPClient.swift
-//  Socks
-//
-//  Created by Honza Dvorsky on 6/1/16.
-//
-//
-
-import SocksCore
-
 public class UDPClient {
 
     public let socket: UDPInternetSocket

Sources/SocksCore/Address.swift → Sources/Socks/Core/Address.swift

@@ -1,11 +1,3 @@
-//
-//  Address.swift
-//  Socks
-//
-//  Created by Matthias Kreileder on 3/20/16.
-//
-//
-
 #if os(Linux)
     import Glibc
 #else

Sources/SocksCore/Bytes.swift → Sources/Socks/Core/Bytes.swift

@@ -1,11 +1,3 @@
-//
-//  Bytes.swift
-//  Socks
-//
-//  Created by Honza Dvorsky on 3/20/16.
-//
-//
-
 #if os(Linux)
     import Glibc
 #else

Sources/SocksCore/Conversions.swift → Sources/Socks/Core/Conversions.swift

@@ -1,11 +1,3 @@
-//
-//  Conversions.swift
-//  Socks
-//
-//  Created by Honza Dvorsky on 3/20/16.
-//
-//
-
 //convert little-endian to big-endian for network transfer
 //aka Host TO Network Short
 func htons(_ value: CUnsignedShort) -> CUnsignedShort {

Sources/SocksCore/Error.swift → Sources/Socks/Core/Error.swift

@@ -1,11 +1,3 @@
-//
-//  SocksError.swift
-//  Socks
-//
-//  Created by Honza Dvorsky on 3/20/16.
-//
-//
-
 #if os(Linux)
     import Glibc
 #else

Sources/SocksCore/InternetSocket.swift → Sources/Socks/Core/InternetSocket.swift

@@ -1,11 +1,3 @@
-//
-//  InternetSocket.swift
-//  Socks
-//
-//  Created by Honza Dvorsky on 3/20/16.
-//
-//
-
 #if os(Linux)
     import Glibc
     private let socket_bind = Glibc.bind

Sources/SocksCore/Select.swift → Sources/Socks/Core/Select.swift

@@ -49,6 +49,11 @@ extension timeval {
     }
 }
 
+extension timeval: Equatable { }
+public func ==(lhs: timeval, rhs: timeval) -> Bool {
+    return lhs.tv_sec == rhs.tv_sec && lhs.tv_usec == rhs.tv_usec
+}
+
 private func filter(_ sockets: [Descriptor]?, _ set: inout fd_set) -> [Descriptor] {
     return sockets?.filter {
         fdIsSet($0, &set)

Sources/SocksCore/Socket.swift → Sources/Socks/Core/Socket.swift

@@ -1,11 +1,3 @@
-//
-//  Socket.swift
-//  Socks
-//
-//  Created by Honza Dvorsky on 3/20/16.
-//
-//
-
 #if os(Linux)
     import Glibc
     private let s_socket = Glibc.socket
@@ -32,11 +24,6 @@ extension RawSocket {
             throw SocksError(.closeSocketFailed)
         }
     }
-
-    @available(*, deprecated: 1.2.6, renamed: "isClosed", message: "use isClosed instead")
-    public var closed: Bool {
-        return isClosed
-    }
 }
 
 extension Socket {

Sources/SocksCore/SocketOptions.swift → Sources/Socks/Core/SocketOptions.swift

@@ -1,11 +1,3 @@
-//
-//  SocketOptions.swift
-//  Socks
-//
-//  Created by Honza Dvorsky on 6/7/16.
-//
-//
-
 #if os(Linux)
     import Glibc
     private let s_socket = Glibc.socket
@@ -130,9 +122,3 @@ extension RawSocket {
         return val.pointee
     }
 }
-
-extension timeval: Equatable { }
-public func ==(lhs: timeval, rhs: timeval) -> Bool {
-    return lhs.tv_sec == rhs.tv_sec && lhs.tv_usec == rhs.tv_usec
-}
-