Added a simplified iOS framework project. Will replace old project

integrations/OSX/zt_api_example/ZT_API_OSX_EXAMPLE.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		7C61A51E1CEA4D90007C8521 /* ZeroTierNetcon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C61A5171CEA4D16007C8521 /* ZeroTierNetcon.framework */; };
 		7C61A51F1CEA4D90007C8521 /* ZeroTierNetcon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C61A5171CEA4D16007C8521 /* ZeroTierNetcon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		7C96E6871CEA603D003376E9 /* NetconWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C96E6851CEA603D003376E9 /* NetconWrapper.cpp */; };
+		7CAA2ADB1D11E30D00DB5872 /* SDK_ServiceSetup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA2AD81D11E30D00DB5872 /* SDK_ServiceSetup.cpp */; };
 		7CE621FD1CEA4B8E000AB143 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CE621FC1CEA4B8E000AB143 /* AppDelegate.swift */; };
 		7CE621FF1CEA4B8E000AB143 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CE621FE1CEA4B8E000AB143 /* ViewController.swift */; };
 		7CE622011CEA4B8E000AB143 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7CE622001CEA4B8E000AB143 /* Assets.xcassets */; };
@@ -89,8 +90,9 @@
 		7C96E67F1CEA603C003376E9 /* ZT_API_OSX_EXAMPLE-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ZT_API_OSX_EXAMPLE-Bridging-Header.h"; sourceTree = "<group>"; };
 		7C96E6851CEA603D003376E9 /* NetconWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetconWrapper.cpp; path = "../../../iOS/Netcon-iOS/NetconWrapper.cpp"; sourceTree = "<group>"; };
 		7C96E6861CEA603D003376E9 /* NetconWrapper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = NetconWrapper.hpp; path = "../../../iOS/Netcon-iOS/NetconWrapper.hpp"; sourceTree = "<group>"; };
-		7C96E68E1CEA6481003376E9 /* signatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = signatures.h; path = ../../../signatures.h; sourceTree = "<group>"; };
+		7CAA2AD81D11E30D00DB5872 /* SDK_ServiceSetup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SDK_ServiceSetup.cpp; path = ../../../../src/SDK_ServiceSetup.cpp; sourceTree = "<group>"; };
-		7C96E68F1CEA64F7003376E9 /* NetconServiceSetup.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = NetconServiceSetup.hpp; path = ../../../NetconServiceSetup.hpp; sourceTree = "<group>"; };
+		7CAA2AD91D11E30D00DB5872 /* SDK_ServiceSetup.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_ServiceSetup.hpp; path = ../../../../src/SDK_ServiceSetup.hpp; sourceTree = "<group>"; };
+		7CAA2ADA1D11E30D00DB5872 /* SDK_Signatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDK_Signatures.h; path = ../../../../src/SDK_Signatures.h; sourceTree = "<group>"; };
 		7CE621F91CEA4B8E000AB143 /* ZT_API_OSX_EXAMPLE.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ZT_API_OSX_EXAMPLE.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7CE621FC1CEA4B8E000AB143 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7CE621FE1CEA4B8E000AB143 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -146,8 +148,9 @@
 		7CE621FB1CEA4B8E000AB143 /* ZT_API_OSX_EXAMPLE */ = {
 			isa = PBXGroup;
 			children = (
-				7C96E68F1CEA64F7003376E9 /* NetconServiceSetup.hpp */,
+				7CAA2AD81D11E30D00DB5872 /* SDK_ServiceSetup.cpp */,
-				7C96E68E1CEA6481003376E9 /* signatures.h */,
+				7CAA2AD91D11E30D00DB5872 /* SDK_ServiceSetup.hpp */,
+				7CAA2ADA1D11E30D00DB5872 /* SDK_Signatures.h */,
 				7C96E6851CEA603D003376E9 /* NetconWrapper.cpp */,
 				7C96E6861CEA603D003376E9 /* NetconWrapper.hpp */,
 				7CE621FC1CEA4B8E000AB143 /* AppDelegate.swift */,
@@ -283,6 +286,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7CAA2ADB1D11E30D00DB5872 /* SDK_ServiceSetup.cpp in Sources */,
 				7CE621FF1CEA4B8E000AB143 /* ViewController.swift in Sources */,
 				7C96E6871CEA603D003376E9 /* NetconWrapper.cpp in Sources */,
 				7CE621FD1CEA4B8E000AB143 /* AppDelegate.swift in Sources */,

integrations/iOS/Netcon-iOS/NetconWrapper.cpp

@@ -6,15 +6,15 @@
 //  Copyright © 2016 ZeroTier. All rights reserved.
 //
 
-#include "Netcon.h"
+#include "SDK.h"
 #include "NetconWrapper.hpp"
-#include "signatures.h"
+#include "SDK_Signatures.h"
 #include <sys/socket.h>
 
 #define INTERCEPT_ENABLED   111
 #define INTERCEPT_DISABLED  222
 
-#include "NetconServiceSetup.hpp"
+#include "SDK_ServiceSetup.hpp"
 
 // Starts a service at the specified path
 extern "C" int start_service(const char * path) {

integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:ZeroTierSDK_iOS.xcodeproj">
+   </FileRef>
+</Workspace>

integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/ZeroTierSDK_iOS.xcscheme

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7C936A331D11EBEA00470058"
+               BuildableName = "ZeroTierSDK_iOS.framework"
+               BlueprintName = "ZeroTierSDK_iOS"
+               ReferencedContainer = "container:ZeroTierSDK_iOS.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C936A331D11EBEA00470058"
+            BuildableName = "ZeroTierSDK_iOS.framework"
+            BlueprintName = "ZeroTierSDK_iOS"
+            ReferencedContainer = "container:ZeroTierSDK_iOS.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C936A331D11EBEA00470058"
+            BuildableName = "ZeroTierSDK_iOS.framework"
+            BlueprintName = "ZeroTierSDK_iOS"
+            ReferencedContainer = "container:ZeroTierSDK_iOS.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,22 @@
+<?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>ZeroTierSDK_iOS.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>7C936A331D11EBEA00470058</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS/Info.plist

@@ -0,0 +1,26 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS/ZeroTierSDK_iOS.h

@@ -0,0 +1,19 @@
+//
+//  ZeroTierSDK_iOS.h
+//  ZeroTierSDK_iOS
+//
+//  Created by Joseph Henry on 6/15/16.
+//  Copyright © 2016 ZeroTier Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for ZeroTierSDK_iOS.
+FOUNDATION_EXPORT double ZeroTierSDK_iOSVersionNumber;
+
+//! Project version string for ZeroTierSDK_iOS.
+FOUNDATION_EXPORT const unsigned char ZeroTierSDK_iOSVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <ZeroTierSDK_iOS/PublicHeader.h>
+
+