refactor: separate network extension sources for different protocols and platforms

client/ios/networkextension/CMakeLists.txt

@@ -73,11 +73,9 @@ set_target_properties(networkextension PROPERTIES
     XCODE_ATTRIBUTE_SWIFT_PRECOMPILE_BRIDGING_HEADER "NO"
 )
 
-if(NOT AMNEZIA_IOS_APPLETV)
-    set_target_properties(networkextension PROPERTIES
-        XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/WireGuardNetworkExtension-Bridging-Header.h"
-    )
-endif()
+set_target_properties(networkextension PROPERTIES
+    XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/WireGuardNetworkExtension-Bridging-Header.h"
+)
 
 set_target_properties("networkextension" PROPERTIES
     XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
@@ -89,6 +87,8 @@ find_library(FW_LIBRESOLV libresolv.9.tbd)
 if(NOT AMNEZIA_IOS_APPLETV)
     target_link_libraries(networkextension PRIVATE ${FW_UI_KIT})
     target_link_libraries(networkextension PRIVATE ${FW_LIBRESOLV})
+else()
+    target_link_libraries(networkextension PRIVATE -lresolv)
 endif()
 
 target_compile_options(networkextension PRIVATE -DGROUP_ID=\"${BUILD_IOS_GROUP_IDENTIFIER}\")
@@ -103,7 +103,7 @@ set(NE_COMMON_SOURCES
     ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider.swift
 )
 
-set(NE_FULL_BACKEND_SOURCES
+set(NE_WIREGUARD_SOURCES
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/WireGuardAdapter.swift
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/PacketTunnelSettingsGenerator.swift
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/DNSResolver.swift
@@ -123,19 +123,44 @@ set(NE_FULL_BACKEND_SOURCES
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/Array+ConcurrentMap.swift
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/IPAddress+AddrInfo.swift
     ${WG_APPLE_SOURCE_DIR}/WireGuardKit/PrivateKey.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/HevSocksTunnel.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+WireGuard.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+OpenVPN.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+Xray.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/WGConfig.swift
+)
+
+set(NE_XRAY_SOURCES
+    ${CLIENT_ROOT_DIR}/platforms/ios/HevSocksTunnel.swift
+    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+Xray.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/XrayConfig.swift
+)
+
+set(NE_OPENVPN_SOURCES
+    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+OpenVPN.swift
+)
+
+set(NE_APPLE_GLUE_SOURCES
     ${CLIENT_ROOT_DIR}/platforms/ios/iosglue.mm
 )
 
+if(AMNEZIA_IOS_APPLETV)
+    list(APPEND NE_APPLE_GLUE_SOURCES
+        ${CLIENT_ROOT_DIR}/platforms/ios/tvos_cgo_stubs.c
+    )
+endif()
+
 target_sources(networkextension PRIVATE ${NE_COMMON_SOURCES})
 
 if(NOT AMNEZIA_IOS_APPLETV)
-    target_sources(networkextension PRIVATE ${NE_FULL_BACKEND_SOURCES})
+    target_sources(networkextension PRIVATE
+        ${NE_WIREGUARD_SOURCES}
+        ${NE_OPENVPN_SOURCES}
+        ${NE_XRAY_SOURCES}
+        ${NE_APPLE_GLUE_SOURCES}
+    )
+else()
+    target_sources(networkextension PRIVATE
+        ${NE_WIREGUARD_SOURCES}
+        ${NE_APPLE_GLUE_SOURCES}
+    )
 endif()
 
 target_sources(networkextension PRIVATE

client/platforms/ios/PacketTunnelProvider.swift

@@ -39,8 +39,8 @@ struct Constants {
 }
 
 class PacketTunnelProvider: NEPacketTunnelProvider {
-#if !os(tvOS)
     var wgAdapter: WireGuardAdapter?
+#if !os(tvOS)
     var ovpnAdapter: OpenVPNAdapter?
     private lazy var openVPNPacketFlowAdapter = PacketTunnelFlowAdapter(flow: packetFlow)
 #endif
@@ -138,15 +138,11 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
   override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
       if messageData.count == 1 && messageData[0] == 0 {
           guard let completionHandler else { return }
-#if !os(tvOS)
           if protoType == .wireguard {
               handleWireguardAppMessage(messageData, completionHandler: completionHandler)
           } else {
               completionHandler(nil)
           }
-#else
-          completionHandler(nil)
-#endif
           return
       }
 
@@ -160,12 +156,10 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
       neLog(.info, title: "App said: ", message: message)
 
       guard let message = try? JSONSerialization.jsonObject(with: messageData, options: []) as? [String: Any] else {
-#if !os(tvOS)
           if protoType == .wireguard {
               handleWireguardAppMessage(messageData, completionHandler: completionHandler)
               return
           }
-#endif
           neLog(.error, message: "Failed to serialize message from app")
           return
       }
@@ -190,9 +184,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
     override func startTunnel(options: [String : NSObject]? = nil,
                               completionHandler: @escaping ((any Error)?) -> Void) {
         let activationAttemptId = options?[Constants.kActivationAttemptId] as? String
-#if !os(tvOS)
         let errorNotifier = ErrorNotifier(activationAttemptId: activationAttemptId)
-#endif
 
         neLog(.info, message: "Start tunnel")
 
@@ -218,15 +210,9 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
 
         switch protoType {
         case .wireguard:
-#if os(tvOS)
-            completionHandler(NSError(domain: "org.amnezia.ne",
-                                      code: -1001,
-                                      userInfo: [NSLocalizedDescriptionKey: "WireGuard backend is not available for tvOS in this build"]))
-#else
             startWireguard(activationAttemptId: activationAttemptId,
                            errorNotifier: errorNotifier,
                            completionHandler: completionHandler)
-#endif
         case .openvpn:
 #if os(tvOS)
             completionHandler(NSError(domain: "org.amnezia.ne",
@@ -256,12 +242,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
 
         switch protoType {
         case .wireguard:
-#if os(tvOS)
-            completionHandler()
-#else
             stopWireguard(with: reason,
                           completionHandler: completionHandler)
-#endif
         case .openvpn:
 #if os(tvOS)
             completionHandler()
@@ -286,11 +268,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
 
         switch protoType {
         case .wireguard:
-#if !os(tvOS)
             handleWireguardStatusMessage(messageData, completionHandler: completionHandler)
-#else
-            completionHandler?(nil)
-#endif
         case .openvpn:
 #if !os(tvOS)
             handleOpenVPNStatusMessage(messageData, completionHandler: completionHandler)
@@ -364,7 +342,6 @@ private extension PacketTunnelProvider {
     }
 }
 
-#if !os(tvOS)
 extension WireGuardLogLevel {
     var osLogLevel: OSLogType {
         switch self {
@@ -376,6 +353,7 @@ extension WireGuardLogLevel {
     }
 }
 
+#if !os(tvOS)
 final class PacketTunnelFlowAdapter: NSObject, OpenVPNAdapterPacketFlow {
   private let flow: NEPacketTunnelFlow