diff --git a/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Modules b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Modules new file mode 120000 index 0000000..5736f31 --- /dev/null +++ b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Modules @@ -0,0 +1 @@ +Versions/Current/Modules \ No newline at end of file diff --git a/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Resources b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Resources new file mode 120000 index 0000000..953ee36 --- /dev/null +++ b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/A/Resources/Info.plist b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/A/Resources/Info.plist new file mode 100644 index 0000000..41ebcdc --- /dev/null +++ b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,46 @@ + + + + + BuildMachineOSBuild + 15F34 + CFBundleDevelopmentRegion + en + CFBundleExecutable + ZeroTierSDK_OSX + CFBundleIdentifier + zerotier.ZeroTierSDK-OSX + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ZeroTierSDK_OSX + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 1 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 7D175 + DTPlatformVersion + GM + DTSDKBuild + 15E60 + DTSDKName + macosx10.11 + DTXcode + 0730 + DTXcodeBuild + 7D175 + NSHumanReadableCopyright + Copyright © 2016 ZeroTier Inc. All rights reserved. + + diff --git a/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/A/_CodeSignature/CodeResources b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/A/_CodeSignature/CodeResources new file mode 100644 index 0000000..67cafc1 --- /dev/null +++ b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/A/_CodeSignature/CodeResources @@ -0,0 +1,122 @@ + + + + + files + + Resources/Info.plist + + K/BDIuWltnsAQ2lDkdc8UvZj1Qo= + + + files2 + + Resources/Info.plist + + hash + + K/BDIuWltnsAQ2lDkdc8UvZj1Qo= + + hash2 + + mUCBD6yhvUknsHAV8ejuSR3M/x/mERi1Ut2zlFmx9Zk= + + + + rules + + ^Resources/ + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^Resources/ + + weight + 20 + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/Current b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/Current new file mode 120000 index 0000000..8c7e5a6 --- /dev/null +++ b/build/osx_app_framework/Debug/ZeroTierSDK_OSX.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/build/osx_app_framework/README.md b/build/osx_app_framework/README.md new file mode 100644 index 0000000..55010ee --- /dev/null +++ b/build/osx_app_framework/README.md @@ -0,0 +1,114 @@ +OSX + ZeroTier SDK +==== + +Welcome! + +Imagine a flat, encrypted, no-configuration LAN for all of the instances of your OSX app. + +This short tutorial will show you how to enable ZeroTier functionality for your iOS app with little to no code modification. Check out our [ZeroTier SDK](https://www.zerotier.com/blog) page for more info on how the integration works and [Shim Techniques](https://www.zerotier.com/blog) for a discussion of shims available for your app/technology. + +In this example we aim to set up a minimal XCode project which contains all of the components necessary to enable ZeroTier for your app. If you'd rather skip all of these steps and grab the code, look in the [sdk/OSX](https://github.com/zerotier/ZeroTierSDK/tree/dev/sdk/iOS) folder of the source tree. Otherwise, let's get started! + +**Step 1: Add ZeroTier source and Netcon-iOS XCode project to yours** +- Place a copy of the ZeroTierOne source in a folder at the same level as your project +- Add `ZeroTierSDK/src/tests/iOS/Netcon-iOS.xcodeproj` to your project + +**Step 2: Add ZeroTier binaries to your app** +- Add `ZeroTierSDK.frameworkiOS` to *General->Embedded Binaries* +- Add `libServiceSetup.a` and `ZeroTierSDK.framework` to *Build Phases->Link Binary With Libraries* + +**Step 3: Configure your project** +- Add `$(SRCROOT)/../ZeroTierOne/src` to *Build Settings->Header Search Paths* for your project +- Add `-D__IOS__` to *Build Settings->Other C Flags* +- Add `zerotiersdk/tests/iOS/Netcon-iOS/NetconWrapper.cpp` and `zerotiersdk/tests/iOS/Netcon-iOS/NetconWrapper.hpp` to your project: +- Add contents of `ZeroTierOne/netcon/tests/iOS/Netcon-iOS/SDK-iOS-Bridging-Header.h` to your project’s bridging header. + +*Note: You should have been prompted to create a bridging header for your project, if you haven't make sure you do this and add the native function prototypes manually from the bridging header we provide.* + +**Step 4: App Code Modifications** + +After you've linked the two projects you need to find a place in your code to set up the ZeroTier service thread: + +``` +var service_thread : NSThread! +func ztnc_start_service() { + let path = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.DocumentDirectory, NSSearchPathDomainMask.UserDomainMask, true) + start_service(path[0]) +} +``` + +...and then start it. If you enabled the proxy service via `-DUSE_SOCKS_PROXY` it will start automatically and be reachable at `0.0.0.0:1337`: + +``` +dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), { + self.service_thread = NSThread(target:self, selector:"ztnc_start_service", object:nil) + self.service_thread.start() +}); +``` + +**Step 5: Pick an API** + +**Step 6: Join a network!** + - Simply call `zt_join_network("XXXXXXXXXXXXXXXX")` + +*** +## Linking into an application on Mac OSX + +Example: + + gcc myapp.c -o myapp libztintercept.so + export ZT_NC_NETWORK=/tmp/netcon-test-home/nc_8056c2e21c000001 + +Start service + + ./zerotier-netcon-service -d -p8000 /tmp/netcon-test-home + +Run application + + ./myapp + + + +## XCode Desktop App Integration + +*NOTE: a sample OSX desktop application with ZeroTier integrated can be found [here](../integrations/Apple/Example_OSX_App)* + +**Step 1: Build `ZeroTierSDK_OSX.framework`** + - From the main repo directory, `make osx_app_framework`. This will use the XCode commandline tools to build and copy the framework into `build`. + +**Step 2: Add `ZeroTierSDK_OSX.framework` to your project** + +**Step 3: Add its path to your *Build Settings -> Framework Search Paths***: + - For example: `$(PROJECT_DIR)/../../../build/OSX_app_framework/Release` + +**Step 4: Pick an [API](# API) to use** + +**Step 5: Join a network!** + - Simply call `zt_join_network("XXXXXXXXXXXXXXXX")` + +*** +## API + +This integration allows for the following shim combinations: +- `Hook of BSD-like sockets`: Use BSD-like sockets as you normally would. +- `Proxy of NSStream`: Create NSStream. Configure stream for SOCKS5 Proxy. Use stream. +- `Changeling of BSD-like sockets`: Call `start_changeling()` and then use BSD-like sockets as you normally would. +- `Direct Call`: Consult [SDK-iOS-Bridging-Header.h](netcon/iOS/Netcon-iOS/Netcon-iOS-Bridging-Header.h). + +If functional interposition isn't available for the API or library you've chosen to use, ZeroTier offers a SOCKS5 proxy server which can allow connectivity to your virtual network as long as your client API supports the SOCKS5 protocol. This proxy service will run alongside the tap service and can be turned on by compiling with the `-DUSE_SOCKS_PROXY` flag in *Build Settings->Other C Flags*. By default, the proxy service is available at `0.0.0.0:1337`. + + +#### NSStream and SOCKS Proxy + +As an example, here's how one would configure a NSStream object to redirect all network activity to the ZeroTier SOCKS proxy server: + +``` +// BEGIN proxy configuration +let myDict:NSDictionary = [NSStreamSOCKSProxyHostKey : "0.0.0.0", + NSStreamSOCKSProxyPortKey : 1337, + NSStreamSOCKSProxyVersionKey : NSStreamSOCKSProxyVersion5] + +inputStream!.setProperty(myDict, forKey: NSStreamSOCKSProxyConfigurationKey) +outputStream!.setProperty(myDict, forKey: NSStreamSOCKSProxyConfigurationKey) +// END proxy configuration +``` diff --git a/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index 39c8cf1..0956fbe 100644 Binary files a/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 1b3ff4f..e888a96 100644 --- a/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/integrations/apple/example_app/Example_OSX_App.xcodeproj/xcuserdata/Joseph.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,14 +10,30 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Example_OSX_App/ViewController.swift" - timestampString = "489521728.968073" + timestampString = "489532561.868006" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "74" - endingLineNumber = "74" + startingLineNumber = "79" + endingLineNumber = "79" landmarkName = "UI_Connect(_:)" landmarkType = "5"> + + + + diff --git a/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard b/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard index e5fe78e..30d14c9 100644 --- a/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard +++ b/integrations/apple/example_app/Example_OSX_App/Base.lproj/Main.storyboard @@ -760,7 +760,7 @@ - + @@ -771,7 +771,7 @@ - + @@ -877,7 +877,7 @@ - + @@ -953,14 +953,14 @@ - + - + - + - + diff --git a/integrations/apple/example_app/Example_OSX_App/ViewController.swift b/integrations/apple/example_app/Example_OSX_App/ViewController.swift index af0a4ed..f25075d 100644 --- a/integrations/apple/example_app/Example_OSX_App/ViewController.swift +++ b/integrations/apple/example_app/Example_OSX_App/ViewController.swift @@ -19,21 +19,25 @@ class ViewController: NSViewController { @IBOutlet weak var txtPort: NSTextField! @IBOutlet weak var btnConnect: NSButton! @IBOutlet weak var btnBind: NSButton! + @IBOutlet weak var txtTX: NSScrollView! @IBOutlet weak var txtRX: NSScrollView! + @IBOutlet weak var btnSend: NSButton! - var serverPort:Int32 = 4545 + var serverPort:Int32 = 8080 var serverAddr:String = "10.147.18.5" + var sock:Int32 = -1 + @IBAction func txtAddrChanged(sender: AnyObject) { - if(sender.value != nil) { - serverAddr = sender.value + if(sender.stringValue != nil) { + serverAddr = sender.stringValue } } @IBAction func txtPortChanged(sender: AnyObject) { - serverPort = sender.intValue! + serverPort = sender.intValue } // Join a ZeroTier network @@ -52,6 +56,7 @@ class ViewController: NSViewController { selectedShim = sender.intValue // 0 = BSD-style, 1 = SOCKS5 Proxy, etc } + // Select a protocol // Protocol { TCP / UDP } var selectedProtocol:Int32 = 0 @@ -59,21 +64,21 @@ class ViewController: NSViewController { switch sender.intValue { case 0: - print("Selected TCP (SOCK_STREAM)\n"); selectedProtocol = SOCK_STREAM case 1: - print("Selected UDP (SOCK_DGRAM)\n"); selectedProtocol = SOCK_DGRAM default: break; - } } + } + } // Connect to remote host on ZeroTier virtual network @IBAction func UI_Connect(sender: AnyObject) { + // TCP if(selectedProtocol == SOCK_STREAM) { - let sd = zts_socket(AF_INET, SOCK_STREAM, 0) + sock = zts_socket(AF_INET, SOCK_STREAM, 0) var addr = sockaddr_in(sin_len: UInt8(sizeof(sockaddr_in)), sin_family: UInt8(AF_INET), sin_port: UInt16(serverPort).bigEndian, @@ -82,10 +87,10 @@ class ViewController: NSViewController { inet_pton(AF_INET, serverAddr, &(addr.sin_addr)); - let connect_fd = zts_connect(sd, UnsafePointer([addr]), UInt32(addr.sin_len)) - print("connect_fd = \(connect_fd),\(errno)") + let connect_err = zts_connect(sock, UnsafePointer([addr]), UInt32(addr.sin_len)) + print("connect_err = \(connect_err),\(errno)") - if connect_fd < 0 { + if connect_err < 0 { let err = errno print("Error connecting IPv4 socket \(err)") return @@ -99,32 +104,52 @@ class ViewController: NSViewController { } } + // Bind a ZeroTier socket @IBAction func UI_Bind(sender: AnyObject) { - } - - @IBAction func UI_SendData(sender: AnyObject) { - - } - - /* - // Mode { Client / Server } - @IBOutlet weak var ModeControl: UISegmentedControl! - var selectedMode:UInt16 = 0 - @IBAction func ModeControlSelected(sender: AnyObject) { - switch sender.selectedSegmentIndex + // TCP + if(selectedProtocol == SOCK_STREAM) { - case 0: - print("Selected client\n"); - selectedMode = 0 - case 1: - print("Selected server\n"); - selectedMode = 1 - default: - break; + sock = zts_socket(AF_INET, SOCK_STREAM, 0) + var addr = sockaddr_in(sin_len: UInt8(sizeof(sockaddr_in)), + sin_family: UInt8(AF_INET), + sin_port: UInt16(serverPort).bigEndian, + sin_addr: in_addr(s_addr: 0), + sin_zero: (0,0,0,0,0,0,0,0)) + + inet_pton(AF_INET, serverAddr, &(addr.sin_addr)); + + let bind_err = zts_bind(sock, UnsafePointer([addr]), UInt32(addr.sin_len)) + print("bind_err = \(bind_err),\(errno)") + + if bind_err < 0 { + let err = errno + print("Error binding IPv4 socket \(err)") + return + } + } + + // UDP + if(selectedProtocol == SOCK_DGRAM) + { + + } + } + + // Send data to a remote host + @IBAction func UI_SendData(sender: AnyObject) { + // Use ordinary read/write calls on ZeroTier socket + + // TCP + if(selectedProtocol == SOCK_STREAM) + { + write(sock, "test", 4); + } + // UDP + if(selectedProtocol == SOCK_DGRAM) + { + } } - - */ var service_thread : NSThread! @@ -140,6 +165,10 @@ class ViewController: NSViewController { override func viewDidLoad() { super.viewDidLoad() + // Set initial UI values for demo + txtAddr.stringValue = serverAddr + txtPort.intValue = serverPort + // ZeroTier Service thread dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), { self.service_thread = NSThread(target:self, selector:"ztnc_start_service", object:nil) @@ -155,7 +184,5 @@ class ViewController: NSViewController { // Update the view, if already loaded. } } - - } diff --git a/tests/docker/_build_single_image.sh b/tests/docker/_build_single_image.sh index aa4b77d..be02571 100755 --- a/tests/docker/_build_single_image.sh +++ b/tests/docker/_build_single_image.sh @@ -8,7 +8,7 @@ touch "$test_name".name cp ../../*.conf . cp ../../zerotier-one zerotier-one cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-cli zerotier-netcon-service +cp ../../zerotier-cli zerotier-sdk-service cp ../../zerotier-intercept zerotier-intercept cp ../../libzerotierintercept.so libzerotierintercept.so cp ../../liblwip.so liblwip.so @@ -21,7 +21,7 @@ docker build --tag="$test_name" -f netcon_dockerfile . docker build --tag="$test_name"_monitor -f monitor_dockerfile . rm -f zerotier-cli -rm -f zerotier-netcon-service +rm -f zerotier-sdk-service rm -f zerotier-intercept rm -f *.so rm -f *.public diff --git a/tests/docker/build_zt.sh b/tests/docker/build_zt.sh index d36c407..e168c70 100755 --- a/tests/docker/build_zt.sh +++ b/tests/docker/build_zt.sh @@ -10,7 +10,7 @@ make netcon cd netcon/docker-test cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-netcon-service zerotier-netcon-service +cp ../../zerotier-sdk-service zerotier-sdk-service cp ../../libzerotierintercept.so libzerotierintercept.so cp ../liblwip.so liblwip.so diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile index 3c4a30d..be45428 100644 --- a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile +++ b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile @@ -26,7 +26,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh index 978696a..833388d 100644 --- a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh +++ b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh @@ -20,7 +20,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile index 6dd89cc..3bff6c3 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile +++ b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile @@ -26,7 +26,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh index 688bd63..5633dae 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh @@ -20,7 +20,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile index db700dd..5b66f98 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile +++ b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile @@ -27,7 +27,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh index 688bd63..5633dae 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh @@ -20,7 +20,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile index 99c2733..b12c62b 100644 --- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile +++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile @@ -26,7 +26,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh index d2ab248..6b92bfd 100644 --- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh @@ -21,7 +21,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile index c6e6ab3..f9ab870 100644 --- a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile +++ b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile @@ -29,7 +29,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh index b9b8ef7..fd21223 100644 --- a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh @@ -21,7 +21,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile index 167844b..032a815 100644 --- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile +++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile @@ -26,7 +26,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh index b9b8ef7..fd21223 100644 --- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh @@ -21,7 +21,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile index 755a404..c34b7a5 100644 --- a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile +++ b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile @@ -26,7 +26,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh index b9b8ef7..fd21223 100644 --- a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh @@ -21,7 +21,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile index b0d16f7..6be174f 100644 --- a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile +++ b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile @@ -29,7 +29,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh index 44e409d..4d2283d 100644 --- a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh +++ b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh @@ -18,7 +18,7 @@ address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host an echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/python/python/netcon_dockerfile b/tests/docker/python/python/netcon_dockerfile index 5ff7e05..9fff880 100644 --- a/tests/docker/python/python/netcon_dockerfile +++ b/tests/docker/python/python/netcon_dockerfile @@ -26,7 +26,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/python/python/netcon_entrypoint.sh b/tests/docker/python/python/netcon_entrypoint.sh index 5e1a19b..a0f305d 100644 --- a/tests/docker/python/python/netcon_entrypoint.sh +++ b/tests/docker/python/python/netcon_entrypoint.sh @@ -20,7 +20,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/python/python3/netcon_dockerfile b/tests/docker/python/python3/netcon_dockerfile index 5852b88..a31c4fb 100644 --- a/tests/docker/python/python3/netcon_dockerfile +++ b/tests/docker/python/python3/netcon_dockerfile @@ -25,7 +25,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -ADD zerotier-netcon-service / +ADD zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/python/python3/netcon_entrypoint.sh b/tests/docker/python/python3/netcon_entrypoint.sh index c3c8b28..c375133 100644 --- a/tests/docker/python/python3/netcon_entrypoint.sh +++ b/tests/docker/python/python3/netcon_entrypoint.sh @@ -20,7 +20,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile index eaf8ff7..51642f9 100644 --- a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile +++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile @@ -26,7 +26,7 @@ RUN cp libzerotierintercept.so lib/libzerotierintercept.so RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept ADD zerotier-cli / -Add zerotier-netcon-service / +Add zerotier-sdk-service / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh index b422d17..7665f5c 100644 --- a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh +++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh @@ -18,7 +18,7 @@ address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host an echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2