Consolidate DataPath with new flow

TunnelKit/Sources/Core/DataPath.h

@@ -47,12 +47,11 @@
 
 - (nonnull instancetype)initWithEncrypter:(nonnull id<DataPathEncrypter>)encrypter
                                 decrypter:(nonnull id<DataPathDecrypter>)decrypter
+                                   peerId:(uint32_t)peerId // 24-bit, discard most significant byte
+                       compressionFraming:(CompressionFramingNative)compressionFraming
                                maxPackets:(NSInteger)maxPackets
                      usesReplayProtection:(BOOL)usesReplayProtection;
 
-- (void)setPeerId:(uint32_t)peerId; // 24-bit, discard most significant byte
-- (void)setCompressionFraming:(CompressionFramingNative)compressionFraming;
-
 - (NSArray<NSData *> *)encryptPackets:(nonnull NSArray<NSData *> *)packets key:(uint8_t)key error:(NSError **)error;
 - (NSArray<NSData *> *)decryptPackets:(nonnull NSArray<NSData *> *)packets keepAlive:(nullable bool *)keepAlive error:(NSError **)error;
 

TunnelKit/Sources/Core/DataPath.m

@@ -80,7 +80,7 @@
     return (uint8_t *)addr;
 }
 
-- (instancetype)initWithEncrypter:(id<DataPathEncrypter>)encrypter decrypter:(id<DataPathDecrypter>)decrypter maxPackets:(NSInteger)maxPackets usesReplayProtection:(BOOL)usesReplayProtection
+- (instancetype)initWithEncrypter:(id<DataPathEncrypter>)encrypter decrypter:(id<DataPathDecrypter>)decrypter peerId:(uint32_t)peerId compressionFraming:(CompressionFramingNative)compressionFraming maxPackets:(NSInteger)maxPackets usesReplayProtection:(BOOL)usesReplayProtection
 {
     NSParameterAssert(encrypter);
     NSParameterAssert(decrypter);
@@ -103,7 +103,9 @@
             self.inReplay = [[ReplayProtector alloc] init];
         }
 
-        self.compressionFraming = CompressionFramingNativeDisabled;
+        [self.encrypter setPeerId:peerId];
+        [self.decrypter setPeerId:peerId];
+        [self setCompressionFraming:compressionFraming];
     }
     return self;
 }
@@ -150,15 +152,6 @@
     return [[self class] alignedPointer:self.decBuffer];
 }
 
-- (void)setPeerId:(uint32_t)peerId
-{
-    NSAssert(self.encrypter, @"Setting peer-id to nil encrypter");
-    NSAssert(self.decrypter, @"Setting peer-id to nil decrypter");
-
-    [self.encrypter setPeerId:peerId];
-    [self.decrypter setPeerId:peerId];
-}
-
 - (void)setCompressionFraming:(CompressionFramingNative)compressionFraming
 {
     switch (compressionFraming) {

TunnelKit/Sources/Core/SessionProxy+SessionKey.swift

@@ -74,8 +74,6 @@ extension SessionProxy {
 
         private var isTLSConnected: Bool
         
-        private var canHandlePackets: Bool
-        
         init(id: UInt8) {
             self.id = id
 
@@ -83,7 +81,6 @@ extension SessionProxy {
             state = .invalid
             softReset = false
             isTLSConnected = false
-            canHandlePackets = false
         }
 
         // Ruby: Key.hard_reset_timeout
@@ -109,21 +106,11 @@ extension SessionProxy {
             return isTLSConnected
         }
         
-        func startHandlingPackets(withPeerId peerId: UInt32? = nil, compressionFraming: CompressionFraming = .disabled) {
-            dataPath?.setPeerId(peerId ?? PacketPeerIdDisabled)
-            dataPath?.setCompressionFraming(compressionFraming.native)
-            canHandlePackets = true
-        }
-        
         func encrypt(packets: [Data]) throws -> [Data]? {
             guard let dataPath = dataPath else {
                 log.warning("Data: Set dataPath first")
                 return nil
             }
-            guard canHandlePackets else {
-                log.warning("Data: Invoke startHandlingPackets() before encrypting")
-                return nil
-            }
             return try dataPath.encryptPackets(packets, key: id)
         }
         
@@ -132,10 +119,6 @@ extension SessionProxy {
                 log.warning("Data: Set dataPath first")
                 return nil
             }
-            guard canHandlePackets else {
-                log.warning("Data: Invoke startHandlingPackets() before decrypting")
-                return nil
-            }
             var keepAlive = false
             let decrypted = try dataPath.decryptPackets(packets, keepAlive: &keepAlive)
             if keepAlive {

TunnelKit/Sources/Core/SessionProxy.swift

@@ -702,7 +702,6 @@ public class SessionProxy {
         
         if negotiationKey.softReset {
             authenticator = nil
-            negotiationKey.startHandlingPackets(withPeerId: peerId)
             negotiationKey.controlState = .connected
             connectedDate = Date()
             transitionKeys()
@@ -890,12 +889,7 @@ public class SessionProxy {
         }
         
         setupEncryption()
-        
         authenticator = nil
-        negotiationKey.startHandlingPackets(
-            withPeerId: peerId,
-            compressionFraming: configuration.compressionFraming
-        )
         negotiationKey.controlState = .connected
         connectedDate = Date()
         transitionKeys()
@@ -1051,6 +1045,8 @@ public class SessionProxy {
         negotiationKey.dataPath = DataPath(
             encrypter: bridge.encrypter(),
             decrypter: bridge.decrypter(),
+            peerId: peerId ?? PacketPeerIdDisabled,
+            compressionFraming: configuration.compressionFraming.native,
             maxPackets: link?.packetBufferSize ?? 200,
             usesReplayProtection: CoreConfiguration.usesReplayProtection
         )