More reorg, work in progress.

2025-06-07 04:53:44 +02:00 · 2020-06-05 13:04:37 -07:00 · 2020-06-05 13:04:37 -07:00 · 3c11c13af4
commit 3c11c13af4
parent d3cf7b2202
153 changed files with 255 additions and 2587 deletions
--- a/attic/java/CMakeLists.txt
+++ b/attic/java/CMakeLists.txt
--- a/attic/java/README.md
+++ b/attic/java/README.md
--- a/attic/java/build.xml
+++ b/attic/java/build.xml
--- a/attic/java/jni/Android.mk
+++ b/attic/java/jni/Android.mk
--- a/attic/java/jni/Application.mk
+++ b/attic/java/jni/Application.mk
--- a/attic/java/jni/ZT_jnilookup.cpp
+++ b/attic/java/jni/ZT_jnilookup.cpp
--- a/attic/java/jni/ZT_jnilookup.h
+++ b/attic/java/jni/ZT_jnilookup.h
--- a/attic/java/jni/ZT_jniutils.cpp
+++ b/attic/java/jni/ZT_jniutils.cpp
--- a/attic/java/jni/ZT_jniutils.h
+++ b/attic/java/jni/ZT_jniutils.h
--- a/attic/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/attic/java/jni/com_zerotierone_sdk_Node.cpp
--- a/attic/java/jni/com_zerotierone_sdk_Node.h
+++ b/attic/java/jni/com_zerotierone_sdk_Node.h
--- a/attic/java/src/com/zerotier/sdk/DataStoreGetListener.java
+++ b/attic/java/src/com/zerotier/sdk/DataStoreGetListener.java
--- a/attic/java/src/com/zerotier/sdk/DataStorePutListener.java
+++ b/attic/java/src/com/zerotier/sdk/DataStorePutListener.java
--- a/attic/java/src/com/zerotier/sdk/Event.java
+++ b/attic/java/src/com/zerotier/sdk/Event.java
--- a/attic/java/src/com/zerotier/sdk/EventListener.java
+++ b/attic/java/src/com/zerotier/sdk/EventListener.java
--- a/attic/java/src/com/zerotier/sdk/NativeUtils.java
+++ b/attic/java/src/com/zerotier/sdk/NativeUtils.java
--- a/attic/java/src/com/zerotier/sdk/Node.java
+++ b/attic/java/src/com/zerotier/sdk/Node.java
--- a/attic/java/src/com/zerotier/sdk/NodeException.java
+++ b/attic/java/src/com/zerotier/sdk/NodeException.java
--- a/attic/java/src/com/zerotier/sdk/NodeStatus.java
+++ b/attic/java/src/com/zerotier/sdk/NodeStatus.java
--- a/attic/java/src/com/zerotier/sdk/PacketSender.java
+++ b/attic/java/src/com/zerotier/sdk/PacketSender.java
--- a/attic/java/src/com/zerotier/sdk/PathChecker.java
+++ b/attic/java/src/com/zerotier/sdk/PathChecker.java
--- a/attic/java/src/com/zerotier/sdk/Peer.java
+++ b/attic/java/src/com/zerotier/sdk/Peer.java
--- a/attic/java/src/com/zerotier/sdk/PeerPhysicalPath.java
+++ b/attic/java/src/com/zerotier/sdk/PeerPhysicalPath.java
--- a/attic/java/src/com/zerotier/sdk/PeerRole.java
+++ b/attic/java/src/com/zerotier/sdk/PeerRole.java
--- a/attic/java/src/com/zerotier/sdk/ResultCode.java
+++ b/attic/java/src/com/zerotier/sdk/ResultCode.java
--- a/attic/java/src/com/zerotier/sdk/Version.java
+++ b/attic/java/src/com/zerotier/sdk/Version.java
--- a/attic/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/attic/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
--- a/attic/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
+++ b/attic/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
--- a/attic/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
+++ b/attic/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
--- a/attic/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
+++ b/attic/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
--- a/attic/java/src/com/zerotier/sdk/VirtualNetworkRoute.java
+++ b/attic/java/src/com/zerotier/sdk/VirtualNetworkRoute.java
--- a/attic/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
+++ b/attic/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
--- a/attic/java/src/com/zerotier/sdk/VirtualNetworkType.java
+++ b/attic/java/src/com/zerotier/sdk/VirtualNetworkType.java
--- a/controller/DB.hpp
+++ b/controller/DB.hpp
@ -16,9 +16,9 @@

 //#define ZT_CONTROLLER_USE_LIBPQ

