Make SessionProxy* top level

Drop redundant SessionReply.

.jazzy.yaml

@@ -28,8 +28,8 @@ custom_categories:
       children:
         - OpenVPN
         - SessionError
+        - SessionProxy
         - SessionProxyDelegate
-        - SessionReply
     - name: AppExtension
       children:
         - TunnelKitProvider

TunnelKit.xcodeproj/project.pbxproj

@@ -64,8 +64,8 @@
 		0E3B65752249253B00EFF4DA /* tunnelbear.enc.1.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = 0E3B656E224923EC00EFF4DA /* tunnelbear.enc.1.ovpn */; };
 		0E3B65762249253F00EFF4DA /* tunnelbear.key in Resources */ = {isa = PBXBuildFile; fileRef = 0E3B65712249247E00EFF4DA /* tunnelbear.key */; };
 		0E3B65772249254000EFF4DA /* tunnelbear.key in Resources */ = {isa = PBXBuildFile; fileRef = 0E3B65712249247E00EFF4DA /* tunnelbear.key */; };
-		0E3E0F212108A8CC00B371C1 /* SessionReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* SessionReply.swift */; };
+		0E3E0F212108A8CC00B371C1 /* PushReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* PushReply.swift */; };
-		0E3E0F222108A8CC00B371C1 /* SessionReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* SessionReply.swift */; };
+		0E3E0F222108A8CC00B371C1 /* PushReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* PushReply.swift */; };
 		0E411B9B2271F90700E0852C /* DNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E411B992271F90700E0852C /* DNS.h */; };
 		0E411B9C2271F90700E0852C /* DNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E411B992271F90700E0852C /* DNS.h */; };
 		0E411B9D2271F90700E0852C /* DNS.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E411B9A2271F90700E0852C /* DNS.m */; };
@@ -268,7 +268,7 @@
 		0E3B15C62152B05E00984B17 /* CryptoCTR.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptoCTR.m; sourceTree = "<group>"; };
 		0E3B656E224923EC00EFF4DA /* tunnelbear.enc.1.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tunnelbear.enc.1.ovpn; sourceTree = "<group>"; };
 		0E3B65712249247E00EFF4DA /* tunnelbear.key */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tunnelbear.key; sourceTree = "<group>"; };
-		0E3E0F202108A8CC00B371C1 /* SessionReply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionReply.swift; sourceTree = "<group>"; };
+		0E3E0F202108A8CC00B371C1 /* PushReply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushReply.swift; sourceTree = "<group>"; };
 		0E411B992271F90700E0852C /* DNS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DNS.h; sourceTree = "<group>"; };
 		0E411B9A2271F90700E0852C /* DNS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DNS.m; sourceTree = "<group>"; };
 		0E411B9F2271FA3300E0852C /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/lib/libresolv.tbd; sourceTree = DEVELOPER_DIR; };
@@ -570,13 +570,13 @@
 				0E48AC622271ADA8009B1A98 /* PacketStream.h */,
 				0E48AC632271ADA9009B1A98 /* PacketStream.m */,
 				0EFEB4382006D3C800F81029 /* ProtocolMacros.swift */,
+				0E3E0F202108A8CC00B371C1 /* PushReply.swift */,
 				0EFEB4392006D3C800F81029 /* ReplayProtector.h */,
 				0EFEB4482006D3C800F81029 /* ReplayProtector.m */,
 				0E0C2123212ED29D008AB282 /* SessionError.swift */,
 				0EFEB42B2006D3C800F81029 /* SessionKey.swift */,
 				0EFEB43C2006D3C800F81029 /* SessionProxy.swift */,
 				0E749F5E2178885500BB2701 /* SessionProxy+PIA.swift */,
-				0E3E0F202108A8CC00B371C1 /* SessionReply.swift */,
 				0EE3B3E321471C3A0027AB17 /* StaticKey.swift */,
 				0EFEB4442006D3C800F81029 /* TLSBox.h */,
 				0EFEB4302006D3C800F81029 /* TLSBox.m */,
@@ -1139,7 +1139,7 @@
 				0EFEB4672006D3C800F81029 /* SessionProxy.swift in Sources */,
 				0ED9C8642138139000621BA3 /* CompressionFraming.swift in Sources */,
 				0EFEB4722006D3C800F81029 /* ReplayProtector.m in Sources */,
-				0E3E0F212108A8CC00B371C1 /* SessionReply.swift in Sources */,
+				0E3E0F212108A8CC00B371C1 /* PushReply.swift in Sources */,
 				0ECC60D82254981A0020BEAC /* ConfigurationError.swift in Sources */,
 				0EFEB4752006D3C800F81029 /* Errors.m in Sources */,
 				0E58BF532240FAA6006FB157 /* CompressionAlgorithm.swift in Sources */,
@@ -1202,7 +1202,7 @@
 				0ED9C8652138139000621BA3 /* CompressionFraming.swift in Sources */,
 				0EFEB4A42006D7F300F81029 /* DataPath.m in Sources */,
 				0ECC60D92254981A0020BEAC /* ConfigurationError.swift in Sources */,
-				0E3E0F222108A8CC00B371C1 /* SessionReply.swift in Sources */,
+				0E3E0F222108A8CC00B371C1 /* PushReply.swift in Sources */,
 				0E58BF542240FAA6006FB157 /* CompressionAlgorithm.swift in Sources */,
 				0E12B2A621454F7F00B4BAE9 /* BidirectionalState.swift in Sources */,
 				0EB03E402290D310006D03A0 /* CoreConfiguration+OpenVPN.swift in Sources */,

TunnelKit/Sources/OpenVPN/PushReply.swift

@@ -1,5 +1,5 @@
 //
-//  SessionReply.swift
+//  PushReply.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 7/25/18.
@@ -36,20 +36,16 @@
 
 import Foundation
 
-/// Groups the parsed reply of a successfully started session.
-public protocol SessionReply {
-
-    /// The returned options.
-    var options: OpenVPN.Configuration { get }
-}
-
 extension OpenVPN {
-    struct PushReply: SessionReply, CustomStringConvertible {
+
+    /// Groups the parsed reply of a successfully started session.
+    public struct PushReply: CustomStringConvertible {
         private static let prefix = "PUSH_REPLY,"
         
         private let original: String
 
-        let options: Configuration
+        /// The pushed options as a `Configuration` object.
+        public let options: Configuration
         
         init?(message: String) throws {
             guard message.hasPrefix(PushReply.prefix) else {
@@ -66,7 +62,8 @@ extension OpenVPN {
         
         // MARK: CustomStringConvertible
         
-        var description: String {
+        /// :nodoc:
+        public var description: String {
             let stripped = NSMutableString(string: original)
             ConfigurationParser.Regex.authToken.replaceMatches(
                 in: stripped,

TunnelKit/Sources/OpenVPN/SessionProxy+PIA.swift

@@ -36,7 +36,7 @@
 
 import Foundation
 
-extension OpenVPN.SessionProxy {
+extension SessionProxy {
     struct PIAHardReset {
         private static let obfuscationKeyLength = 3