diff --git a/integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index fdef991..d937bfd 100644 --- a/integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/integrations/apple/example_app/OSX/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -54,7 +54,7 @@ @@ -99,5 +99,21 @@ landmarkType = "7"> + + + + diff --git a/integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift b/integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift index d138153..31c6f3d 100644 --- a/integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift +++ b/integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift @@ -23,8 +23,8 @@ class ViewController: NSViewController { @IBOutlet weak var txtTX: NSTextField! @IBOutlet weak var txtRX: NSTextField! - var serverPort:Int32 = 8081 - var serverAddr:String = "10.9.9.203" + var serverPort:Int32 = 8080 + var serverAddr:String = "0.0.0.0" var sock:Int32 = -1 var accepted_sock:Int32 = -1 @@ -166,7 +166,6 @@ class ViewController: NSViewController { @IBOutlet weak var btnReadData: NSButton! @IBAction func UI_ReadData(sender: AnyObject) { // Use ordinary read/write calls on ZeroTier socket - // TCP if(selectedProtocol == SOCK_STREAM) { @@ -175,9 +174,7 @@ class ViewController: NSViewController { //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); + read(accepted_sock, &buffer, 4); print(buffer) } @@ -226,7 +223,6 @@ class ViewController: NSViewController { var service_thread : NSThread! func ztnc_start_service() { - // If you plan on using SOCKS Proxy, you don't need to initialize the RPC //start_service("/Users/Joseph/utest3") diff --git a/src/SDK_ServiceSetup.cpp b/src/SDK_ServiceSetup.cpp index cd85e13..79aaaf3 100644 --- a/src/SDK_ServiceSetup.cpp +++ b/src/SDK_ServiceSetup.cpp @@ -267,8 +267,10 @@ void zt_init_rpc(const char * path, const char * nwid); #endif //chdir(current_dir); // Return to previous current working directory (at the request of Unity3D) - Debug("Starting service...\n"); - + #if defined(__UNITY_3D__) + Debug("Starting service...\n"); + #endif + // Initialize RPC if(rpcEnabled) { zt_init_rpc(localHomeDir.c_str(), rpcNWID.c_str()); diff --git a/tests/tcp_client.c b/tests/tcp_client.c index 4e18c21..5c7abb3 100644 --- a/tests/tcp_client.c +++ b/tests/tcp_client.c @@ -34,13 +34,12 @@ int main(int argc , char *argv[]) } printf("connected\n"); - char *msg = "welcome to the machine!"; while(1) { printf("enter message : "); scanf("%s" , message); // TX - if(send(sock, msg, sizeof(msg), 0) < 0) { + if(send(sock, message, strlen(message), 0) < 0) { printf("send failed"); return 1; }