ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-22 10:20:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change some build settings. add a lock

Browse Source
This commit is contained in:
Grant Limberg 2015-07-01 20:26:14 -07:00
parent 2a2e3b80b3
commit 0b7cd2f40a
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/CMakeLists.txt
View File

@ -59,6 +59,7 @@ set(src_files
set(include_dirs set(include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/../include/ ${CMAKE_CURRENT_SOURCE_DIR}/../include/
${CMAKE_CURRENT_SOURCE_DIR}/../node/
${Java_INCLUDE_DIRS}) ${Java_INCLUDE_DIRS})
if(WIN32) if(WIN32)

1
java/jni/Android.mk
View File

@ -4,6 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := ZeroTierOneJNI LOCAL_MODULE := ZeroTierOneJNI
LOCAL_C_INCLUDES := $(ZT1)/include LOCAL_C_INCLUDES := $(ZT1)/include
LOCAL_C_INCLUDES += $(ZT1)/node
LOCAL_LDLIBS := -llog LOCAL_LDLIBS := -llog
# LOCAL_CFLAGS := -g # LOCAL_CFLAGS := -g

6
java/jni/Application.mk
View File

@ -1,5 +1,5 @@
APP_ABI := armeabi armeabi-v7a arm64-v8a x86 NDK_TOOLCHAIN_VERSION := clang
APP_STL := gnustl_static APP_STL := c++_static
APP_CPPFLAGS += -Wall -fPIE -fstack-protector -fexceptions APP_CPPFLAGS := -O2 -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing
APP_PLATFORM := android-14 APP_PLATFORM := android-14
APP_ABI := all APP_ABI := all

23
java/jni/com_zerotierone_sdk_Node.cpp
View File

@ -30,6 +30,7 @@
#include "ZT1_jnilookup.h" #include "ZT1_jnilookup.h"
#include <ZeroTierOne.h> #include <ZeroTierOne.h>
#include "Mutex.hpp"
#include <map> #include <map>
#include <string> #include <string>
@ -192,9 +193,9 @@ namespace {
{ {
LOGV("EventCallback"); LOGV("EventCallback");
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
if(ref->node != node) if(ref->node != node && event != ZT1_EVENT_UP)
{ {
LOGE("Nodes not equal. ref->node %p, node %p", ref->node, node); LOGE("Nodes not equal. ref->node %p, node %p. Event: %d", ref->node, node, event);
return; return;
} }
JNIEnv *env = NULL; JNIEnv *env = NULL;
@ -478,9 +479,11 @@ namespace {
typedef std::map<uint64_t, JniRef*> NodeMap; typedef std::map<uint64_t, JniRef*> NodeMap;
static NodeMap nodeMap; static NodeMap nodeMap;
ZeroTier::Mutex nodeMapMutex;
ZT1_Node* findNode(uint64_t nodeId) ZT1_Node* findNode(uint64_t nodeId)
{ {
ZeroTier::Mutex::Lock lock(nodeMapMutex);
NodeMap::iterator found = nodeMap.find(nodeId); NodeMap::iterator found = nodeMap.find(nodeId);
if(found != nodeMap.end()) if(found != nodeMap.end())
{ {
@ -633,9 +636,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
return resultObject; return resultObject;
} }
ZeroTier::Mutex::Lock lock(nodeMapMutex);
ref->node = node; ref->node = node;
nodeMap.insert(std::make_pair(ref->id, ref)); nodeMap.insert(std::make_pair(ref->id, ref));
return resultObject; return resultObject;
} }
@ -650,7 +655,12 @@ JNIEXPORT void JNICALL Java_com_zerotier_sdk_Node_node_1delete(
LOGV("Destroying ZT1_Node struct"); LOGV("Destroying ZT1_Node struct");
uint64_t nodeId = (uint64_t)id; uint64_t nodeId = (uint64_t)id;
NodeMap::iterator found = nodeMap.find(nodeId); NodeMap::iterator found;
{
ZeroTier::Mutex::Lock lock(nodeMapMutex);
found = nodeMap.find(nodeId);
}
if(found != nodeMap.end()) if(found != nodeMap.end())
{ {
JniRef *ref = found->second; JniRef *ref = found->second;
@ -819,6 +829,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
jbyteArray addressArray = (jbyteArray)env->CallObjectMethod(addrObject, getAddressMethod); jbyteArray addressArray = (jbyteArray)env->CallObjectMethod(addrObject, getAddressMethod);
if(addressArray == NULL) if(addressArray == NULL)
{ {
LOGE("Unable to call getAddress()");
// unable to call getAddress() // unable to call getAddress()
return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL); return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
} }
@ -849,6 +860,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
} }
else else
{ {
LOGE("Unknown IP version");
// unknown address type // unknown address type
env->ReleasePrimitiveArrayCritical(addressArray, addr, 0); env->ReleasePrimitiveArrayCritical(addressArray, addr, 0);
return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL); return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
@ -856,6 +868,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
env->ReleasePrimitiveArrayCritical(addressArray, addr, 0); env->ReleasePrimitiveArrayCritical(addressArray, addr, 0);
unsigned int packetLength = env->GetArrayLength(in_packetData); unsigned int packetLength = env->GetArrayLength(in_packetData);
if(packetLength == 0)
{
LOGE("Empty packet?!?");
return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
}
void *packetData = env->GetPrimitiveArrayCritical(in_packetData, NULL); void *packetData = env->GetPrimitiveArrayCritical(in_packetData, NULL);
void *localData = malloc(packetLength); void *localData = malloc(packetLength);
memcpy(localData, packetData, packetLength); memcpy(localData, packetData, packetLength);