void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

jclass pointers aren't as cacheable as originally thought.

Browse source 
There is a way to do it.  We can try it later if we determine it's needed for performance reasons.  Otherwise, don't use static to cache them
This commit is contained in:
Grant Limberg 2015-04-27 18:38:13 -07:00
parent d1ed269537
commit 5983b4367b
2 changed files with 278 additions and 494 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

251
java/jni/ZT1_jniutils.cpp
View file

@ -6,33 +6,17 @@
extern "C" { extern "C" {
#endif #endif
namespace
{
static jclass arrayListClass = NULL;
static jmethodID arrayList_constructor = NULL;
static jmethodID arrayList_add = NULL;
static jclass inetAddressClass = NULL;
static jmethodID inetAddress_getByAddress = NULL;
}
jobject createResultObject(JNIEnv *env, ZT1_ResultCode code) jobject createResultObject(JNIEnv *env, ZT1_ResultCode code)
{ {
// cache the class so we don't have to jclass resultClass = NULL;
// look it up every time we need to create a java
// ResultCode object
static jclass resultClass = NULL;
jobject resultObject = NULL; jobject resultObject = NULL;
if(resultClass == NULL)
{
resultClass = env->FindClass("com/zerotierone/sdk/ResultCode"); resultClass = env->FindClass("com/zerotierone/sdk/ResultCode");
if(resultClass == NULL) if(resultClass == NULL)
{ {
return NULL; // exception thrown return NULL; // exception thrown
} }
}
std::string fieldName; std::string fieldName;
switch(code) switch(code)
@ -65,8 +49,7 @@ jobject createResultObject(JNIEnv *env, ZT1_ResultCode code)
jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status) jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status)
{ {
static jclass statusClass = NULL; jclass statusClass = NULL;
jobject statusObject = NULL; jobject statusObject = NULL;
if(statusClass == NULL) if(statusClass == NULL)
@ -110,17 +93,14 @@ jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status)
jobject createEvent(JNIEnv *env, ZT1_Event event) jobject createEvent(JNIEnv *env, ZT1_Event event)
{ {
static jclass eventClass = NULL; jclass eventClass = NULL;
jobject eventObject = NULL; jobject eventObject = NULL;
if(eventClass == NULL)
{
eventClass = env->FindClass("com/zerotierone/sdk/Event"); eventClass = env->FindClass("com/zerotierone/sdk/Event");
if(eventClass == NULL) if(eventClass == NULL)
{ {
return NULL; return NULL;
} }
}
std::string fieldName; std::string fieldName;
switch(event) switch(event)
@ -157,17 +137,14 @@ jobject createEvent(JNIEnv *env, ZT1_Event event)
jobject createPeerRole(JNIEnv *env, ZT1_PeerRole role) jobject createPeerRole(JNIEnv *env, ZT1_PeerRole role)
{ {
static jclass peerRoleClass = NULL; jclass peerRoleClass = NULL;
jobject peerRoleObject = NULL; jobject peerRoleObject = NULL;
if(peerRoleClass == NULL)
{
peerRoleClass = env->FindClass("com/zerotierone/sdk/PeerRole"); peerRoleClass = env->FindClass("com/zerotierone/sdk/PeerRole");
if(peerRoleClass == NULL) if(peerRoleClass == NULL)
{ {
return NULL; return NULL;
} }
}
std::string fieldName; std::string fieldName;
switch(role) switch(role)
@ -192,17 +169,14 @@ jobject createPeerRole(JNIEnv *env, ZT1_PeerRole role)
jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type) jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type)
{ {
static jclass vntypeClass = NULL; jclass vntypeClass = NULL;
jobject vntypeObject = NULL; jobject vntypeObject = NULL;
if(vntypeClass == NULL)
{
vntypeClass = env->FindClass("com/zerotierone/sdk/VirtualNetworkType"); vntypeClass = env->FindClass("com/zerotierone/sdk/VirtualNetworkType");
if(vntypeClass == NULL) if(vntypeClass == NULL)
{ {
return NULL; return NULL;
} }
}
std::string fieldName; std::string fieldName;
switch(type) switch(type)
@ -222,17 +196,14 @@ jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type)
jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT1_VirtualNetworkConfigOperation op) jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT1_VirtualNetworkConfigOperation op)
{ {
static jclass vnetConfigOpClass = NULL; jclass vnetConfigOpClass = NULL;
jobject vnetConfigOpObject = NULL; jobject vnetConfigOpObject = NULL;
if(vnetConfigOpClass == NULL)
{
vnetConfigOpClass = env->FindClass("com/zerotierone/sdk/VirtualNetworkConfigOperation"); vnetConfigOpClass = env->FindClass("com/zerotierone/sdk/VirtualNetworkConfigOperation");
if(vnetConfigOpClass == NULL) if(vnetConfigOpClass == NULL)
{ {
return NULL; return NULL;
} }
}
std::string fieldName; std::string fieldName;
switch(op) switch(op)
@ -258,24 +229,21 @@ jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT1_VirtualNetworkConfi
jobject newArrayList(JNIEnv *env) jobject newArrayList(JNIEnv *env)
{ {
if(arrayListClass == NULL) jclass arrayListClass = NULL;
{ jmethodID arrayList_constructor = NULL;
arrayListClass = env->FindClass("java/util/ArrayList"); arrayListClass = env->FindClass("java/util/ArrayList");
if(arrayListClass == NULL) if(arrayListClass == NULL)
{ {
return NULL; return NULL;
} }
}
if(arrayList_constructor == NULL)
{
arrayList_constructor = env->GetMethodID( arrayList_constructor = env->GetMethodID(
arrayListClass, "<init>", "()V"); arrayListClass, "<init>", "()V");
if(arrayList_constructor == NULL) if(arrayList_constructor == NULL)
{ {
return NULL; return NULL;
} }
}
jobject arrayListObj = env->NewObject(arrayListClass, arrayList_constructor); jobject arrayListObj = env->NewObject(arrayListClass, arrayList_constructor);
@ -287,41 +255,41 @@ bool appendItemToArrayList(JNIEnv *env, jobject array, jobject object)
assert(array != NULL); assert(array != NULL);
assert(object != NULL); assert(object != NULL);
if(arrayList_add == NULL) jclass arrayListClass = NULL;
jmethodID arrayList_add = NULL;
arrayListClass = env->FindClass("java/util/ArrayList");
if(arrayListClass == NULL)
{ {
return NULL;
}
arrayList_add = env->GetMethodID(arrayListClass, "add", "(Ljava.lang.Object;)Z"); arrayList_add = env->GetMethodID(arrayListClass, "add", "(Ljava.lang.Object;)Z");
if(arrayList_add == NULL) if(arrayList_add == NULL)
{ {
return false; return false;
} }
}
return env->CallBooleanMethod(array, arrayList_add, object); return env->CallBooleanMethod(array, arrayList_add, object);
} }
jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr) jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr)
{ {
static jclass inetAddressClass = NULL; jclass inetAddressClass = NULL;
static jmethodID inetAddress_getByAddress = NULL; jmethodID inetAddress_getByAddress = NULL;
if(inetAddressClass == NULL)
{
inetAddressClass = env->FindClass("java/net/InetAddress"); inetAddressClass = env->FindClass("java/net/InetAddress");
if(inetAddressClass == NULL) if(inetAddressClass == NULL)
{ {
return NULL; return NULL;
} }
}
if(inetAddress_getByAddress == NULL)
{
inetAddress_getByAddress = env->GetStaticMethodID( inetAddress_getByAddress = env->GetStaticMethodID(
inetAddressClass, "getByAddress", "([B)Ljava/net/InetAddress;"); inetAddressClass, "getByAddress", "([B)Ljava/net/InetAddress;");
if(inetAddress_getByAddress == NULL) if(inetAddress_getByAddress == NULL)
{ {
return NULL; return NULL;
} }
}
jobject inetAddressObj = NULL; jobject inetAddressObj = NULL;
switch(addr.ss_family) switch(addr.ss_family)
@ -361,17 +329,14 @@ jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr)
jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr) jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
{ {
static jclass inetSocketAddressClass = NULL; jclass inetSocketAddressClass = NULL;
static jmethodID inetSocketAddress_constructor = NULL; jmethodID inetSocketAddress_constructor = NULL;
if(inetSocketAddressClass == NULL)
{
inetSocketAddressClass == env->FindClass("java/net/InetSocketAddress"); inetSocketAddressClass == env->FindClass("java/net/InetSocketAddress");
if(inetSocketAddressClass == NULL) if(inetSocketAddressClass == NULL)
{ {
return NULL; return NULL;
} }
}
jobject inetAddressObject = newInetAddress(env, addr); jobject inetAddressObject = newInetAddress(env, addr);
@ -380,15 +345,12 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
return NULL; return NULL;
} }
if(inetSocketAddress_constructor == NULL)
{
inetSocketAddress_constructor = env->GetMethodID( inetSocketAddress_constructor = env->GetMethodID(
inetSocketAddressClass, "<init>", "(Ljava/net/InetAddress;I)V"); inetSocketAddressClass, "<init>", "(Ljava/net/InetAddress;I)V");
if(inetSocketAddress_constructor == NULL) if(inetSocketAddress_constructor == NULL)
{ {
return NULL; return NULL;
} }
}
int port = 0; int port = 0;
switch(addr.ss_family) switch(addr.ss_family)
@ -413,30 +375,24 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
jobject newMulticastGroup(JNIEnv *env, const ZT1_MulticastGroup &mc) jobject newMulticastGroup(JNIEnv *env, const ZT1_MulticastGroup &mc)
{ {
static jclass multicastGroupClass = NULL; jclass multicastGroupClass = NULL;
static jmethodID multicastGroup_constructor = NULL; jmethodID multicastGroup_constructor = NULL;
static jfieldID macField = NULL; jfieldID macField = NULL;
static jfieldID adiField = NULL; jfieldID adiField = NULL;
if(multicastGroupClass == NULL)
{
multicastGroupClass = env->FindClass("com/zerotierone/sdk/MulticastGroup"); multicastGroupClass = env->FindClass("com/zerotierone/sdk/MulticastGroup");
if(multicastGroupClass == NULL) if(multicastGroupClass == NULL)
{ {
return NULL; return NULL;
} }
}
if(multicastGroup_constructor == NULL)
{
multicastGroup_constructor = env->GetMethodID( multicastGroup_constructor = env->GetMethodID(
multicastGroupClass, "<init>", "()V"); multicastGroupClass, "<init>", "()V");
if(multicastGroup_constructor == NULL) if(multicastGroup_constructor == NULL)
{ {
return NULL; return NULL;
} }
}
jobject multicastGroupObj = env->NewObject(multicastGroupClass, multicastGroup_constructor); jobject multicastGroupObj = env->NewObject(multicastGroupClass, multicastGroup_constructor);
if(multicastGroupObj == NULL) if(multicastGroupObj == NULL)
@ -470,88 +426,64 @@ jobject newMulticastGroup(JNIEnv *env, const ZT1_MulticastGroup &mc)
jobject newPeerPhysicalPath(JNIEnv *env, const ZT1_PeerPhysicalPath &ppp) jobject newPeerPhysicalPath(JNIEnv *env, const ZT1_PeerPhysicalPath &ppp)
{ {
static jclass pppClass = NULL; jclass pppClass = NULL;
static jfieldID addressField = NULL; jfieldID addressField = NULL;
static jfieldID lastSendField = NULL; jfieldID lastSendField = NULL;
static jfieldID lastReceiveField = NULL; jfieldID lastReceiveField = NULL;
static jfieldID fixedField = NULL; jfieldID fixedField = NULL;
static jfieldID activeField = NULL; jfieldID activeField = NULL;
static jfieldID preferredField = NULL; jfieldID preferredField = NULL;
static jmethodID ppp_constructor = NULL; jmethodID ppp_constructor = NULL;
if(pppClass == NULL)
{
pppClass = env->FindClass("com/zerotierone/sdk/PeerPhysicalPath"); pppClass = env->FindClass("com/zerotierone/sdk/PeerPhysicalPath");
if(pppClass == NULL) if(pppClass == NULL)
{ {
return NULL; return NULL;
} }
}
if(addressField == NULL)
{
addressField = env->GetFieldID(pppClass, "address", "Ljava/net/InetAddress;"); addressField = env->GetFieldID(pppClass, "address", "Ljava/net/InetAddress;");
if(addressField == NULL) if(addressField == NULL)
{ {
return NULL; return NULL;
} }
}
if(lastSendField == NULL)
{
lastSendField = env->GetFieldID(pppClass, "lastSend", "J"); lastSendField = env->GetFieldID(pppClass, "lastSend", "J");
if(lastSendField == NULL) if(lastSendField == NULL)
{ {
return NULL; return NULL;
} }
}
if(lastReceiveField == NULL)
{
lastReceiveField = env->GetFieldID(pppClass, "lastReceive", "J"); lastReceiveField = env->GetFieldID(pppClass, "lastReceive", "J");
if(lastReceiveField == NULL) if(lastReceiveField == NULL)
{ {
return NULL; return NULL;
} }
}
if(fixedField == NULL)
{
fixedField = env->GetFieldID(pppClass, "fixed", "Z"); fixedField = env->GetFieldID(pppClass, "fixed", "Z");
if(fixedField == NULL) if(fixedField == NULL)
{ {
return NULL; return NULL;
} }
}
if(activeField == NULL)
{
activeField = env->GetFieldID(pppClass, "active", "Z"); activeField = env->GetFieldID(pppClass, "active", "Z");
if(activeField == NULL) if(activeField == NULL)
{ {
return NULL; return NULL;
} }
}
if(preferredField == NULL)
{
preferredField = env->GetFieldID(pppClass, "preferred", "Z"); preferredField = env->GetFieldID(pppClass, "preferred", "Z");
if(preferredField == NULL) if(preferredField == NULL)
{ {
return NULL; return NULL;
} }
}
if(ppp_constructor == NULL)
{
ppp_constructor = env->GetMethodID(pppClass, "<init>", "()V"); ppp_constructor = env->GetMethodID(pppClass, "<init>", "()V");
if(ppp_constructor == NULL) if(ppp_constructor == NULL)
{ {
return NULL; return NULL;
} }
}
jobject pppObject = env->NewObject(pppClass, ppp_constructor); jobject pppObject = env->NewObject(pppClass, ppp_constructor);
if(pppObject == NULL) if(pppObject == NULL)
@ -573,118 +505,85 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT1_PeerPhysicalPath &ppp)
jobject newPeer(JNIEnv *env, const ZT1_Peer &peer) jobject newPeer(JNIEnv *env, const ZT1_Peer &peer)
{ {
static jclass peerClass = NULL; jclass peerClass = NULL;
static jfieldID addressField = NULL; jfieldID addressField = NULL;
static jfieldID lastUnicastFrameField = NULL; jfieldID lastUnicastFrameField = NULL;
static jfieldID lastMulticastFrameField = NULL; jfieldID lastMulticastFrameField = NULL;
static jfieldID versionMajorField = NULL; jfieldID versionMajorField = NULL;
static jfieldID versionMinorField = NULL; jfieldID versionMinorField = NULL;
static jfieldID versionRevField = NULL; jfieldID versionRevField = NULL;
static jfieldID latencyField = NULL; jfieldID latencyField = NULL;
static jfieldID roleField = NULL; jfieldID roleField = NULL;
static jfieldID pathsField = NULL; jfieldID pathsField = NULL;
static jmethodID peer_constructor = NULL; jmethodID peer_constructor = NULL;
if(peerClass == NULL)
{
peerClass = env->FindClass("com/zerotierone/sdk/Peer"); peerClass = env->FindClass("com/zerotierone/sdk/Peer");
if(peerClass == NULL) if(peerClass == NULL)
{ {
return NULL; return NULL;
} }
}
if(addressField == NULL)
{
addressField = env->GetFieldID(peerClass, "address", "J"); addressField = env->GetFieldID(peerClass, "address", "J");
if(addressField == NULL) if(addressField == NULL)
{ {
return NULL; return NULL;
} }
}
if(lastUnicastFrameField == NULL)
{
lastUnicastFrameField = env->GetFieldID(peerClass, "lastUnicastFrame", "J"); lastUnicastFrameField = env->GetFieldID(peerClass, "lastUnicastFrame", "J");
if(lastUnicastFrameField == NULL) if(lastUnicastFrameField == NULL)
{ {
return NULL; return NULL;
} }
}
if(lastMulticastFrameField == NULL)
{
lastMulticastFrameField = env->GetFieldID(peerClass, "lastMulticastFrame", "J"); lastMulticastFrameField = env->GetFieldID(peerClass, "lastMulticastFrame", "J");
if(lastMulticastFrameField == NULL) if(lastMulticastFrameField == NULL)
{ {
return NULL; return NULL;
} }
}
if(versionMajorField == NULL)
{
versionMajorField = env->GetFieldID(peerClass, "versionMajor", "I"); versionMajorField = env->GetFieldID(peerClass, "versionMajor", "I");
if(versionMajorField == NULL) if(versionMajorField == NULL)
{ {
return NULL; return NULL;
} }
}
if(versionMinorField == NULL)
{
versionMinorField = env->GetFieldID(peerClass, "versionMinor", "I"); versionMinorField = env->GetFieldID(peerClass, "versionMinor", "I");
if(versionMinorField == NULL) if(versionMinorField == NULL)
{ {
return NULL; return NULL;
} }
}
if(versionRevField == NULL)
{
versionRevField = env->GetFieldID(peerClass, "versionRev", "I"); versionRevField = env->GetFieldID(peerClass, "versionRev", "I");
if(versionRevField == NULL) if(versionRevField == NULL)
{ {
return NULL; return NULL;
} }
}
if(latencyField == NULL)
{
latencyField = env->GetFieldID(peerClass, "latency", "I"); latencyField = env->GetFieldID(peerClass, "latency", "I");
if(latencyField == NULL) if(latencyField == NULL)
{ {
return NULL; return NULL;
} }
}
if(roleField == NULL)
{
roleField = env->GetFieldID(peerClass, "role", "Lcom/zerotierone/sdk/PeerRole;"); roleField = env->GetFieldID(peerClass, "role", "Lcom/zerotierone/sdk/PeerRole;");
if(roleField == NULL) if(roleField == NULL)
{ {
return NULL; return NULL;
} }
}
if(pathsField == NULL)
{
pathsField = env->GetFieldID(peerClass, "paths", "Ljava.util.ArrayList;"); pathsField = env->GetFieldID(peerClass, "paths", "Ljava.util.ArrayList;");
if(pathsField == NULL) if(pathsField == NULL)
{ {
return NULL; return NULL;
} }
}
if(peer_constructor == NULL)
{
peer_constructor = env->GetMethodID(peerClass, "<init>", "()V"); peer_constructor = env->GetMethodID(peerClass, "<init>", "()V");
if(peer_constructor == NULL) if(peer_constructor == NULL)
{ {
return NULL; return NULL;
} }
}
jobject peerObject = env->NewObject(peerClass, peer_constructor); jobject peerObject = env->NewObject(peerClass, peer_constructor);
if(peerObject == NULL) if(peerObject == NULL)
@ -715,22 +614,22 @@ jobject newPeer(JNIEnv *env, const ZT1_Peer &peer)
jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig) jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig)
{ {
static jclass vnetConfigClass = NULL; jclass vnetConfigClass = NULL;
static jmethodID vnetConfig_constructor = NULL; jmethodID vnetConfig_constructor = NULL;
static jfieldID nwidField = NULL; jfieldID nwidField = NULL;
static jfieldID macField = NULL; jfieldID macField = NULL;
static jfieldID nameField = NULL; jfieldID nameField = NULL;
static jfieldID statusField = NULL; jfieldID statusField = NULL;
static jfieldID typeField = NULL; jfieldID typeField = NULL;
static jfieldID mtuField = NULL; jfieldID mtuField = NULL;
static jfieldID dhcpField = NULL; jfieldID dhcpField = NULL;
static jfieldID bridgeField = NULL; jfieldID bridgeField = NULL;
static jfieldID broadcastEnabledField = NULL; jfieldID broadcastEnabledField = NULL;
static jfieldID portErrorField = NULL; jfieldID portErrorField = NULL;
static jfieldID enabledField = NULL; jfieldID enabledField = NULL;
static jfieldID netconfRevisionField = NULL; jfieldID netconfRevisionField = NULL;
static jfieldID multicastSubscriptionsField = NULL; jfieldID multicastSubscriptionsField = NULL;
static jfieldID assignedAddressesField = NULL; jfieldID assignedAddressesField = NULL;
if(vnetConfigClass == NULL) if(vnetConfigClass == NULL)
{ {
@ -937,27 +836,21 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags) jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags)
{ {
// create a com.zerotierone.sdk.Version object // create a com.zerotierone.sdk.Version object
static jclass versionClass = NULL; jclass versionClass = NULL;
static jmethodID versionConstructor = NULL; jmethodID versionConstructor = NULL;
if(versionClass == NULL)
{
versionClass = env->FindClass("com/zerotierone/sdk/Version"); versionClass = env->FindClass("com/zerotierone/sdk/Version");
if(versionClass == NULL) if(versionClass == NULL)
{ {
return NULL; return NULL;
} }
}
if(versionConstructor == NULL)
{
versionConstructor = env->GetMethodID( versionConstructor = env->GetMethodID(
versionClass, "<init>", "()V"); versionClass, "<init>", "()V");
if(versionConstructor == NULL) if(versionConstructor == NULL)
{ {
return NULL; return NULL;
} }
}
jobject versionObj = env->NewObject(versionClass, versionConstructor); jobject versionObj = env->NewObject(versionClass, versionConstructor);
if(versionObj == NULL) if(versionObj == NULL)
@ -966,46 +859,34 @@ jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags
} }
// copy data to Version object // copy data to Version object
static jfieldID majorField = NULL; jfieldID majorField = NULL;
static jfieldID minorField = NULL; jfieldID minorField = NULL;
static jfieldID revisionField = NULL; jfieldID revisionField = NULL;
static jfieldID featureFlagsField = NULL; jfieldID featureFlagsField = NULL;
if(majorField == NULL)
{
majorField = env->GetFieldID(versionClass, "major", "I"); majorField = env->GetFieldID(versionClass, "major", "I");
if(majorField = NULL) if(majorField = NULL)
{ {
return NULL; return NULL;
} }
}
if(minorField == NULL)
{
minorField = env->GetFieldID(versionClass, "minor", "I"); minorField = env->GetFieldID(versionClass, "minor", "I");
if(minorField == NULL) if(minorField == NULL)
{ {
return NULL; return NULL;
} }
}
if(revisionField == NULL)
{
revisionField = env->GetFieldID(versionClass, "revision", "I"); revisionField = env->GetFieldID(versionClass, "revision", "I");
if(revisionField == NULL) if(revisionField == NULL)
{ {
return NULL; return NULL;
} }
}
if(featureFlagsField == NULL)
{
featureFlagsField = env->GetFieldID(versionClass, "featureFlags", "J"); featureFlagsField = env->GetFieldID(versionClass, "featureFlags", "J");
if(featureFlagsField == NULL) if(featureFlagsField == NULL)
{ {
return NULL; return NULL;
} }
}
env->SetIntField(versionObj, majorField, (jint)major); env->SetIntField(versionObj, majorField, (jint)major);
env->SetIntField(versionObj, minorField, (jint)minor); env->SetIntField(versionObj, minorField, (jint)minor);

235
java/jni/com_zerotierone_sdk_Node.cpp
View file

@ -43,64 +43,28 @@ namespace {
struct JniRef struct JniRef
{ {
JniRef() JniRef()
: env(NULL) : jvm(NULL)
, node(NULL) , node(NULL)
, dataStoreGetListener(NULL) , dataStoreGetListener(NULL)
, dataStoreGetClass(NULL)
, dataStoreGetCallbackMethod(NULL)
, dataStorePutListener(NULL) , dataStorePutListener(NULL)
, dataStorePutClass(NULL)
, dataStorePutCallbackMethod(NULL)
, deleteMethod(NULL)
, packetSender(NULL) , packetSender(NULL)
, packetSenderClass(NULL)
, packetSenderCallbackMethod(NULL)
, eventListener(NULL) , eventListener(NULL)
, eventListenerClass(NULL)
, onEventMethod(NULL)
, onOutOfDateMethod(NULL)
, onNetworkErrorMethod(NULL)
, onTraceMethod(NULL)
, frameListener(NULL) , frameListener(NULL)
, frameListenerClass(NULL)
, frameListenerCallbackMethod(NULL)
, configListener(NULL) , configListener(NULL)
, configListenerClass(NULL)
, configListenerCallbackMethod(NULL)
{} {}
uint64_t id; uint64_t id;
JNIEnv *env; JavaVM *jvm;
ZT1_Node *node; ZT1_Node *node;
jobject dataStoreGetListener; jobject dataStoreGetListener;
jclass dataStoreGetClass;
jmethodID dataStoreGetCallbackMethod;
jobject dataStorePutListener; jobject dataStorePutListener;
jclass dataStorePutClass;
jmethodID dataStorePutCallbackMethod;
jmethodID deleteMethod;
jobject packetSender; jobject packetSender;
jclass packetSenderClass;
jmethodID packetSenderCallbackMethod;
jobject eventListener; jobject eventListener;
jclass eventListenerClass;
jmethodID onEventMethod;
jmethodID onOutOfDateMethod;
jmethodID onNetworkErrorMethod;
jmethodID onTraceMethod;
jobject frameListener; jobject frameListener;
jclass frameListenerClass;
jmethodID frameListenerCallbackMethod;
jobject configListener; jobject configListener;
jclass configListenerClass;
jmethodID configListenerCallbackMethod;
}; };
@ -112,31 +76,24 @@ namespace {
const ZT1_VirtualNetworkConfig *config) const ZT1_VirtualNetworkConfig *config)
{ {
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
JNIEnv *env = ref->env; jclass configListenerClass = env->GetObjectClass(ref->configListener);
if(configListenerClass == NULL)
if(ref->configListenerClass == NULL)
{
ref->configListenerClass = env->GetObjectClass(ref->configListener);
if(ref->configListenerClass == NULL)
{ {
LOGE("Couldn't find class for VirtualNetworkConfigListener instance"); LOGE("Couldn't find class for VirtualNetworkConfigListener instance");
return -1; return -1;
} }
}
if(ref->configListenerCallbackMethod == NULL) jmethodID configListenerCallbackMethod = env->GetMethodID(configListenerClass,
{
ref->configListenerCallbackMethod = env->GetMethodID(ref->configListenerClass,
"onNetworkConfigurationUpdated", "onNetworkConfigurationUpdated",
"(JLcom/zerotierone/sdk/VirtualNetworkConfigOperation;Lcom/zerotierone/sdk/VirtualNetworkConfig;)I"); "(JLcom/zerotierone/sdk/VirtualNetworkConfigOperation;Lcom/zerotierone/sdk/VirtualNetworkConfig;)I");
if(ref->configListenerCallbackMethod == NULL) if(configListenerCallbackMethod == NULL)
{ {
LOGE("Couldn't find onVirtualNetworkFrame() method"); LOGE("Couldn't find onVirtualNetworkFrame() method");
return -2; return -2;
} }
}
jobject operationObject = createVirtualNetworkConfigOperation(env, operation); jobject operationObject = createVirtualNetworkConfigOperation(env, operation);
if(operationObject == NULL) if(operationObject == NULL)
@ -154,7 +111,7 @@ namespace {
return env->CallIntMethod( return env->CallIntMethod(
ref->configListener, ref->configListener,
ref->configListenerCallbackMethod, configListenerCallbackMethod,
(jlong)nwid, operationObject, networkConfigObject); (jlong)nwid, operationObject, networkConfigObject);
} }
@ -169,35 +126,30 @@ namespace {
{ {
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); assert(ref->node == node);
JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
JNIEnv *env = ref->env;
if(ref->frameListenerClass == NULL) jclass frameListenerClass = env->GetObjectClass(ref->frameListener);
{ if(frameListenerClass == NULL)
ref->frameListenerClass = env->GetObjectClass(ref->frameListener);
if(ref->frameListenerClass == NULL)
{ {
LOGE("Couldn't find class for VirtualNetworkFrameListener instance"); LOGE("Couldn't find class for VirtualNetworkFrameListener instance");
return; return;
} }
}
if(ref->frameListenerCallbackMethod == NULL) jmethodID frameListenerCallbackMethod = env->GetMethodID(
{ frameListenerClass,
ref->frameListenerCallbackMethod = env->GetMethodID(
ref->frameListenerClass,
"onVirtualNetworkFrame", "(JJJJJ[B)V"); "onVirtualNetworkFrame", "(JJJJJ[B)V");
if(ref->frameListenerCallbackMethod == NULL) if(frameListenerCallbackMethod == NULL)
{ {
LOGE("Couldn't find onVirtualNetworkFrame() method"); LOGE("Couldn't find onVirtualNetworkFrame() method");
return; return;
} }
}
jbyteArray dataArray = env->NewByteArray(frameLength); jbyteArray dataArray = env->NewByteArray(frameLength);
env->SetByteArrayRegion(dataArray, 0, frameLength, (jbyte*)frameData); env->SetByteArrayRegion(dataArray, 0, frameLength, (jbyte*)frameData);
env->CallVoidMethod(ref->frameListener, ref->frameListenerCallbackMethod, nwid, sourceMac, destMac, etherType, vlanid, dataArray); env->CallVoidMethod(ref->frameListener, frameListenerCallbackMethod, nwid, sourceMac, destMac, etherType, vlanid, dataArray);
} }
@ -205,65 +157,51 @@ namespace {
{ {
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); assert(ref->node == node);
JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
JNIEnv *env = ref->env;
if(ref->eventListenerClass == NULL) jclass eventListenerClass = env->GetObjectClass(ref->eventListener);
{ if(eventListenerClass == NULL)
ref->eventListenerClass = env->GetObjectClass(ref->eventListener);
if(ref->eventListenerClass == NULL)
{ {
LOGE("Couldn't class for EventListener instance"); LOGE("Couldn't class for EventListener instance");
return; return;
} }
}
if(ref->onEventMethod == NULL) jmethodID onEventMethod = env->GetMethodID(eventListenerClass,
{
ref->onEventMethod = env->GetMethodID(ref->eventListenerClass,
"onEvent", "(Lcom/zerotierone/sdk/Event;)V"); "onEvent", "(Lcom/zerotierone/sdk/Event;)V");
if(ref->onEventMethod == NULL) if(onEventMethod == NULL)
{ {
LOGE("Couldn't find onEvent method"); LOGE("Couldn't find onEvent method");
return; return;
} }
}
if(ref->onOutOfDateMethod == NULL) jmethodID onOutOfDateMethod = env->GetMethodID(eventListenerClass,
{
ref->onOutOfDateMethod = env->GetMethodID(ref->eventListenerClass,
"onOutOfDate", "(Lcom/zerotierone/sdk/Version;)V"); "onOutOfDate", "(Lcom/zerotierone/sdk/Version;)V");
if(ref->onOutOfDateMethod == NULL) if(onOutOfDateMethod == NULL)
{ {
LOGE("Couldn't find onOutOfDate method"); LOGE("Couldn't find onOutOfDate method");
return; return;
} }
}
if(ref->onOutOfDateMethod == NULL) jmethodID onNetworkErrorMethod = env->GetMethodID(eventListenerClass,
{
ref->onNetworkErrorMethod = env->GetMethodID(ref->eventListenerClass,
"onNetworkError", "(Lcom/zerotierone/sdk/Event;Ljava/net/InetSocketAddress;)V"); "onNetworkError", "(Lcom/zerotierone/sdk/Event;Ljava/net/InetSocketAddress;)V");
if(ref->onNetworkErrorMethod == NULL) if(onNetworkErrorMethod == NULL)
{ {
LOGE("Couldn't find onNetworkError method"); LOGE("Couldn't find onNetworkError method");
return; return;
} }
}
if(ref->onTraceMethod == NULL) jmethodID onTraceMethod = env->GetMethodID(eventListenerClass,
{
ref->onTraceMethod = env->GetMethodID(ref->eventListenerClass,
"onTrace", "(Ljava/lang/String;)V"); "onTrace", "(Ljava/lang/String;)V");
if(ref->onTraceMethod == NULL) if(onTraceMethod == NULL)
{ {
LOGE("Couldn't find onTrace method"); LOGE("Couldn't find onTrace method");
return; return;
} }
}
jobject eventObject = createEvent(env, event); jobject eventObject = createEvent(env, event);
if(eventObject == NULL) if(eventObject == NULL)
@ -280,7 +218,7 @@ namespace {
case ZT1_EVENT_FATAL_ERROR_IDENTITY_COLLISION: case ZT1_EVENT_FATAL_ERROR_IDENTITY_COLLISION:
{ {
// call onEvent() // call onEvent()
env->CallVoidMethod(ref->eventListener, ref->onEventMethod, eventObject); env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
} }
break; break;
case ZT1_EVENT_SAW_MORE_RECENT_VERSION: case ZT1_EVENT_SAW_MORE_RECENT_VERSION:
@ -290,7 +228,7 @@ namespace {
{ {
int *version = (int*)data; int *version = (int*)data;
jobject verisonObj = newVersion(env, version[0], version[1], version[2], 0); jobject verisonObj = newVersion(env, version[0], version[1], version[2], 0);
env->CallVoidMethod(ref->eventListener, ref->onOutOfDateMethod, verisonObj); env->CallVoidMethod(ref->eventListener, onOutOfDateMethod, verisonObj);
} }
} }
break; break;
@ -302,7 +240,7 @@ namespace {
{ {
sockaddr_storage *addr = (sockaddr_storage*)data; sockaddr_storage *addr = (sockaddr_storage*)data;
jobject addressObj = newInetSocketAddress(env, *addr); jobject addressObj = newInetSocketAddress(env, *addr);
env->CallVoidMethod(ref->eventListener, ref->onNetworkErrorMethod, addressObj); env->CallVoidMethod(ref->eventListener, onNetworkErrorMethod, addressObj);
} }
} }
case ZT1_EVENT_TRACE: case ZT1_EVENT_TRACE:
@ -312,7 +250,7 @@ namespace {
{ {
const char* message = (const char*)data; const char* message = (const char*)data;
jstring messageStr = env->NewStringUTF(message); jstring messageStr = env->NewStringUTF(message);
env->CallVoidMethod(ref->eventListener, ref->onTraceMethod); env->CallVoidMethod(ref->eventListener, onTraceMethod);
} }
} }
break; break;
@ -327,30 +265,25 @@ namespace {
unsigned long *out_objectSize) unsigned long *out_objectSize)
{ {
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
JNIEnv *env = ref->env; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
if(ref->dataStoreGetClass == NULL) jclass dataStoreGetClass = env->GetObjectClass(ref->dataStoreGetListener);
{ if(dataStoreGetClass == NULL)
ref->dataStoreGetClass = env->GetObjectClass(ref->dataStoreGetListener);
if(ref->dataStoreGetClass == NULL)
{ {
LOGE("Couldn't find class for DataStoreGetListener instance"); LOGE("Couldn't find class for DataStoreGetListener instance");
return -1; return -1;
} }
}
if(ref->dataStoreGetCallbackMethod == NULL) jmethodID dataStoreGetCallbackMethod = env->GetMethodID(
{ dataStoreGetClass,
ref->dataStoreGetCallbackMethod = env->GetMethodID(
ref->dataStoreGetClass,
"onDataStoreGet", "onDataStoreGet",
"(Ljava/lang/String;[BJ[J)J"); "(Ljava/lang/String;[BJ[J)J");
if(ref->dataStoreGetCallbackMethod == NULL) if(dataStoreGetCallbackMethod == NULL)
{ {
LOGE("Couldn't find onDataStoreGet method"); LOGE("Couldn't find onDataStoreGet method");
return -2; return -2;
} }
}
jstring nameStr = env->NewStringUTF(objectName); jstring nameStr = env->NewStringUTF(objectName);
if(nameStr == NULL) if(nameStr == NULL)
@ -363,7 +296,7 @@ namespace {
jlongArray objectSizeObj = env->NewLongArray(1); jlongArray objectSizeObj = env->NewLongArray(1);
long retval = env->CallLongMethod( long retval = env->CallLongMethod(
ref->dataStoreGetListener, ref->dataStoreGetCallbackMethod, ref->dataStoreGetListener, dataStoreGetCallbackMethod,
nameStr, bufferObj, bufferIndex, objectSizeObj); nameStr, bufferObj, bufferIndex, objectSizeObj);
env->GetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer); env->GetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
@ -381,41 +314,34 @@ namespace {
int secure) int secure)
{ {
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
JNIEnv *env = ref->env; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
if(ref->dataStorePutClass == NULL)
{ jclass dataStorePutClass = env->GetObjectClass(ref->dataStorePutListener);
ref->dataStorePutClass = env->GetObjectClass(ref->dataStorePutListener); if(dataStorePutClass == NULL)
if(ref->dataStorePutClass == NULL)
{ {
LOGE("Couldn't find class for DataStorePutListener instance"); LOGE("Couldn't find class for DataStorePutListener instance");
return -1; return -1;
} }
}
if(ref->dataStorePutCallbackMethod == NULL) jmethodID dataStorePutCallbackMethod = env->GetMethodID(
{ dataStorePutClass,
ref->dataStorePutCallbackMethod = env->GetMethodID(
ref->dataStorePutClass,
"onDataStorePut", "onDataStorePut",
"(Ljava/lang/String;[BZ)I"); "(Ljava/lang/String;[BZ)I");
if(ref->dataStorePutCallbackMethod == NULL) if(dataStorePutCallbackMethod == NULL)
{ {
LOGE("Couldn't find onDataStorePut method"); LOGE("Couldn't find onDataStorePut method");
return -2; return -2;
} }
}
if(ref->deleteMethod == NULL) jmethodID deleteMethod = env->GetMethodID(dataStorePutClass,
{
ref->deleteMethod = env->GetMethodID(ref->dataStorePutClass,
"onDelete", "(Ljava/lang/String;)I"); "onDelete", "(Ljava/lang/String;)I");
if(ref->deleteMethod == NULL) if(deleteMethod == NULL)
{ {
LOGE("Couldn't find onDelete method"); LOGE("Couldn't find onDelete method");
return -3; return -3;
} }
}
jstring nameStr = env->NewStringUTF(objectName); jstring nameStr = env->NewStringUTF(objectName);
@ -423,7 +349,7 @@ namespace {
{ {
// delete operation // delete operation
return env->CallIntMethod( return env->CallIntMethod(
ref->dataStorePutListener, ref->deleteMethod, nameStr); ref->dataStorePutListener, deleteMethod, nameStr);
} }
else else
{ {
@ -434,7 +360,7 @@ namespace {
return env->CallIntMethod(ref->dataStorePutListener, return env->CallIntMethod(ref->dataStorePutListener,
ref->dataStorePutCallbackMethod, dataStorePutCallbackMethod,
nameStr, bufferObj, secure); nameStr, bufferObj, secure);
} }
} }
@ -448,33 +374,29 @@ namespace {
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); assert(ref->node == node);
JNIEnv *env = ref->env; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
if(ref->packetSenderClass == NULL)
{ jclass packetSenderClass = env->GetObjectClass(ref->packetSender);
ref->packetSenderClass = env->GetObjectClass(ref->packetSender); if(packetSenderClass == NULL)
if(ref->packetSenderClass == NULL)
{ {
LOGE("Couldn't find class for PacketSender instance"); LOGE("Couldn't find class for PacketSender instance");
return -1; return -1;
} }
}
if(ref->packetSenderCallbackMethod == NULL) jmethodID packetSenderCallbackMethod = env->GetMethodID(packetSenderClass,
{
ref->packetSenderCallbackMethod = env->GetMethodID(ref->packetSenderClass,
"onSendPacketRequested", "(Ljava/net/InetSocketAddress;I[B)I"); "onSendPacketRequested", "(Ljava/net/InetSocketAddress;I[B)I");
if(ref->packetSenderCallbackMethod == NULL) if(packetSenderCallbackMethod == NULL)
{ {
LOGE("Couldn't find onSendPacketRequested method"); LOGE("Couldn't find onSendPacketRequested method");
return -2; return -2;
} }
}
jobject addressObj = newInetSocketAddress(env, *address); jobject addressObj = newInetSocketAddress(env, *address);
jbyteArray bufferObj = env->NewByteArray(bufferSize); jbyteArray bufferObj = env->NewByteArray(bufferSize);
env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer); env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
return env->CallIntMethod(ref->packetSender, ref->packetSenderCallbackMethod, addressObj, linkDesparation, bufferObj); return env->CallIntMethod(ref->packetSender, packetSenderCallbackMethod, addressObj, linkDesparation, bufferObj);
} }
typedef std::map<uint64_t, JniRef*> NodeMap; typedef std::map<uint64_t, JniRef*> NodeMap;
@ -506,7 +428,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
ZT1_Node *node; ZT1_Node *node;
JniRef *ref = new JniRef; JniRef *ref = new JniRef;
ref->id = (uint64_t)now; ref->id = (uint64_t)now;
ref->env = env; env->GetJavaVM(&ref->jvm);
jclass cls = env->GetObjectClass(obj); jclass cls = env->GetObjectClass(obj);
jfieldID fid = env->GetFieldID( jfieldID fid = env->GetFieldID(
@ -1019,29 +941,22 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_status
return 0; return 0;
} }
// static so we only have to look these up once jclass nodeStatusClass = NULL;
static jclass nodeStatusClass = NULL; jmethodID nodeStatusConstructor = NULL;
static jmethodID nodeStatusConstructor = NULL;
// create a com.zerotierone.sdk.NodeStatus object // create a com.zerotierone.sdk.NodeStatus object
if(nodeStatusClass == NULL)
{
nodeStatusClass = env->FindClass("com/zerotierone/sdk/NodeStatus"); nodeStatusClass = env->FindClass("com/zerotierone/sdk/NodeStatus");
if(nodeStatusClass == NULL) if(nodeStatusClass == NULL)
{ {
return NULL; return NULL;
} }
}
if(nodeStatusConstructor == NULL)
{
nodeStatusConstructor = env->GetMethodID( nodeStatusConstructor = env->GetMethodID(
nodeStatusClass, "<init>", "()V"); nodeStatusClass, "<init>", "()V");
if(nodeStatusConstructor == NULL) if(nodeStatusConstructor == NULL)
{ {
return NULL; return NULL;
} }
}
jobject nodeStatusObj = env->NewObject(nodeStatusClass, nodeStatusConstructor); jobject nodeStatusObj = env->NewObject(nodeStatusClass, nodeStatusConstructor);
if(nodeStatusObj == NULL) if(nodeStatusObj == NULL)
@ -1052,46 +967,34 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_status
ZT1_NodeStatus nodeStatus; ZT1_NodeStatus nodeStatus;
ZT1_Node_status(node, &nodeStatus); ZT1_Node_status(node, &nodeStatus);
static jfieldID addressField = NULL; jfieldID addressField = NULL;
static jfieldID publicIdentityField = NULL; jfieldID publicIdentityField = NULL;
static jfieldID secretIdentityField = NULL; jfieldID secretIdentityField = NULL;
static jfieldID onlineField = NULL; jfieldID onlineField = NULL;
if(addressField == NULL)
{
addressField = env->GetFieldID(nodeStatusClass, "address", "J"); addressField = env->GetFieldID(nodeStatusClass, "address", "J");
if(addressField == NULL) if(addressField == NULL)
{ {
return NULL; return NULL;
} }
}
if(publicIdentityField == NULL)
{
publicIdentityField = env->GetFieldID(nodeStatusClass, "publicIdentity", "Ljava/lang/String;"); publicIdentityField = env->GetFieldID(nodeStatusClass, "publicIdentity", "Ljava/lang/String;");
if(publicIdentityField == NULL) if(publicIdentityField == NULL)
{ {
return NULL; return NULL;
} }
}
if(secretIdentityField == NULL)
{
secretIdentityField = env->GetFieldID(nodeStatusClass, "secretIdentity", "Ljava/lang/String;"); secretIdentityField = env->GetFieldID(nodeStatusClass, "secretIdentity", "Ljava/lang/String;");
if(secretIdentityField == NULL) if(secretIdentityField == NULL)
{ {
return NULL; return NULL;
} }
}
if(onlineField == NULL)
{
onlineField = env->GetFieldID(nodeStatusClass, "online", "Z"); onlineField = env->GetFieldID(nodeStatusClass, "online", "Z");
if(onlineField == NULL) if(onlineField == NULL)
{ {
return NULL; return NULL;
} }
}
env->SetLongField(nodeStatusObj, addressField, nodeStatus.address); env->SetLongField(nodeStatusObj, addressField, nodeStatus.address);