From 90ae7d7e327a04d67b831f62b8d08831cf7c27e0 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Mon, 11 Jul 2016 19:42:57 -0500 Subject: [PATCH] Android build fix --- .../android_jni_lib/java/jni/Android.mk | 2 + .../android_jni_lib/java/jni/Application.mk | 2 +- .../joseph/example_app/MainActivity.java | 3 - .../UserInterfaceState.xcuserstate | Bin 59174 -> 59138 bytes .../UserInterfaceState.xcuserstate | Bin 42940 -> 42664 bytes .../xcdebugger/Breakpoints_v2.xcbkptlist | 62 +++- .../Base.lproj/Main.storyboard | 116 ++----- .../Example_OSX_App/ViewController.swift | 87 ++++- .../Example_iOS_App.xcodeproj/project.pbxproj | 299 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../UserInterfaceState.xcuserstate | Bin 0 -> 15031 bytes .../xcschemes/Example_iOS_App.xcscheme | 91 ++++++ .../xcschemes/xcschememanagement.plist | 22 ++ .../Example_iOS_App/AppDelegate.swift | 46 +++ .../AppIcon.appiconset/Contents.json | 68 ++++ .../Base.lproj/LaunchScreen.storyboard | 27 ++ .../Base.lproj/Main.storyboard | 26 ++ .../Example_iOS_App/Info.plist | 47 +++ .../Example_iOS_App/ViewController.swift | 25 ++ src/SDK_ServiceSetup.cpp | 5 +- src/SDK_ServiceSetup.hpp | 2 +- 21 files changed, 831 insertions(+), 106 deletions(-) create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.pbxproj create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_iOS_App.xcscheme create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App/AppDelegate.swift create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/LaunchScreen.storyboard create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/Main.storyboard create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Info.plist create mode 100644 integrations/apple/example_app/Example_iOS_App/Example_iOS_App/ViewController.swift diff --git a/integrations/android/android_jni_lib/java/jni/Android.mk b/integrations/android/android_jni_lib/java/jni/Android.mk index 85d3943..8b5d5a7 100644 --- a/integrations/android/android_jni_lib/java/jni/Android.mk +++ b/integrations/android/android_jni_lib/java/jni/Android.mk @@ -22,6 +22,8 @@ LOCAL_LDLIBS := -llog LOCAL_SRC_FILES := \ $(ZTSDK)/SDK_RPC.c \ $(ZTSDK)/SDK_Proxy.cpp \ + $(ZTSDK)/SDK_Sockets.c \ + $(ZTSDK)/SDK_Debug.c \ $(ZTSDK)/SDK_ServiceSetup.cpp \ $(ZTSDK)/SDK_EthernetTap.cpp diff --git a/integrations/android/android_jni_lib/java/jni/Application.mk b/integrations/android/android_jni_lib/java/jni/Application.mk index 3da5d95..25bc603 100644 --- a/integrations/android/android_jni_lib/java/jni/Application.mk +++ b/integrations/android/android_jni_lib/java/jni/Application.mk @@ -1,6 +1,6 @@ NDK_TOOLCHAIN_VERSION := clang APP_STL := c++_static -APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DZT_SDK -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1 +APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DSDK -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1 APP_PLATFORM := android-14 # Architectures diff --git a/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java b/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java index 1b21212..996d011 100644 --- a/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java +++ b/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java @@ -29,8 +29,5 @@ public class MainActivity extends AppCompatActivity { SocketAddress proxyAddr = new InetSocketAddress("0.0.0.0", 1337); Proxy proxy = new Proxy(Proxy.Type.SOCKS, proxyAddr); - // proxy. - - } } \ No newline at end of file diff --git a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index d2a70537bc7147bbd139c57e2d7da655d11ad79f..711fd6a3aa22699f3c2ce07668cc67dcf3a20601 100644 GIT binary patch delta 2609 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 delta 2691 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 diff --git a/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index 40b22cdff5c7ae156d22c48ffd1165c0aab817f7..f1741d2f2a4ed27f518adc07e6a6a2f1f936a784 100644 GIT binary patch delta 16944 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 delta 17421 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 diff --git a/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index e888a96..f23cc86 100644 --- a/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,15 +10,47 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Example_OSX_App/ViewController.swift" - timestampString = "489532561.868006" + timestampString = "489623400.349295" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "79" - endingLineNumber = "79" + startingLineNumber = "78" + endingLineNumber = "78" landmarkName = "UI_Connect(_:)" landmarkType = "5"> + + + + + + + + + + + + diff --git a/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard b/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard index 30d14c9..0a9b861 100644 --- a/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard +++ b/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard @@ -798,20 +798,6 @@ - - - - - - - - - - - - - - @@ -823,45 +809,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -950,17 +898,15 @@ + - - - - - + + diff --git a/integrations/apple/example_app/Example_OSX_App/ViewController.swift b/integrations/apple/example_app/Example_OSX_App/ViewController.swift index f25075d..10b0d4c 100644 --- a/integrations/apple/example_app/Example_OSX_App/ViewController.swift +++ b/integrations/apple/example_app/Example_OSX_App/ViewController.swift @@ -20,15 +20,14 @@ class ViewController: NSViewController { @IBOutlet weak var btnConnect: NSButton! @IBOutlet weak var btnBind: NSButton! - @IBOutlet weak var txtTX: NSScrollView! - @IBOutlet weak var txtRX: NSScrollView! - - @IBOutlet weak var btnSend: NSButton! + @IBOutlet weak var txtTX: NSTextField! + @IBOutlet weak var txtRX: NSTextField! var serverPort:Int32 = 8080 var serverAddr:String = "10.147.18.5" var sock:Int32 = -1 + var accepted_sock:Int32 = -1 @IBAction func txtAddrChanged(sender: AnyObject) { if(sender.stringValue != nil) { @@ -119,6 +118,7 @@ class ViewController: NSViewController { inet_pton(AF_INET, serverAddr, &(addr.sin_addr)); let bind_err = zts_bind(sock, UnsafePointer([addr]), UInt32(addr.sin_len)) + print("bind_err = \(bind_err),\(errno)") if bind_err < 0 { @@ -126,6 +126,17 @@ class ViewController: NSViewController { print("Error binding IPv4 socket \(err)") return } + + // Put socket into listening state + zts_listen(sock, 1); + + // Accept connection + var len:socklen_t = 0; + var legIntPtr = withUnsafeMutablePointer(&len, { $0 }) + while(accepted_sock < 0) { + accepted_sock = zts_accept(sock, UnsafeMutablePointer([addr]), legIntPtr) + } + print("accepted connection") } // UDP @@ -135,23 +146,85 @@ class ViewController: NSViewController { } } - // Send data to a remote host + // TX + @IBOutlet weak var btnSend: NSButton! @IBAction func UI_SendData(sender: AnyObject) { // Use ordinary read/write calls on ZeroTier socket // TCP if(selectedProtocol == SOCK_STREAM) { - write(sock, "test", 4); + write(sock, txtTX.description, 4); } // UDP if(selectedProtocol == SOCK_DGRAM) { - + // sendto } } + // RX + @IBOutlet weak var btnReadData: NSButton! + @IBAction func UI_ReadData(sender: AnyObject) { + // Use ordinary read/write calls on ZeroTier socket + + // TCP + if(selectedProtocol == SOCK_STREAM) + { + var buffer = [UInt8](count: 100, repeatedValue: 0) + let str = "GET / HTTP/1.0\r\n\r\n" + //let str = "Welcome to the machine" + print("strlen = %d\n", str.characters.count) + let encodedDataArray = [UInt8](str.utf8) + +// read(accepted_sock, UnsafeMutablePointer([txtTX.stringValue]), 128); + read(accepted_sock, &buffer, 100); + print(buffer) + + } + // UDP + if(selectedProtocol == SOCK_DGRAM) + { + // recvfrom + } + } + func test_client_proxy_nsstream() + { + // For HTTP request + var buffer = [UInt8](count: 100, repeatedValue: 0) + let str = "GET / HTTP/1.0\r\n\r\n" + //let str = "Welcome to the machine" + print("strlen = %d\n", str.characters.count) + let encodedDataArray = [UInt8](str.utf8) + + var inputStream:NSInputStream? + var outputStream:NSOutputStream? + + // As usual, get our streams to our desired "local" address + NSStream.getStreamsToHostWithName(serverAddr, port: Int(serverPort), inputStream: &inputStream, outputStream: &outputStream) + + // SOCKS Proxy config dictionary + let myDict:NSDictionary = [NSStreamSOCKSProxyHostKey : "0.0.0.0", + NSStreamSOCKSProxyPortKey : 1337, + NSStreamSOCKSProxyVersionKey : NSStreamSOCKSProxyVersion5] + + // Give configuration to NSStreams + inputStream!.setProperty(myDict, forKey: NSStreamSOCKSProxyConfigurationKey) + outputStream!.setProperty(myDict, forKey: NSStreamSOCKSProxyConfigurationKey) + + inputStream!.open() + outputStream!.open() + + // TX + outputStream?.write(encodedDataArray, maxLength: encodedDataArray.count) + + // RX + //sleep(5) + //inputStream?.read(&buffer, maxLength: 100) + //print("buffer = \(buffer)\n") + } + var service_thread : NSThread! func ztnc_start_service() { let path = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.DocumentDirectory, NSSearchPathDomainMask.UserDomainMask, true) diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.pbxproj b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.pbxproj new file mode 100644 index 0000000..8a99381 --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.pbxproj @@ -0,0 +1,299 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 7C8BC03C1D3348A6001E1B6F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8BC03B1D3348A6001E1B6F /* AppDelegate.swift */; }; + 7C8BC03E1D3348A6001E1B6F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8BC03D1D3348A6001E1B6F /* ViewController.swift */; }; + 7C8BC0411D3348A6001E1B6F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7C8BC03F1D3348A6001E1B6F /* Main.storyboard */; }; + 7C8BC0431D3348A6001E1B6F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7C8BC0421D3348A6001E1B6F /* Assets.xcassets */; }; + 7C8BC0461D3348A6001E1B6F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7C8BC0441D3348A6001E1B6F /* LaunchScreen.storyboard */; }; + 7C8BC04E1D334911001E1B6F /* ZeroTierSDK_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C8BC04D1D334911001E1B6F /* ZeroTierSDK_iOS.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 7C8BC0381D3348A6001E1B6F /* Example_iOS_App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example_iOS_App.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 7C8BC03B1D3348A6001E1B6F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7C8BC03D1D3348A6001E1B6F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 7C8BC0401D3348A6001E1B6F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 7C8BC0421D3348A6001E1B6F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 7C8BC0451D3348A6001E1B6F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 7C8BC0471D3348A6001E1B6F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 7C8BC04D1D334911001E1B6F /* ZeroTierSDK_iOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZeroTierSDK_iOS.framework; path = "../../../../build/ios_app_framework/Debug-iphoneos/ZeroTierSDK_iOS.framework"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 7C8BC0351D3348A6001E1B6F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7C8BC04E1D334911001E1B6F /* ZeroTierSDK_iOS.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 7C8BC02F1D3348A6001E1B6F = { + isa = PBXGroup; + children = ( + 7C8BC04D1D334911001E1B6F /* ZeroTierSDK_iOS.framework */, + 7C8BC03A1D3348A6001E1B6F /* Example_iOS_App */, + 7C8BC0391D3348A6001E1B6F /* Products */, + ); + sourceTree = ""; + }; + 7C8BC0391D3348A6001E1B6F /* Products */ = { + isa = PBXGroup; + children = ( + 7C8BC0381D3348A6001E1B6F /* Example_iOS_App.app */, + ); + name = Products; + sourceTree = ""; + }; + 7C8BC03A1D3348A6001E1B6F /* Example_iOS_App */ = { + isa = PBXGroup; + children = ( + 7C8BC03B1D3348A6001E1B6F /* AppDelegate.swift */, + 7C8BC03D1D3348A6001E1B6F /* ViewController.swift */, + 7C8BC03F1D3348A6001E1B6F /* Main.storyboard */, + 7C8BC0421D3348A6001E1B6F /* Assets.xcassets */, + 7C8BC0441D3348A6001E1B6F /* LaunchScreen.storyboard */, + 7C8BC0471D3348A6001E1B6F /* Info.plist */, + ); + path = Example_iOS_App; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 7C8BC0371D3348A6001E1B6F /* Example_iOS_App */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7C8BC04A1D3348A6001E1B6F /* Build configuration list for PBXNativeTarget "Example_iOS_App" */; + buildPhases = ( + 7C8BC0341D3348A6001E1B6F /* Sources */, + 7C8BC0351D3348A6001E1B6F /* Frameworks */, + 7C8BC0361D3348A6001E1B6F /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Example_iOS_App; + productName = Example_iOS_App; + productReference = 7C8BC0381D3348A6001E1B6F /* Example_iOS_App.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 7C8BC0301D3348A6001E1B6F /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0730; + LastUpgradeCheck = 0730; + ORGANIZATIONNAME = "ZeroTier Inc."; + TargetAttributes = { + 7C8BC0371D3348A6001E1B6F = { + CreatedOnToolsVersion = 7.3; + }; + }; + }; + buildConfigurationList = 7C8BC0331D3348A6001E1B6F /* Build configuration list for PBXProject "Example_iOS_App" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 7C8BC02F1D3348A6001E1B6F; + productRefGroup = 7C8BC0391D3348A6001E1B6F /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 7C8BC0371D3348A6001E1B6F /* Example_iOS_App */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 7C8BC0361D3348A6001E1B6F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7C8BC0461D3348A6001E1B6F /* LaunchScreen.storyboard in Resources */, + 7C8BC0431D3348A6001E1B6F /* Assets.xcassets in Resources */, + 7C8BC0411D3348A6001E1B6F /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 7C8BC0341D3348A6001E1B6F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7C8BC03E1D3348A6001E1B6F /* ViewController.swift in Sources */, + 7C8BC03C1D3348A6001E1B6F /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 7C8BC03F1D3348A6001E1B6F /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 7C8BC0401D3348A6001E1B6F /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 7C8BC0441D3348A6001E1B6F /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 7C8BC0451D3348A6001E1B6F /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 7C8BC0481D3348A6001E1B6F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 7C8BC0491D3348A6001E1B6F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.3; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 7C8BC04B1D3348A6001E1B6F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = Example_iOS_App/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "zerotier.Example-iOS-App"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 7C8BC04C1D3348A6001E1B6F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + INFOPLIST_FILE = Example_iOS_App/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "zerotier.Example-iOS-App"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 7C8BC0331D3348A6001E1B6F /* Build configuration list for PBXProject "Example_iOS_App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7C8BC0481D3348A6001E1B6F /* Debug */, + 7C8BC0491D3348A6001E1B6F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 7C8BC04A1D3348A6001E1B6F /* Build configuration list for PBXNativeTarget "Example_iOS_App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7C8BC04B1D3348A6001E1B6F /* Debug */, + 7C8BC04C1D3348A6001E1B6F /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = 7C8BC0301D3348A6001E1B6F /* Project object */; +} diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..92c673d --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..f7b63f17b78f7ab2eb5f5d993802b9baa4769895 GIT binary patch literal 15031 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 literal 0 HcmV?d00001 diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_iOS_App.xcscheme b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_iOS_App.xcscheme new file mode 100644 index 0000000..f7c9333 --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/Example_iOS_App.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..ce178c4 --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + Example_iOS_App.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 7C8BC0371D3348A6001E1B6F + + primary + + + + + diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/AppDelegate.swift b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/AppDelegate.swift new file mode 100644 index 0000000..ef6f9cd --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/AppDelegate.swift @@ -0,0 +1,46 @@ +// +// AppDelegate.swift +// Example_iOS_App +// +// Created by Joseph Henry on 7/10/16. +// Copyright © 2016 ZeroTier Inc. All rights reserved. +// + +import UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + var window: UIWindow? + + + func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { + // Override point for customization after application launch. + return true + } + + func applicationWillResignActive(application: UIApplication) { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. + } + + func applicationDidEnterBackground(application: UIApplication) { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. + } + + func applicationWillEnterForeground(application: UIApplication) { + // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. + } + + func applicationDidBecomeActive(application: UIApplication) { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + } + + func applicationWillTerminate(application: UIApplication) { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. + } + + +} + diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Assets.xcassets/AppIcon.appiconset/Contents.json b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..36d2c80 --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/LaunchScreen.storyboard b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..2e721e1 --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/Main.storyboard b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/Main.storyboard new file mode 100644 index 0000000..32e3df7 --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Info.plist b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Info.plist new file mode 100644 index 0000000..40c6215 --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/Info.plist @@ -0,0 +1,47 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/ViewController.swift b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/ViewController.swift new file mode 100644 index 0000000..cea6934 --- /dev/null +++ b/integrations/apple/example_app/Example_iOS_App/Example_iOS_App/ViewController.swift @@ -0,0 +1,25 @@ +// +// ViewController.swift +// Example_iOS_App +// +// Created by Joseph Henry on 7/10/16. +// Copyright © 2016 ZeroTier Inc. All rights reserved. +// + +import UIKit + +class ViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view, typically from a nib. + } + + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } + + +} + diff --git a/src/SDK_ServiceSetup.cpp b/src/SDK_ServiceSetup.cpp index 1ea1ca4..e5149dc 100644 --- a/src/SDK_ServiceSetup.cpp +++ b/src/SDK_ServiceSetup.cpp @@ -47,7 +47,6 @@ #include "OSUtils.hpp" #include "SDK.h" -void zt_init_rpc(const char * path, const char * nwid); #include "SDK_Debug.h" #include "SDK_ServiceSetup.hpp" @@ -64,6 +63,8 @@ std::string netDir; extern "C" { #endif +void zt_init_rpc(const char * path, const char * nwid); + #if defined(__UNITY_3D__) // .NET Interop-friendly debug mechanism typedef void (*FuncPtr)( const char * ); @@ -134,7 +135,7 @@ extern "C" { // JNI naming convention: Java_PACKAGENAME_CLASSNAME_METHODNAME JNIEXPORT void JNICALL Java_ZeroTier_SDK_startOneService(JNIEnv *env, jobject thisObj, jstring path) { //char * path; - homeDir = (*env)->GetStringUTFChars(env, path, NULL); + homeDir = env->GetStringUTFChars(path, NULL); #else void *startOneService(void *thread_id) { #endif diff --git a/src/SDK_ServiceSetup.hpp b/src/SDK_ServiceSetup.hpp index 469bb26..493698b 100644 --- a/src/SDK_ServiceSetup.hpp +++ b/src/SDK_ServiceSetup.hpp @@ -50,7 +50,7 @@ extern std::string homeDir; /* If you define anything else in this file it that you wish to expose to your Android Java application you *must* follow that convention and any corresponding Java package/classes in your Android project must match this as well */ - JNIEXPORT void JNICALL Java_ZeroTier_SDK_startOneService(JNIEnv *env, jobject thisObj); + JNIEXPORT void JNICALL Java_ZeroTier_SDK_startOneService(JNIEnv *env, jobject thisObj, jstring path); #else void *startOneService(void *thread_id); void init_service(int key, const char * path);