-#include "../node/Constants.hpp"
-#include "../node/Identity.hpp"
-#include "../node/InetAddress.hpp"
+#include "../core/Constants.hpp"
+#include "../core/Identity.hpp"
+#include "../core/InetAddress.hpp"
 #include "../osdep/OSUtils.hpp"
 #include "../osdep/BlockingQueue.hpp"

--- a/controller/EmbeddedNetworkController.cpp
+++ b/controller/EmbeddedNetworkController.cpp
@ -21,12 +21,12 @@
 #include <thread>
 #include <memory>

-#include "../node/Constants.hpp"
-#include "../node/Node.hpp"
-#include "../node/CertificateOfMembership.hpp"
-#include "../node/NetworkConfig.hpp"
-#include "../node/Dictionary.hpp"
-#include "../node/MAC.hpp"
+#include "../core/Constants.hpp"
+#include "../core/Node.hpp"
+#include "../core/CertificateOfMembership.hpp"
+#include "../core/NetworkConfig.hpp"
+#include "../core/Dictionary.hpp"
+#include "../core/MAC.hpp"

 #include "EmbeddedNetworkController.hpp"
 #include "LFDB.hpp"
--- a/controller/EmbeddedNetworkController.hpp
+++ b/controller/EmbeddedNetworkController.hpp
@ -25,11 +25,11 @@
 #include <unordered_map>
 #include <atomic>

-#include "../node/Constants.hpp"
-#include "../node/NetworkController.hpp"
-#include "../node/Utils.hpp"
-#include "../node/Address.hpp"
-#include "../node/InetAddress.hpp"
+#include "../core/Constants.hpp"
+#include "../core/NetworkController.hpp"
+#include "../core/Utils.hpp"
+#include "../core/Address.hpp"
+#include "../core/InetAddress.hpp"

 #include "../osdep/OSUtils.hpp"
 #include "../osdep/Thread.hpp"
--- a/controller/PostgreSQL.cpp
+++ b/controller/PostgreSQL.cpp
@ -15,7 +15,7 @@

 #ifdef ZT_CONTROLLER_USE_LIBPQ

-#include "../node/Constants.hpp"
+#include "../core/Constants.hpp"
 #include "EmbeddedNetworkController.hpp"
 #include "RabbitMQ.hpp"
 #include "../version.h"
