build success for ios

amnezia-vpn · Dec 11, 2024 · c0b17b2 · c0b17b2
1 parent c129cce
commit c0b17b2
Show file tree

Hide file tree

Showing 14 changed files with 1,037 additions and 867 deletions.
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
@@ -135,9 +135,9 @@ void AmneziaApplication::init()
         emit m_settingsController->importBackupFromOutside(filePath);
     });
 
-    QTimer::singleShot(0, this, [this]() { AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); });
+    QTimer::singleShot(0, this, [this]() { DefaultVPN::toggleScreenshots(m_settings->isScreenshotsEnabled()); });
 
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) { AmneziaVPN::toggleScreenshots(enabled); });
+    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) { DefaultVPN::toggleScreenshots(enabled); });
 #endif
 
 #ifndef Q_OS_ANDROID

diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt
@@ -121,4 +121,4 @@ target_include_directories(networkextension PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/ios/arm64/libwg-go.a)
 
-target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework)
+target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework)
diff --git a/client/platforms/ios/HevSocksTunnel.swift b/client/platforms/ios/HevSocksTunnel.swift
@@ -1,13 +1,15 @@
 import HevSocks5Tunnel
+import Darwin
+import Darwin.POSIX.sys.socket
+import Darwin.POSIX.ifaddrs
+import Darwin.POSIX.ioctl
 
 public enum Socks5Tunnel {
 
     private static var tunnelFileDescriptor: Int32? {
         var ctlInfo = ctl_info()
-        withUnsafeMutablePointer(to: &ctlInfo.ctl_name) {
-            $0.withMemoryRebound(to: CChar.self, capacity: MemoryLayout.size(ofValue: $0.pointee)) {
-                _ = strcpy($0, "com.apple.net.utun_control")
-            }
+        "com.apple.net.utun_control".utf8CString.withUnsafeBytes { bytes in
+            memcpy(&ctlInfo.ctl_name, bytes.baseAddress, bytes.count)
         }
         for fd: Int32 in 0...1024 {
             var addr = sockaddr_ctl()

diff --git a/client/translations/amneziavpn_ar_EG.ts b/client/translations/amneziavpn_ar_EG.ts
diff --git a/client/translations/amneziavpn_fa_IR.ts b/client/translations/amneziavpn_fa_IR.ts
diff --git a/client/translations/amneziavpn_hi_IN.ts b/client/translations/amneziavpn_hi_IN.ts
diff --git a/client/translations/amneziavpn_my_MM.ts b/client/translations/amneziavpn_my_MM.ts
diff --git a/client/translations/amneziavpn_ru_RU.ts b/client/translations/amneziavpn_ru_RU.ts
diff --git a/client/translations/amneziavpn_uk_UA.ts b/client/translations/amneziavpn_uk_UA.ts
diff --git a/client/translations/amneziavpn_ur_PK.ts b/client/translations/amneziavpn_ur_PK.ts
diff --git a/client/translations/amneziavpn_zh_CN.ts b/client/translations/amneziavpn_zh_CN.ts
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
@@ -77,7 +77,7 @@ void SettingsController::toggleLogging(bool enable)
 {
     m_settings->setSaveLogs(enable);
 #ifdef Q_OS_IOS
-    AmneziaVPN::toggleLogging(enable);
+    DefaultVPN::toggleLogging(enable);
 #endif
     if (enable == true) {
         qInfo().noquote() << QString("Logging has enabled on %1 version %2 %3").arg(APPLICATION_NAME, APP_VERSION, GIT_COMMIT_HASH);
@@ -174,7 +174,7 @@ void SettingsController::clearSettings()
     emit changeSettingsFinished(tr("All settings have been reset to default values"));
 
 #ifdef Q_OS_IOS
-    AmneziaVPN::clearSettings();
+    DefaultVPN::clearSettings();
 #endif
 }
 

diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
@@ -745,7 +745,7 @@ void ServersModel::removeApiConfig(const int serverIndex)
                                .arg(serverConfig[config_key::hostName].toString())
                                .arg(serverConfig[config_key::vpnproto].toString());
 
-    AmneziaVPN::removeVPNC(vpncName.toStdString());
+    DefaultVPN::removeVPNC(vpncName.toStdString());
 #endif
 
     serverConfig.remove(config_key::dns1);

diff --git a/common/logger/logger.cpp b/common/logger/logger.cpp
@@ -151,7 +151,7 @@ QString Logger::getLogFile()
     QString qtLog = file.readAll();
 
 #ifdef Q_OS_IOS
-    return QString().fromStdString(AmneziaVPN::swiftUpdateLogData(qtLog.toStdString()));
+    return QString().fromStdString(DefaultVPN::swiftUpdateLogData(qtLog.toStdString()));
 #else
     return qtLog;
 #endif
@@ -166,7 +166,7 @@ QString Logger::getServiceLogFile()
     QString qtLog = file.readAll();
 
 #ifdef Q_OS_IOS
-    return QString().fromStdString(AmneziaVPN::swiftUpdateLogData(qtLog.toStdString()));
+    return QString().fromStdString(DefaultVPN::swiftUpdateLogData(qtLog.toStdString()));
 #else
     return qtLog;
 #endif
@@ -197,7 +197,7 @@ void Logger::clearLogs(bool isServiceLogger)
     file.close();
 
 #ifdef Q_OS_IOS
-    AmneziaVPN::swiftDeleteLog();
+    DefaultVPN::swiftDeleteLog();
 #endif
 
     if (isLogActive) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -121,4 +121,4 @@ target_include_directories(networkextension PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

		target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/wireguard/ios/arm64/libwg-go.a)

		target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework)
		target_link_libraries(networkextension PRIVATE ${CLIENT_ROOT_DIR}/3rd-prebuilt/3rd-prebuilt/xray/HevSocks5Tunnel.xcframework)