gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor ios/osx project updates

Browse Source
This commit is contained in:
Joseph Henry
2016-11-03 18:26:28 -07:00
parent 39e71baa40
commit 4662de273a
8 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/project.pbxproj
View File

@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
7C74DAD21D3C47D300A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; };
7C74DAD31D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; };
7C74DAD41D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7C74DAD01D3C472C00A6C0B9 /* ZeroTierSDK_OSX.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
7C7D529B1DBEAED300896C93 /* XcodeWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C7D52981DBEAED300896C93 /* XcodeWrapper.cpp */; };
@@ -53,7 +52,6 @@
buildActionMask = 2147483647;
files = (
7C74DAD31D3C485800A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */,
7C74DAD21D3C47D300A6C0B9 /* ZeroTierSDK_OSX.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};

12
integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@@ -26,11 +26,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Example_OSX_App/ViewController.swift"
timestampString = "490574990.533534"
timestampString = "499915440.501071"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "194"
endingLineNumber = "194"
startingLineNumber = "196"
endingLineNumber = "196"
landmarkName = "update_rx()"
landmarkType = "5">
</BreakpointContent>
@@ -58,11 +58,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Example_OSX_App/ViewController.swift"
timestampString = "490574990.533534"
timestampString = "499915440.501071"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "193"
endingLineNumber = "193"
startingLineNumber = "195"
endingLineNumber = "195"
landmarkName = "update_rx()"
landmarkType = "5">
</BreakpointContent>

5
integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift
View File

@@ -181,8 +181,10 @@ class ViewController: NSViewController {
{
sleep(1)
dispatch_async(dispatch_get_main_queue()) {
print("IPV4 = ", String.fromCString(self.zt.get_ipv4_address(self.txtNWID.stringValue)!)) // get IP address
var str_buf = [Int8](count: 16, repeatedValue: 0)
print("addr = ", String.fromCString(str_buf))
}
// TCP
if(selectedProtocol == SOCK_STREAM)
{
@@ -248,7 +250,6 @@ class ViewController: NSViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Set initial UI values for demo
txtAddr.stringValue = serverAddr
txtPort.intValue = serverPort