--- a/controller/RabbitMQ.hpp
+++ b/controller/RabbitMQ.hpp
@ -29,7 +29,7 @@ struct MQConfig {

 #ifdef ZT_CONTROLLER_USE_LIBPQ

-#include "../node/Mutex.hpp"
+#include "../core/Mutex.hpp"

 #include <amqp.h>
 #include <amqp_tcp_socket.h>
--- a/core/AES.cpp
+++ b/core/AES.cpp
--- a/core/AES.hpp
+++ b/core/AES.hpp
--- a/core/Address.hpp
+++ b/core/Address.hpp
--- a/core/Buf.cpp
+++ b/core/Buf.cpp
--- a/core/Buf.hpp
+++ b/core/Buf.hpp
--- a/core/C25519.cpp
+++ b/core/C25519.cpp
--- a/core/C25519.hpp
+++ b/core/C25519.hpp
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
--- a/core/Capability.cpp
+++ b/core/Capability.cpp
--- a/core/Capability.hpp
+++ b/core/Capability.hpp
--- a/core/CertificateOfMembership.cpp
+++ b/core/CertificateOfMembership.cpp
--- a/core/CertificateOfMembership.hpp
+++ b/core/CertificateOfMembership.hpp
--- a/core/CertificateOfOwnership.cpp
+++ b/core/CertificateOfOwnership.cpp
--- a/core/CertificateOfOwnership.hpp
+++ b/core/CertificateOfOwnership.hpp
--- a/core/Constants.hpp
+++ b/core/Constants.hpp
@ -14,7 +14,7 @@
 #ifndef ZT_CONSTANTS_HPP
 #define ZT_CONSTANTS_HPP

-#include "../include/ZeroTierCore.h"
+#include "ZeroTierCore.h"
 #include "OS.hpp"

 #if __has_include("version.h")
--- a/core/Containers.hpp
+++ b/core/Containers.hpp
--- a/core/Credential.cpp
+++ b/core/Credential.cpp
--- a/core/Credential.hpp
+++ b/core/Credential.hpp
--- a/core/Defragmenter.hpp
+++ b/core/Defragmenter.hpp
--- a/core/Dictionary.cpp
+++ b/core/Dictionary.cpp
--- a/core/Dictionary.hpp
+++ b/core/Dictionary.hpp
--- a/core/ECC384.cpp
+++ b/core/ECC384.cpp
--- a/core/ECC384.hpp
+++ b/core/ECC384.hpp
--- a/core/Endpoint.cpp
+++ b/core/Endpoint.cpp
--- a/core/Endpoint.hpp
+++ b/core/Endpoint.hpp
--- a/core/EphemeralKey.hpp
+++ b/core/EphemeralKey.hpp
--- a/core/Expect.hpp
+++ b/core/Expect.hpp
--- a/core/FCV.hpp
+++ b/core/FCV.hpp
--- a/core/Fingerprint.hpp
+++ b/core/Fingerprint.hpp
--- a/core/Identity.cpp
+++ b/core/Identity.cpp
--- a/core/Identity.hpp
+++ b/core/Identity.hpp
--- a/core/InetAddress.cpp
+++ b/core/InetAddress.cpp
--- a/core/InetAddress.hpp
+++ b/core/InetAddress.hpp
--- a/core/LZ4.cpp
+++ b/core/LZ4.cpp
--- a/core/LZ4.hpp
+++ b/core/LZ4.hpp
--- a/core/Locator.cpp
+++ b/core/Locator.cpp
--- a/core/Locator.hpp
+++ b/core/Locator.hpp
--- a/core/MAC.hpp
+++ b/core/MAC.hpp
--- a/core/Membership.cpp
+++ b/core/Membership.cpp
--- a/core/Membership.hpp
+++ b/core/Membership.hpp
--- a/core/Meter.hpp
+++ b/core/Meter.hpp
--- a/core/MulticastGroup.hpp
+++ b/core/MulticastGroup.hpp
--- a/core/Mutex.hpp
+++ b/core/Mutex.hpp
--- a/core/Network.cpp
+++ b/core/Network.cpp
--- a/core/Network.hpp
+++ b/core/Network.hpp
--- a/core/NetworkConfig.cpp
+++ b/core/NetworkConfig.cpp
--- a/core/NetworkConfig.hpp
+++ b/core/NetworkConfig.hpp
--- a/core/NetworkController.hpp
+++ b/core/NetworkController.hpp
--- a/core/Node.cpp
+++ b/core/Node.cpp
--- a/core/Node.hpp
+++ b/core/Node.hpp
--- a/core/OS.hpp
+++ b/core/OS.hpp
--- a/core/Path.cpp
+++ b/core/Path.cpp
--- a/core/Path.hpp
+++ b/core/Path.hpp
--- a/core/Peer.cpp
+++ b/core/Peer.cpp
--- a/core/Peer.hpp
+++ b/core/Peer.hpp
--- a/core/Poly1305.cpp
+++ b/core/Poly1305.cpp
--- a/core/Poly1305.hpp
+++ b/core/Poly1305.hpp
--- a/core/Protocol.hpp
+++ b/core/Protocol.hpp
--- a/core/README.md
+++ b/core/README.md
--- a/core/Revocation.cpp
+++ b/core/Revocation.cpp
--- a/core/Revocation.hpp
+++ b/core/Revocation.hpp
--- a/core/RuntimeEnvironment.hpp
+++ b/core/RuntimeEnvironment.hpp
--- a/Show more
+++ b/Show more