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

iox/osx adjustments

Browse Source
This commit is contained in:
Joseph Henry
2016-09-09 10:51:15 -07:00
parent 195c993a14
commit 88cdb93317
6 changed files with 58 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SDK_Apple-Bridging-Header.h
View File

@@ -22,7 +22,9 @@ bool zt_service_is_running();
void zt_join_network(const char *nwid);
void zt_leave_network(const char *nwid);
void zt_is_running(const char *nwid);
void zt_get_addresses(const char *nwid, char * addrstr);
void zt_get_ipv4_address(const char *nwid, char *addrstr);
void zt_get_ipv6_address(const char *nwid, char *addrstr);
// SOCKS5 PROXY CONTROLS
void zt_start_proxy_server(const char *nwid, struct sockaddr_storage addr);

8
src/SDK_XcodeWrapper.cpp
View File

@@ -61,8 +61,12 @@ extern "C" void zt_leave_network(const char *nwid) {
zts_leave_network(nwid);
}
// Returns a list of addresses associated with this device on the given network
extern "C" void zt_get_addresses(const char *nwid, char *addrstr) {
zts_get_addresses(nwid, addrstr);
extern "C" void zt_get_ipv4_address(const char *nwid, char *addrstr) {
zts_get_ipv4_address(nwid, addrstr);
}
// Returns a list of addresses associated with this device on the given network
extern "C" void zt_get_ipv6_address(const char *nwid, char *addrstr) {
zts_get_ipv6_address(nwid, addrstr);
}

28
src/ZTSDK.swift
View File

@@ -16,15 +16,13 @@ struct ZTAddress
var port: Int16
var data: sockaddr_in?
init(family: Int32, addr: String, port: Int16)
{
init(_ family: Int32, _ addr: String, _ port: Int16) {
self.family = family
self.addr = addr
self.port = port
}
func to_sockaddr_in() -> UnsafePointer<sockaddr>
{
func to_sockaddr_in() -> UnsafePointer<sockaddr> {
var data = sockaddr_in(sin_len: UInt8(sizeof(sockaddr_in)),
sin_family: UInt8(AF_INET),
sin_port: UInt16(port).bigEndian,
@@ -34,8 +32,7 @@ struct ZTAddress
return UnsafePointer<sockaddr>([data]);
}
func len() -> UInt8
{
func len() -> UInt8 {
return UInt8(sizeof(sockaddr_in))
}
}
@@ -46,8 +43,7 @@ struct ZTAddress
class ZTSDK : NSObject
{
var service_thread : NSThread!
private func ztnc_start_service(path: String?)
{
private func ztnc_start_service(path: String?) {
if(path == nil) {
zt_start_service(
NSSearchPathForDirectoriesInDomains(
@@ -58,9 +54,7 @@ class ZTSDK : NSObject
}
// Starts the ZeroTier background service
func start_service(path: String?)
{
func start_service(path: String?) {
let queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)
dispatch_async(queue) {
self.ztnc_start_service(path)
@@ -70,26 +64,22 @@ class ZTSDK : NSObject
}
// Stops the ZeroTier background service
func stop_service()
{
func stop_service() {
zt_stop_service();
}
// Returns whether the ZeroTier background service is running
func service_is_running() -> Bool
{
func service_is_running() -> Bool {
return zt_service_is_running();
}
// Joins a ZeroTier network
func join_network(nwid: String)
{
func join_network(nwid: String) {
zt_join_network(nwid);
}
// Leaves a ZeroTier network
func leave_network(nwid: String)
{
func leave_network(nwid: String) {
zt_leave_network(nwid);
}