diff --git a/integrations/docker/docker_demo/e5cd7a9e1c3511dd.conf b/integrations/docker/docker_demo/565799d8f65063e5.conf similarity index 100% rename from integrations/docker/docker_demo/e5cd7a9e1c3511dd.conf rename to integrations/docker/docker_demo/565799d8f65063e5.conf diff --git a/integrations/docker/docker_demo/README.md b/integrations/docker/docker_demo/README.md new file mode 100644 index 0000000..10b25f8 --- /dev/null +++ b/integrations/docker/docker_demo/README.md @@ -0,0 +1,7 @@ +Simple Docker Demo +==== + +- Type `make docker_demo` to build an image with the SDK pre-installed and a test image to serve as a monitor +- From this local directory, start both containers with `./start.sh` + +Results of the test can be found in `_results` \ No newline at end of file diff --git a/integrations/docker/docker_demo/start.sh b/integrations/docker/docker_demo/start.sh index c3606fe..72a77e8 100755 --- a/integrations/docker/docker_demo/start.sh +++ b/integrations/docker/docker_demo/start.sh @@ -1,7 +1,7 @@ #!/bin/bash # Runs test image and monitor image as daemons -test_name=${PWD##*/} +test_name="docker_demo" echo 'Starting containers for: ' "$test_name" touch "$test_name".name test_container=$(docker run -d -it -v $PWD/_results:/opt/results --privileged --device=/dev/net/tun "$test_name":latest) diff --git a/src/SDK_JNI_Java_Wapper.java b/src/SDK_JNI_Java_Wapper.java index faa9180..7756ca6 100644 --- a/src/SDK_JNI_Java_Wapper.java +++ b/src/SDK_JNI_Java_Wapper.java @@ -1,3 +1,30 @@ +/* + * ZeroTier One - Network Virtualization Everywhere + * Copyright (C) 2011-2015 ZeroTier, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * -- + * + * ZeroTier may be used and distributed under the terms of the GPLv3, which + * are available at: http://www.gnu.org/licenses/gpl-3.0.html + * + * If you would like to embed ZeroTier into a commercial application or + * redistribute it in a modified binary form, please contact ZeroTier Networks + * LLC. Start here: http://www.zerotier.com/ + */ + package ZeroTier; public class SDK { diff --git a/src/SDK_XcodeWrapper.cpp b/src/SDK_XcodeWrapper.cpp index cf1aab4..0eb7ca9 100755 --- a/src/SDK_XcodeWrapper.cpp +++ b/src/SDK_XcodeWrapper.cpp @@ -1,10 +1,29 @@ -// -// SDK_XcodeWrapper.cpp -// SDK-iOS -// -// Created by Joseph Henry on 2/14/16. -// Copyright © 2016 ZeroTier. All rights reserved. -// +/* + * ZeroTier One - Network Virtualization Everywhere + * Copyright (C) 2011-2015 ZeroTier, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * -- + * + * ZeroTier may be used and distributed under the terms of the GPLv3, which + * are available at: http://www.gnu.org/licenses/gpl-3.0.html + * + * If you would like to embed ZeroTier into a commercial application or + * redistribute it in a modified binary form, please contact ZeroTier Networks + * LLC. Start here: http://www.zerotier.com/ + */ #include "SDK.h" #include "SDK_XcodeWrapper.hpp" diff --git a/src/SDK_XcodeWrapper.hpp b/src/SDK_XcodeWrapper.hpp index 65aff1b..9ee032d 100755 --- a/src/SDK_XcodeWrapper.hpp +++ b/src/SDK_XcodeWrapper.hpp @@ -1,10 +1,29 @@ -// -// SDK_XcodeWrapper.hpp -// SDK-iOS -// -// Created by Joseph Henry on 2/14/16. -// Copyright © 2016 ZeroTier. All rights reserved. -// +/* + * ZeroTier One - Network Virtualization Everywhere + * Copyright (C) 2011-2015 ZeroTier, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * -- + * + * ZeroTier may be used and distributed under the terms of the GPLv3, which + * are available at: http://www.gnu.org/licenses/gpl-3.0.html + * + * If you would like to embed ZeroTier into a commercial application or + * redistribute it in a modified binary form, please contact ZeroTier Networks + * LLC. Start here: http://www.zerotier.com/ + */ #ifndef SDK_XCODE_WRAPPER_HPP #define SDK_XCODE_WRAPPER_HPP