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

eth_hdr to pico_eth_hdr reference fix, doc updates, picoTCP build for xcode

Browse Source
This commit is contained in:
Joseph Henry
2016-12-06 16:42:47 -08:00
parent 307fbb5de9
commit 7090c8fe5b
22 changed files with 2192 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,6 +124,7 @@
TargetAttributes = {
7CFCB42C1D1AFEE800D3E66C = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0810;
};
};
};
@@ -286,6 +287,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/../../../../src/wrappers/swift/Apple-Bridging-Header.h";
"SWIFT_OBJC_BRIDGING_HEADER[arch=*]" = "$(PROJECT_DIR)/../../../../src/wrappers/swift/Apple-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -305,6 +307,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "zerotier.Example-OSX-App";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/../../../../src/wrappers/swift/Apple-Bridging-Header.h";
SWIFT_VERSION = 2.3;
};
name = Release;
};

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

@@ -95,7 +95,7 @@ class ViewController: NSViewController {
// Connect to remote host on ZeroTier virtual network
@IBAction func UI_Connect(sender: AnyObject) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), {
self.connect_thread = NSThread(target:self, selector:"attempt_connect", object:nil)
self.connect_thread = NSThread(target:self, selector:#selector(ViewController.attempt_connect), object:nil)
self.connect_thread.start()
});
}
@@ -134,7 +134,7 @@ class ViewController: NSViewController {
// Bind a ZeroTier socket
@IBAction func UI_Bind(sender: AnyObject) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), {
self.bind_thread = NSThread(target:self, selector:"attempt_bind", object:nil)
self.bind_thread = NSThread(target:self, selector:#selector(ViewController.attempt_bind), object:nil)
self.bind_thread.start()
});
}
@@ -181,7 +181,7 @@ class ViewController: NSViewController {
{
sleep(1)
dispatch_async(dispatch_get_main_queue()) {
var str_buf = [Int8](count: 16, repeatedValue: 0)
let str_buf = [Int8](count: 16, repeatedValue: 0)
print("addr = ", String.fromCString(str_buf))
}
@@ -261,7 +261,7 @@ class ViewController: NSViewController {
// Update UI on RX of data
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), {
self.rx_thread = NSThread(target:self, selector:"update_rx", object:nil)
self.rx_thread = NSThread(target:self, selector:#selector(ViewController.update_rx), object:nil)
self.rx_thread.start()
});
}