Merge TunnelProviderMessaging into PacketTunnelCore

mullvad · Sep 20, 2023 · 02787f4 · 02787f4
1 parent 455de91
commit 02787f4
Show file tree

Hide file tree

Showing 24 changed files with 109 additions and 218 deletions.
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
diff --git a/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift b/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProviderHost.swift
@@ -15,9 +15,9 @@ import MullvadSettings
 import MullvadTransport
 import MullvadTypes
 import enum NetworkExtension.NEProviderStopReason
+import PacketTunnelCore
 import RelayCache
 import RelaySelector
-import TunnelProviderMessaging
 
 final class SimulatorTunnelProviderHost: SimulatorTunnelProviderDelegate {
     private var selectorResult: RelaySelectorResult?

diff --git a/ios/MullvadVPN/TransportMonitor/PacketTunnelTransport.swift b/ios/MullvadVPN/TransportMonitor/PacketTunnelTransport.swift
@@ -11,7 +11,7 @@ import MullvadREST
 import MullvadTransport
 import MullvadTypes
 import Operations
-import TunnelProviderMessaging
+import PacketTunnelCore
 
 struct PacketTunnelTransport: RESTTransport {
     var name: String {

diff --git a/ios/MullvadVPN/TunnelManager/MapConnectionStatusOperation.swift b/ios/MullvadVPN/TunnelManager/MapConnectionStatusOperation.swift
@@ -12,7 +12,7 @@ import MullvadREST
 import MullvadTypes
 import NetworkExtension
 import Operations
-import TunnelProviderMessaging
+import PacketTunnelCore
 
 class MapConnectionStatusOperation: AsyncOperation {
     private let interactor: TunnelInteractor

diff --git a/ios/MullvadVPN/TunnelManager/SendTunnelProviderMessageOperation.swift b/ios/MullvadVPN/TunnelManager/SendTunnelProviderMessageOperation.swift
@@ -9,7 +9,7 @@
 import MullvadTypes
 import NetworkExtension
 import Operations
-import TunnelProviderMessaging
+import PacketTunnelCore
 import UIKit
 
 /// Delay for sending tunnel provider messages to the tunnel when in connecting state.

diff --git a/ios/MullvadVPN/TunnelManager/StartTunnelOperation.swift b/ios/MullvadVPN/TunnelManager/StartTunnelOperation.swift
@@ -10,9 +10,9 @@ import Foundation
 import MullvadLogging
 import NetworkExtension
 import Operations
+import PacketTunnelCore
 import RelayCache
 import RelaySelector
-import TunnelProviderMessaging
 
 class StartTunnelOperation: ResultOperation<Void> {
     typealias EncodeErrorHandler = (Error) -> Void

diff --git a/ios/MullvadVPN/TunnelManager/Tunnel+Messaging.swift b/ios/MullvadVPN/TunnelManager/Tunnel+Messaging.swift
@@ -10,8 +10,8 @@ import Foundation
 import MullvadREST
 import MullvadTypes
 import Operations
+import PacketTunnelCore
 import RelaySelector
-import TunnelProviderMessaging
 
 /// Shared operation queue used for IPC requests.
 private let operationQueue = AsyncOperationQueue()

diff --git a/ios/MullvadVPN/TunnelManager/TunnelManager.swift b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
@@ -13,10 +13,10 @@ import MullvadSettings
 import MullvadTypes
 import NetworkExtension
 import Operations
+import PacketTunnelCore
 import RelayCache
 import RelaySelector
 import StoreKit
-import TunnelProviderMessaging
 import UIKit
 import class WireGuardKitTypes.PublicKey
 

diff --git a/ios/MullvadVPN/TunnelManager/TunnelState.swift b/ios/MullvadVPN/TunnelManager/TunnelState.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import MullvadTypes
-import TunnelProviderMessaging
+import PacketTunnelCore
 
 /// A struct describing the tunnel status.
 struct TunnelStatus: Equatable, CustomStringConvertible {

diff --git a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift
@@ -9,7 +9,6 @@
 import MapKit
 import MullvadLogging
 import MullvadTypes
-import TunnelProviderMessaging
 import UIKit
 
 class TunnelViewController: UIViewController, RootContainment {

diff --git a/ios/MullvadVPNTests/DeviceCheckOperationTests.swift b/ios/MullvadVPNTests/DeviceCheckOperationTests.swift
@@ -10,6 +10,7 @@ import MullvadREST
 import MullvadSettings
 import MullvadTypes
 import Operations
+import PacketTunnelCore
 import WireGuardKitTypes
 import XCTest
 

diff --git a/ios/PacketTunnel/DeviceCheck/DeviceCheckOperation.swift b/ios/PacketTunnel/DeviceCheck/DeviceCheckOperation.swift
@@ -12,6 +12,7 @@ import MullvadREST
 import MullvadSettings
 import MullvadTypes
 import Operations
+import PacketTunnelCore
 import class WireGuardKitTypes.PrivateKey
 import class WireGuardKitTypes.PublicKey
 

diff --git a/ios/PacketTunnel/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider.swift
@@ -18,7 +18,6 @@ import Operations
 import PacketTunnelCore
 import RelayCache
 import RelaySelector
-import TunnelProviderMessaging
 import WireGuardKit
 
 /// Restart interval (in seconds) for the tunnel that failed to start early on.

diff --git a/...llvadTypes/PacketTunnelErrorWrapper.swift → ...elCore/IPC/PacketTunnelErrorWrapper.swift b/...llvadTypes/PacketTunnelErrorWrapper.swift → ...elCore/IPC/PacketTunnelErrorWrapper.swift
diff --git a/...oviderMessaging/PacketTunnelOptions.swift → ...tTunnelCore/IPC/PacketTunnelOptions.swift b/...oviderMessaging/PacketTunnelOptions.swift → ...tTunnelCore/IPC/PacketTunnelOptions.swift
@@ -1,6 +1,6 @@
 //
 //  PacketTunnelOptions.swift
-//  TunnelProviderMessaging
+//  PacketTunnelCore
 //
 //  Created by pronebird on 22/08/2021.
 //  Copyright © 2021 Mullvad VPN AB. All rights reserved.

diff --git a/ios/MullvadTypes/PacketTunnelRelay.swift → ...ketTunnelCore/IPC/PacketTunnelRelay.swift b/ios/MullvadTypes/PacketTunnelRelay.swift → ...ketTunnelCore/IPC/PacketTunnelRelay.swift
@@ -1,12 +1,13 @@
 //
 //  PacketTunnelRelay.swift
-//  MullvadTypes
+//  PacketTunnelCore
 //
 //  Created by pronebird on 21/10/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.
 //
 
 import Foundation
+import MullvadTypes
 
 /// Struct holding tunnel relay information.
 public struct PacketTunnelRelay: Codable, Equatable {

diff --git a/ios/MullvadTypes/PacketTunnelStatus.swift → ...etTunnelCore/IPC/PacketTunnelStatus.swift b/ios/MullvadTypes/PacketTunnelStatus.swift → ...etTunnelCore/IPC/PacketTunnelStatus.swift
@@ -1,12 +1,13 @@
 //
 //  PacketTunnelStatus.swift
-//  MullvadTypes
+//  PacketTunnelCore
 //
 //  Created by pronebird on 27/07/2021.
 //  Copyright © 2021 Mullvad VPN AB. All rights reserved.
 //
 
 import Foundation
+import MullvadTypes
 
 /// The verdict of an account status check.
 public enum AccountVerdict: Equatable, Codable {

diff --git a/ios/PacketTunnelCore/IPC/RelaySelectorResult+.swift b/ios/PacketTunnelCore/IPC/RelaySelectorResult+.swift
@@ -0,0 +1,21 @@
+//
+//  RelaySelectorResult+.swift
+//  PacketTunnelCore
+//
+//  Created by pronebird on 20/09/2023.
+//  Copyright © 2023 Mullvad VPN AB. All rights reserved.
+//
+
+import Foundation
+import RelaySelector
+
+extension RelaySelectorResult {
+    public var packetTunnelRelay: PacketTunnelRelay {
+        PacketTunnelRelay(
+            ipv4Relay: endpoint.ipv4Relay,
+            ipv6Relay: endpoint.ipv6Relay,
+            hostname: relay.hostname,
+            location: location
+        )
+    }
+}
diff --git a/...iderMessaging/TunnelProviderMessage.swift → ...unnelCore/IPC/TunnelProviderMessage.swift b/...iderMessaging/TunnelProviderMessage.swift → ...unnelCore/IPC/TunnelProviderMessage.swift
@@ -1,6 +1,6 @@
 //
 //  TunnelProviderMessage.swift
-//  TunnelProviderMessaging
+//  PacketTunnelCore
 //
 //  Created by pronebird on 27/07/2021.
 //  Copyright © 2021 Mullvad VPN AB. All rights reserved.

diff --git a/...oviderMessaging/TunnelProviderReply.swift → ...tTunnelCore/IPC/TunnelProviderReply.swift b/...oviderMessaging/TunnelProviderReply.swift → ...tTunnelCore/IPC/TunnelProviderReply.swift
@@ -1,6 +1,6 @@
 //
 //  TunnelProviderReply.swift
-//  TunnelProviderMessaging
+//  PacketTunnelCore
 //
 //  Created by pronebird on 20/10/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.

diff --git a/...elProviderMessaging/ProxyURLRequest.swift → ...ore/URLRequestProxy/ProxyURLRequest.swift b/...elProviderMessaging/ProxyURLRequest.swift → ...ore/URLRequestProxy/ProxyURLRequest.swift
@@ -1,6 +1,6 @@
 //
 //  ProxyURLRequest.swift
-//  TunnelProviderMessaging
+//  PacketTunnelCore
 //
 //  Created by Sajad Vishkai on 2022-10-03.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.

diff --git a/...lProviderMessaging/ProxyURLResponse.swift → ...re/URLRequestProxy/ProxyURLResponse.swift b/...lProviderMessaging/ProxyURLResponse.swift → ...re/URLRequestProxy/ProxyURLResponse.swift
@@ -1,6 +1,6 @@
 //
 //  ProxyURLResponse.swift
-//  TunnelProviderMessaging
+//  PacketTunnelCore
 //
 //  Created by pronebird on 20/10/2022.
 //  Copyright © 2022 Mullvad VPN AB. All rights reserved.

diff --git a/...elProviderMessaging/URLRequestProxy.swift → ...ore/URLRequestProxy/URLRequestProxy.swift b/...elProviderMessaging/URLRequestProxy.swift → ...ore/URLRequestProxy/URLRequestProxy.swift
@@ -1,6 +1,6 @@
 //
 //  URLRequestProxy.swift
-//  PacketTunnel
+//  PacketTunnelCore
 //
 //  Created by pronebird on 03/02/2023.
 //  Copyright © 2023 Mullvad VPN AB. All rights reserved.

diff --git a/ios/RelaySelector/RelaySelector.swift b/ios/RelaySelector/RelaySelector.swift
@@ -280,15 +280,6 @@ public struct RelaySelectorResult: Codable {
     public var endpoint: MullvadEndpoint
     public var relay: REST.ServerRelay
     public var location: Location
-
-    public var packetTunnelRelay: PacketTunnelRelay {
-        PacketTunnelRelay(
-            ipv4Relay: endpoint.ipv4Relay,
-            ipv6Relay: endpoint.ipv6Relay,
-            hostname: relay.hostname,
-            location: location
-        )
-    }
 }
 
 protocol AnyRelay {