diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2019-04-22 11:35:35 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2019-04-22 11:35:35 -0700 |
| commit | 71ae6789300858760df8115c48cc034bb86d0144 (patch) | |
| tree | 3b573df9b9dd718aaad2275b2797d54f941b5051 /java/jni/com_zerotierone_sdk_Node.cpp | |
| parent | 6a027c9c0abaf8dd46403ed94f4cce3378c0f826 (diff) | |
| download | infinitytier-71ae6789300858760df8115c48cc034bb86d0144.tar.gz infinitytier-71ae6789300858760df8115c48cc034bb86d0144.zip | |
Make things compile with Android NDK again
Diffstat (limited to 'java/jni/com_zerotierone_sdk_Node.cpp')
| -rw-r--r-- | java/jni/com_zerotierone_sdk_Node.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp index 9a36e99b..6fca220b 100644 --- a/java/jni/com_zerotierone_sdk_Node.cpp +++ b/java/jni/com_zerotierone_sdk_Node.cpp @@ -32,8 +32,6 @@ #include <ZeroTierOne.h> #include "Mutex.hpp" -#include "PortMapper.hpp" - #include <map> #include <string> #include <assert.h> @@ -60,7 +58,6 @@ namespace { , configListener(NULL) , pathChecker(NULL) , callbacks(NULL) - , portMapper(NULL) { callbacks = (ZT_Node_Callbacks*)malloc(sizeof(ZT_Node_Callbacks)); memset(callbacks, 0, sizeof(ZT_Node_Callbacks)); @@ -81,9 +78,6 @@ namespace { free(callbacks); callbacks = NULL; - - delete portMapper; - portMapper = NULL; } int64_t id; @@ -101,8 +95,6 @@ namespace { jobject pathChecker; ZT_Node_Callbacks *callbacks; - - ZeroTier::PortMapper *portMapper; }; @@ -881,11 +873,6 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init( } uint64_t nodeId = ZT_Node_address(node); - if (nodeId != 0) { - char uniqueName[64]; - snprintf(uniqueName, sizeof(uniqueName), "ZeroTier Android/%.10llx@%u", (unsigned long long)nodeId, 9993); - ref->portMapper = new ZeroTier::PortMapper(9993, uniqueName); - } ZeroTier::Mutex::Lock lock(nodeMapMutex); ref->node = node; |
