Ios wireguard

.gitignore

@@ -24,7 +24,12 @@ ui_*.h
 Makefile*
 *build-*
 
+# fastlane
+client/fastlane/report.xml
+client/fastlane/build/*
+
 # Qt-es
+client/Release-iphoneos/
 client/Debug-iphoneos/
 client/.xcode/
 client/.qmake.cache
@@ -39,6 +44,7 @@ client/qrc_*.cpp
 client/ui_*.h
 client/ui_*.cpp
 client/Makefile*
+client/fastlane/build/
 client/*build-*
 client/AmneziaVPN.xcodeproj
 client/Debug-iphonesimulator/
@@ -48,7 +54,7 @@ client/qmlcache_loader.cpp
 client/rep_ipc_interface_replica.h
 client/resources_qmlcache.qrc
 client/3rd/OpenVPNAdpter/build/
-
+client/3rd/ShadowSocks/build/
 # QtCreator
 
 *.autosave

.gitmodules

@@ -10,6 +10,18 @@
 [submodule "client/3rd/OpenVPNAdapter"]
 	path = client/3rd/OpenVPNAdapter
 	url = https://github.com/ss-abramchuk/OpenVPNAdapter.git
+[submodule "client/3rd/ShadowPath"]
+	path = client/3rd/ShadowPath
+	url = https://github.com/qman9501/ShadowPath
+[submodule "client/3rd/outline-go-tun2socks"]
+	path = client/3rd/outline-go-tun2socks
+	url = https://github.com/Jigsaw-Code/outline-go-tun2socks.git
 [submodule "client/3rd/qzxing"]
 	path = client/3rd/qzxing
 	url = https://github.com/ftylitak/qzxing.git
+[submodule "client/3rd/CocoaAsyncSocket"]
+	path = client/3rd/CocoaAsyncSocket
+	url = https://github.com/robbiehanson/CocoaAsyncSocket.git
+[submodule "client/3rd/CocoaLumberjack"]
+	path = client/3rd/CocoaLumberjack
+	url = https://github.com/CocoaLumberjack/CocoaLumberjack.git

README.md

@@ -25,6 +25,14 @@ AmneziaVPN uses a number of open source projects to work:
 - [QtSsh](https://github.com/jaredtao/QtSsh) - forked form Qt Creator
 - and more...
 
+## Checking out the source code
+
+Make sure to pull all submodules after checking out the repo.
+
+```bash
+git submodule update --init
+```
+
 ## Development
 
 Want to contribute? Welcome!
@@ -34,6 +42,58 @@ Easiest way to build your own executables - is to fork project and configure [Tr
 Or you can build sources manually using Qt Creator. Qt >= 14.2 supported.  
 Look to the `build_macos.sh` and `build_windows.bat` scripts in `deploy` folder for details.
 
+### How to build iOS app from source code on MacOS
+
+1. First, make sure you have [XCode](https://developer.apple.com/xcode/) installed, 
+at least version 12 or higher.
+
+2. We use `qmake` to generate the XCode project and then we "patch" it to add
+extra components such as the wireguard, the browser bridge and so on. We patch
+the XCode project using [xcodeproj](https://github.com/CocoaPods/Xcodeproj). To
+install it:
+```bash
+gem install xcodeproj # probably you want to run this command with `sudo`
+```
+3. You also need to install go >= v1.16. If you don't have it done already,
+download go from the [official website](https://golang.org/dl/) or use Homebrew. 
+Latest version is recommended.
+
+4. Navigate inside client folder and generate the XCode project using our script:
+```bash
+cd client
+./scripts/apple_compile.sh ios
+```
+
+If you have more than one version of Qt installed, you'll most likely get
+a "`qmake` cannot be found in your `$PATH`" error. In this case run this script 
+using QT\IOS\_BIN env to set the path for the Qt5 macos build bin folder.
+For example, the path could look like this:
+```bash
+QT_IOS_BIN="/Users/username/Qt/5.15.2/ios/bin" ./scripts/apple_compile.sh ios
+```
+
+If you get `gomobile: command not found` make sure to set PATH to the location 
+of the bin folder where gomobile was installed. Usually, it's in `GOPATH`.
+```bash
+export PATH=$(PATH):/path/to/GOPATH/bin
+```
+
+5. Xcode should automatically open. You can then run/test/archive/ship the app.
+
+If build fails with the following error
+```
+make: *** 
+[$(PROJECTDIR)/client/build/AmneziaVPN.build/Debug-iphoneos/wireguard-go-bridge/goroot/.prepared] 
+Error 1
+```
+Add a user defined variable to both AmneziaVPN and WireGuardNetworkExtension targets' build settings with
+key `PATH` and value `${PATH}/path/to/bin/folder/with/go/executable`, e.g. `${PATH}:/usr/local/go/bin`.
+
+Build might fail with "source files not found" error the first time you try it, because modern XCode build system compiles
+dependencies in parallel, and some dependencies end up being built after the ones that
+require them. In this case simply restart the build.
+
+
 ## License
 GPL v.3
 

client/3rd/PacketProcessor/PacketProcessor.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

client/3rd/PacketProcessor/PacketProcessor.xcodeproj/xcuserdata/sanchez.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>PacketProcessor.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

client/3rd/PacketProcessor/PacketProcessor/CocoaAsyncSocket/CocoaAsyncSocket.framework/Headers/CocoaAsyncSocket.h

@@ -0,0 +1,18 @@
+//
+//  CocoaAsyncSocket.h
+//  CocoaAsyncSocket
+//
+//  Created by Derek Clarkson on 10/08/2015.
+//  CocoaAsyncSocket project is in the public domain.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for CocoaAsyncSocket.
+FOUNDATION_EXPORT double cocoaAsyncSocketVersionNumber;
+
+//! Project version string for CocoaAsyncSocket.
+FOUNDATION_EXPORT const unsigned char cocoaAsyncSocketVersionString[];
+
+#import <CocoaAsyncSocket/GCDAsyncSocket.h>
+#import <CocoaAsyncSocket/GCDAsyncUdpSocket.h>