Merge branch 'move-transportstrategy-into-mullvadtransport-ios-28'

Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 resolver = "2"
 members = [
     "android/translations-converter",
-    "ios/MullvadTransport/shadowsocks-proxy",
+    "ios/MullvadREST/Transport/Shadowsocks/shadowsocks-proxy",
     "ios/TunnelObfuscation/tunnel-obfuscator-proxy",
     "mullvad-daemon",
     "mullvad-cli",

ios/RelayCache/CachedRelays.swift → ios/MullvadREST/Relay/CachedRelays.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MullvadREST
 
 /// A struct that represents the relay cache on disk
 public struct CachedRelays: Codable, Equatable {

ios/RelayCache/RelayCache.swift → ios/MullvadREST/Relay/RelayCache.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MullvadREST
 import MullvadTypes
 
 public protocol RelayCacheProtocol {

ios/RelaySelector/RelaySelector.swift → ios/MullvadREST/Relay/RelaySelector.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MullvadREST
 import MullvadTypes
 
 private let defaultPort: UInt16 = 53

ios/MullvadREST/ExponentialBackoff.swift → ios/MullvadREST/RetryStrategy/ExponentialBackoff.swift

@@ -32,22 +32,3 @@ struct ExponentialBackoff: IteratorProtocol {
         return next
     }
 }
-
-struct Jittered<InnerIterator: IteratorProtocol>: IteratorProtocol
-    where InnerIterator.Element == Duration {
-    private var inner: InnerIterator
-
-    init(_ inner: InnerIterator) {
-        self.inner = inner
-    }
-
-    mutating func next() -> Duration? {
-        guard let interval = inner.next() else { return nil }
-
-        let jitter = Double.random(in: 0.0 ... 1.0)
-        let millis = interval.milliseconds
-        let millisWithJitter = millis.saturatingAddition(Int(Double(millis) * jitter))
-
-        return .milliseconds(millisWithJitter)
-    }
-}

ios/MullvadREST/RetryStrategy/Jittered.swift

@@ -0,0 +1,29 @@
+//
+//  Jittered.swift
+//  MullvadREST
+//
+//  Created by Mojgan on 2023-12-08.
+//  Copyright © 2023 Mullvad VPN AB. All rights reserved.
+//
+
+import Foundation
+import MullvadTypes
+
+struct Jittered<InnerIterator: IteratorProtocol>: IteratorProtocol
+    where InnerIterator.Element == Duration {
+    private var inner: InnerIterator
+
+    init(_ inner: InnerIterator) {
+        self.inner = inner
+    }
+
+    mutating func next() -> Duration? {
+        guard let interval = inner.next() else { return nil }
+
+        let jitter = Double.random(in: 0.0 ... 1.0)
+        let millis = interval.milliseconds
+        let millisWithJitter = millis.saturatingAddition(Int(Double(millis) * jitter))
+
+        return .milliseconds(millisWithJitter)
+    }
+}

ios/MullvadREST/RESTRetryStrategy.swift → ios/MullvadREST/RetryStrategy/RetryStrategy.swift

@@ -1,5 +1,5 @@
 //
-//  RESTRetryStrategy.swift
+//  RetryStrategy.swift
 //  MullvadREST
 //
 //  Created by pronebird on 09/12/2021.

ios/MullvadTransport/URLSessionTransport.swift → ios/MullvadREST/Transport/Direct/URLSessionTransport.swift

@@ -2,12 +2,11 @@
 //  URLSessionTransport.swift
 //  MullvadREST
 //
-//  Created by Sajad Vishkai on 2022-10-03.
-//  Copyright © 2022 Mullvad VPN AB. All rights reserved.
+//  Created by Mojgan on 2023-12-08.
+//  Copyright © 2023 Mullvad VPN AB. All rights reserved.
 //
 
 import Foundation
-import MullvadREST
 import MullvadTypes
 
 extension URLSessionTask: Cancellable {}
@@ -18,6 +17,7 @@ public final class URLSessionTransport: RESTTransport {
     }
 
     public let urlSession: URLSession
+
     public init(urlSession: URLSession) {
         self.urlSession = urlSession
     }

ios/MullvadTransport/ShadowsocksConfigurationCache.swift → ios/MullvadREST/Transport/Shadowsocks/ShadowsocksConfigurationCache.swift

@@ -21,7 +21,7 @@ public final class ShadowsocksConfigurationCache {
         )
     }
 
-    /// Returns configration from memory cache if available, otherwise attempts to load it from disk cache before
+    /// Returns configuration from memory cache if available, otherwise attempts to load it from disk cache before
     /// returning.
     public func read() throws -> ShadowsocksConfiguration {
         configurationLock.lock()

ios/MullvadTransport/URLSessionShadowsocksTransport.swift → ios/MullvadREST/Transport/Shadowsocks/ShadowsocksTransport.swift

@@ -7,10 +7,9 @@
 //
 
 import Foundation
-import MullvadREST
 import MullvadTypes
 
-public final class URLSessionShadowsocksTransport: RESTTransport {
+public final class ShadowsocksTransport: RESTTransport {
     /// The Shadowsocks proxy instance that proxies all the traffic it receives
     private let shadowsocksProxy: ShadowsocksProxy
 
@@ -26,7 +25,7 @@ public final class URLSessionShadowsocksTransport: RESTTransport {
 
     public init(
         urlSession: URLSession,
-        shadowsocksConfiguration: ShadowsocksConfiguration,
+        configuration: ShadowsocksConfiguration,
         addressCache: REST.AddressCache
     ) {
         self.urlSession = urlSession
@@ -35,10 +34,10 @@ public final class URLSessionShadowsocksTransport: RESTTransport {
         shadowsocksProxy = ShadowsocksProxy(
             forwardAddress: apiAddress.ip,
             forwardPort: apiAddress.port,
-            bridgeAddress: shadowsocksConfiguration.bridgeAddress,
-            bridgePort: shadowsocksConfiguration.bridgePort,
-            password: shadowsocksConfiguration.password,
-            cipher: shadowsocksConfiguration.cipher
+            bridgeAddress: configuration.bridgeAddress,
+            bridgePort: configuration.bridgePort,
+            password: configuration.password,
+            cipher: configuration.cipher
         )
     }
 

ios/MullvadREST/Transport/Shadowsocks/shadowsocks.h

@@ -0,0 +1,36 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct ProxyHandle {
+  void *context;
+  uint16_t port;
+} ProxyHandle;
+
+/**
+ * # Safety
+ * `addr`, `password`, `cipher` must be valid for the lifetime of this function call and they must
+ * be backed by the amount of bytes as stored in the respective `*_len` parameters.
+ *
+ * `proxy_config` must be pointing to a valid memory region for the size of a `ProxyHandle`
+ * instance.
+ */
+int32_t start_shadowsocks_proxy(const uint8_t *forward_address,
+                                uintptr_t forward_address_len,
+                                uint16_t forward_port,
+                                const uint8_t *addr,
+                                uintptr_t addr_len,
+                                uint16_t port,
+                                const uint8_t *password,
+                                uintptr_t password_len,
+                                const uint8_t *cipher,
+                                uintptr_t cipher_len,
+                                struct ProxyHandle *proxy_config);
+
+/**
+ * # Safety
+ * `proxy_config` must be pointing to a valid instance of a `ProxyInstance`, as instantiated by
+ * `start_shadowsocks_proxy`.
+ */
+int32_t stop_shadowsocks_proxy(struct ProxyHandle *proxy_config);

ios/MullvadTransport/TransportProvider.swift → ios/MullvadREST/Transport/TransportProvider.swift

@@ -8,10 +8,7 @@
 
 import Foundation
 import Logging
-import MullvadREST
 import MullvadTypes
-import RelayCache
-import RelaySelector
 
 public final class TransportProvider: RESTTransportProvider {
     private let urlSessionTransport: URLSessionTransport
@@ -69,12 +66,11 @@ public final class TransportProvider: RESTTransportProvider {
             let shadowsocksConfiguration = try shadowsocksConfiguration()
 
             let shadowsocksURLSession = urlSessionTransport.urlSession
-            let shadowsocksTransport = URLSessionShadowsocksTransport(
+            let shadowsocksTransport = ShadowsocksTransport(
                 urlSession: shadowsocksURLSession,
-                shadowsocksConfiguration: shadowsocksConfiguration,
+                configuration: shadowsocksConfiguration,
                 addressCache: addressCache
             )
-
             return shadowsocksTransport
         } catch {
             logger.error(error: error, message: "Failed to produce shadowsocks configuration.")

ios/MullvadREST/RESTTransportStrategy.swift → ios/MullvadREST/Transport/TransportStrategy.swift

@@ -1,5 +1,5 @@
 //
-//  RESTTransportStrategy.swift
+//  TransportStrategy.swift
 //  MullvadREST
 //
 //  Created by Marco Nikic on 2023-04-27.