ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-19 11:16:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DataStoreGet and Put and EventListener appear to work

Browse Source
This commit is contained in:
Grant Limberg 2015-04-29 21:20:12 -07:00
parent 7e0cc28a89
commit 9464504e4a
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
java/jni/com_zerotierone_sdk_Node.cpp
View File

@ -285,7 +285,7 @@ namespace {
if(dataStoreGetClass == NULL) if(dataStoreGetClass == NULL)
{ {
LOGE("Couldn't find class for DataStoreGetListener instance"); LOGE("Couldn't find class for DataStoreGetListener instance");
return -1; return -2;
} }
jmethodID dataStoreGetCallbackMethod = env->GetMethodID( jmethodID dataStoreGetCallbackMethod = env->GetMethodID(
@ -301,21 +301,40 @@ namespace {
jstring nameStr = env->NewStringUTF(objectName); jstring nameStr = env->NewStringUTF(objectName);
if(nameStr == NULL) if(nameStr == NULL)
{ {
return -3; // out of memory LOGE("Error creating name string object");
return -2; // out of memory
} }
jbyteArray bufferObj = env->NewByteArray(bufferSize); jbyteArray bufferObj = env->NewByteArray(bufferSize);
if(bufferObj == NULL)
{
LOGE("Error creating byte[] buffer of size: %lu", bufferSize);
return -2;
}
jlongArray objectSizeObj = env->NewLongArray(1); jlongArray objectSizeObj = env->NewLongArray(1);
if(objectSizeObj == NULL)
{
LOGE("Error creating long[1] array for actual object size");
return -2; // couldn't create long[1] array
}
LOGD("Calling onDataStoreGet(%s, %p, %lu, %p)",
objectName, buffer, bufferIndex, objectSizeObj);
long retval = env->CallLongMethod( long retval = env->CallLongMethod(
ref->dataStoreGetListener, dataStoreGetCallbackMethod, ref->dataStoreGetListener, dataStoreGetCallbackMethod,
nameStr, bufferObj, bufferIndex, objectSizeObj); nameStr, bufferObj, (jlong)bufferIndex, objectSizeObj);
if(retval > 0)
{
env->GetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer); env->GetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
env->GetLongArrayRegion(objectSizeObj, 0, 1, (jlong*)&out_objectSize); env->GetLongArrayRegion(objectSizeObj, 0, 1, (jlong*)out_objectSize);
env->ReleaseByteArrayElements(bufferObj, (jbyte*)buffer, 0); env->ReleaseByteArrayElements(bufferObj, (jbyte*)buffer, 0);
env->ReleaseLongArrayElements(objectSizeObj, (jlong*)&out_objectSize, 0); env->ReleaseLongArrayElements(objectSizeObj, (jlong*)out_objectSize, 0);
}
LOGI("Out Object Size: %lu", *out_objectSize);
return retval; return retval;
} }