|
|
@ -6,236 +6,134 @@ |
|
|
#include <pthread.h> |
|
|
#include <pthread.h> |
|
|
#include <pEp/keymanagement.h> |
|
|
#include <pEp/keymanagement.h> |
|
|
#include <pEp/message_api.h> |
|
|
#include <pEp/message_api.h> |
|
|
#include <pEp/sync.h> |
|
|
#include <pEp/sync_api.h> |
|
|
|
|
|
#include <pEp/Adapter.hh> |
|
|
|
|
|
|
|
|
#include "throw_pEp_exception.hh" |
|
|
#include "throw_pEp_exception.hh" |
|
|
#include "jniutils.hh" |
|
|
#include "jniutils.hh" |
|
|
|
|
|
|
|
|
extern "C" { |
|
|
namespace pEp { |
|
|
using namespace pEp::JNIAdapter; |
|
|
using namespace pEp::JNIAdapter; |
|
|
using namespace pEp::utility; |
|
|
using namespace pEp::Adapter; |
|
|
|
|
|
using namespace utility; |
|
|
int inject_sync_msg(void *msg, void *arg); |
|
|
|
|
|
static PEP_SESSION sync_session = NULL; |
|
|
thread_local JNIEnv* thread_env = nullptr; |
|
|
|
|
|
thread_local jobject thread_obj = nullptr; |
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_init( |
|
|
|
|
|
JNIEnv *env, |
|
|
jclass messageClass = nullptr; |
|
|
jobject me |
|
|
jclass identityClass = nullptr; |
|
|
) |
|
|
jclass signalClass = nullptr; |
|
|
{ |
|
|
jclass engineClass = nullptr; |
|
|
PEP_SESSION session = NULL; |
|
|
|
|
|
jfieldID handle; |
|
|
jmethodID messageConstructorMethodID = nullptr; |
|
|
|
|
|
jmethodID messageToSendMethodID = nullptr; |
|
|
PEP_STATUS status = init(&session); |
|
|
jmethodID notifyHandShakeMethodID = nullptr; |
|
|
assert(status == PEP_STATUS_OK); |
|
|
jmethodID needsFastPollMethodID = nullptr; |
|
|
|
|
|
|
|
|
if (status != PEP_STATUS_OK) { |
|
|
class JNISync { |
|
|
throw_pEp_Exception(env, status); |
|
|
jobject _obj; |
|
|
return; |
|
|
JNIEnv * _env; |
|
|
} |
|
|
JavaVM * _jvm; |
|
|
|
|
|
JNIEnv * _sync_env; |
|
|
assert(session); |
|
|
jclass _clazz; |
|
|
|
|
|
|
|
|
if(sync_session != NULL){ |
|
|
public: |
|
|
status = attach_sync_session(session, sync_session); |
|
|
JNISync(JNIEnv * env, jobject obj) |
|
|
if (status != PEP_STATUS_OK) { |
|
|
: _env(env), _obj(obj), _jvm(nullptr), _sync_env(nullptr), _clazz(nullptr) { } |
|
|
throw_pEp_Exception(env, status); |
|
|
|
|
|
return; |
|
|
~JNISync() |
|
|
} |
|
|
{ |
|
|
} |
|
|
env()->DeleteLocalRef(clazz()); |
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
handle = getFieldID(env, "org/pEp/jniadapter/Engine", "handle", "J"); |
|
|
|
|
|
} |
|
|
|
|
|
catch (std::exception& ex) { |
|
|
|
|
|
assert(0); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
jlong _session = (jlong) session; |
|
|
jobject obj() { return _obj; } |
|
|
env->SetLongField(me, handle, _session); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_release( |
|
|
|
|
|
JNIEnv *env, |
|
|
|
|
|
jobject me |
|
|
|
|
|
) |
|
|
|
|
|
{ |
|
|
|
|
|
PEP_SESSION session = NULL; |
|
|
|
|
|
jfieldID handle; |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
JavaVM * jvm() |
|
|
handle = getFieldID(env, "org/pEp/jniadapter/Engine", "handle", "J"); |
|
|
{ |
|
|
} |
|
|
if (!_jvm) |
|
|
catch (std::exception& ex) { |
|
|
_env->GetJavaVM(&_jvm); |
|
|
assert(0); |
|
|
return _jvm; |
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
session = (PEP_SESSION) env->GetLongField(me, handle); |
|
|
JNIEnv * env() |
|
|
if (session){ |
|
|
{ |
|
|
if(sync_session != NULL){ |
|
|
if (!_sync_env) { |
|
|
detach_sync_session(session); |
|
|
#ifdef ANDROID |
|
|
|
|
|
jvm()->AttachCurrentThread(&_sync_env, nullptr); |
|
|
|
|
|
#else |
|
|
|
|
|
jvm()->AttachCurrentThread((void **) &_sync_env, nullptr); |
|
|
|
|
|
#endif |
|
|
} |
|
|
} |
|
|
release(session); |
|
|
return _sync_env; |
|
|
} |
|
|
} |
|
|
else |
|
|
|
|
|
env->SetLongField(me, handle, jlong(0)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
int examine_identity(pEp_identity *ident, void *arg) |
|
|
|
|
|
{ |
|
|
|
|
|
locked_queue< pEp_identity * > *queue = (locked_queue< pEp_identity * > *) arg; |
|
|
|
|
|
queue->push_back(identity_dup(ident)); |
|
|
|
|
|
return 0; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
pEp_identity *retrieve_next_identity(void *arg) |
|
|
|
|
|
{ |
|
|
|
|
|
locked_queue< pEp_identity * > *queue = (locked_queue< pEp_identity * > *) arg; |
|
|
|
|
|
|
|
|
|
|
|
while (!queue->size()) |
|
|
|
|
|
usleep(100000); |
|
|
|
|
|
|
|
|
|
|
|
pEp_identity *ident = queue->front(); |
|
|
jclass clazz() |
|
|
queue->pop_front(); |
|
|
{ |
|
|
return ident; |
|
|
if (!_clazz) |
|
|
} |
|
|
_clazz = env()->GetObjectClass(obj()); |
|
|
|
|
|
return _clazz; |
|
|
static void *keyserver_thread_routine(void *arg) |
|
|
|
|
|
{ |
|
|
|
|
|
PEP_STATUS status = do_keymanagement(retrieve_next_identity, arg); |
|
|
|
|
|
|
|
|
|
|
|
locked_queue< pEp_identity * > *queue = (locked_queue< pEp_identity * > *) arg; |
|
|
|
|
|
|
|
|
|
|
|
while (queue->size()) { |
|
|
|
|
|
pEp_identity *ident = queue->front(); |
|
|
|
|
|
queue->pop_front(); |
|
|
|
|
|
free_identity(ident); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
delete queue; |
|
|
void startup_sync() |
|
|
|
|
|
{ |
|
|
return (void *) status; |
|
|
needsFastPollMethodID = env()->GetMethodID( |
|
|
} |
|
|
clazz(), |
|
|
|
|
|
"needsFastPollCallFromC", |
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_startKeyserverLookup( |
|
|
"(Z)I"); |
|
|
JNIEnv *env, |
|
|
assert(needsFastPollMethodID); |
|
|
jobject obj |
|
|
|
|
|
) |
|
|
notifyHandShakeMethodID = env()->GetMethodID( |
|
|
{ |
|
|
clazz(), |
|
|
PEP_SESSION session = (PEP_SESSION) callLongMethod(env, obj, "getHandle"); |
|
|
"notifyHandshakeCallFromC", |
|
|
|
|
|
"(Lorg/pEp/jniadapter/_Identity;Lorg/pEp/jniadapter/_Identity;Lorg/pEp/jniadapter/SyncHandshakeSignal;)I"); |
|
|
pthread_t *thread = NULL; |
|
|
assert(notifyHandShakeMethodID); |
|
|
locked_queue< pEp_identity * > *queue = NULL; |
|
|
|
|
|
|
|
|
|
|
|
jfieldID thread_handle; |
|
|
|
|
|
jfieldID queue_handle; |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
thread_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "keyserverThread", "J"); |
|
|
|
|
|
queue_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "keyserverQueue", "J"); |
|
|
|
|
|
} |
|
|
|
|
|
catch (std::exception& ex) { |
|
|
|
|
|
assert(0); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
thread = (pthread_t *) env->GetLongField(obj, thread_handle); |
|
|
void shutdown_sync() |
|
|
if (thread) |
|
|
{ |
|
|
return; |
|
|
env()->DeleteLocalRef(messageClass); |
|
|
|
|
|
jvm()->DetachCurrentThread(); |
|
|
thread = (pthread_t *) calloc(1, sizeof(pthread_t)); |
|
|
|
|
|
assert(thread); |
|
|
|
|
|
env->SetLongField(obj, thread_handle, (jlong) thread); |
|
|
|
|
|
|
|
|
|
|
|
queue = new locked_queue< pEp_identity * >(); |
|
|
|
|
|
env->SetLongField(obj, queue_handle, (jlong) queue); |
|
|
|
|
|
|
|
|
|
|
|
register_examine_function(session, examine_identity, (void *) queue); |
|
|
|
|
|
|
|
|
|
|
|
pthread_create(thread, NULL, keyserver_thread_routine, (void *) queue); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_stopKeyserverLookup( |
|
|
|
|
|
JNIEnv *env, |
|
|
|
|
|
jobject obj |
|
|
|
|
|
) |
|
|
|
|
|
{ |
|
|
|
|
|
PEP_SESSION session = (PEP_SESSION) callLongMethod(env, obj, "getHandle"); |
|
|
|
|
|
|
|
|
|
|
|
pthread_t *thread = NULL; |
|
|
|
|
|
locked_queue< pEp_identity * > *queue = NULL; |
|
|
|
|
|
|
|
|
|
|
|
jfieldID thread_handle; |
|
|
|
|
|
jfieldID queue_handle; |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
thread_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "keyserverThread", "J"); |
|
|
|
|
|
queue_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "keyserverQueue", "J"); |
|
|
|
|
|
} |
|
|
|
|
|
catch (std::exception& ex) { |
|
|
|
|
|
assert(0); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
thread = (pthread_t *) env->GetLongField(obj, thread_handle); |
|
|
JNISync *o = nullptr; |
|
|
if (!thread) |
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
queue = (locked_queue< pEp_identity * > *) env->GetLongField(obj, queue_handle); |
|
|
|
|
|
|
|
|
|
|
|
env->SetLongField(obj, queue_handle, (jlong) 0); |
|
|
PEP_STATUS messageToSend(message *msg) |
|
|
env->SetLongField(obj, thread_handle, (jlong) 0); |
|
|
{ |
|
|
|
|
|
jobject msg_ = nullptr; |
|
|
|
|
|
|
|
|
register_examine_function(session, NULL, NULL); |
|
|
msg_ = thread_env->NewObject(messageClass, messageConstructorMethodID, (jlong) msg); |
|
|
|
|
|
jint result = thread_env->CallIntMethod(thread_obj, messageToSendMethodID, msg_); |
|
|
|
|
|
|
|
|
queue->push_front(NULL); |
|
|
return (PEP_STATUS) result; |
|
|
pthread_join(*thread, NULL); |
|
|
|
|
|
free(thread); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
PEP_STATUS notifyHandshake(pEp_identity *me, pEp_identity *partner, sync_handshake_signal signal) |
|
|
// Sync message callbacks, queue, and thread
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
|
|
static jobject sync_obj = NULL; |
|
|
|
|
|
static JNIEnv* sync_env = NULL; |
|
|
|
|
|
static jmethodID needsFastPollMethodID = NULL; |
|
|
|
|
|
static jmethodID notifyHandShakeMethodID = NULL; |
|
|
|
|
|
static jmethodID messageToSendMethodID = NULL; |
|
|
|
|
|
static jclass messageClass = NULL; |
|
|
|
|
|
static jclass identityClass = NULL; |
|
|
|
|
|
static jclass signalClass = NULL; |
|
|
|
|
|
static jmethodID messageConstructorMethodID = NULL; |
|
|
|
|
|
|
|
|
|
|
|
// Called by sync thread only
|
|
|
|
|
|
PEP_STATUS notify_handshake(void *obj, pEp_identity *me, pEp_identity *partner, sync_handshake_signal signal) |
|
|
|
|
|
{ |
|
|
{ |
|
|
jobject me_ = NULL; |
|
|
jobject me_ = nullptr; |
|
|
jobject partner_ = NULL; |
|
|
jobject partner_ = nullptr; |
|
|
|
|
|
|
|
|
me_ = from_identity(sync_env, me, identityClass); |
|
|
me_ = from_identity(thread_env, me, identityClass); |
|
|
partner_ = from_identity(sync_env, partner, identityClass); |
|
|
partner_ = from_identity(thread_env, partner, identityClass); |
|
|
|
|
|
|
|
|
jobject signal_ = NULL; |
|
|
jobject signal_ = nullptr; |
|
|
{ |
|
|
{ |
|
|
assert(signalClass); |
|
|
assert(signalClass); |
|
|
jmethodID method_values = sync_env->GetStaticMethodID(signalClass, "values", |
|
|
jmethodID method_values = o->env()->GetStaticMethodID(signalClass, "values", |
|
|
"()[Lorg/pEp/jniadapter/SyncHandshakeSignal;"); |
|
|
"()[Lorg/pEp/jniadapter/SyncHandshakeSignal;"); |
|
|
assert(method_values); |
|
|
assert(method_values); |
|
|
jfieldID field_value = sync_env->GetFieldID(signalClass, "value", "I"); |
|
|
jfieldID field_value = o->env()->GetFieldID(signalClass, "value", "I"); |
|
|
assert(field_value); |
|
|
assert(field_value); |
|
|
|
|
|
|
|
|
jobjectArray values = (jobjectArray) sync_env->CallStaticObjectMethod(signalClass, |
|
|
jobjectArray values = (jobjectArray) o->env()->CallStaticObjectMethod(signalClass, |
|
|
method_values); |
|
|
method_values); |
|
|
assert(values); |
|
|
assert(values); |
|
|
|
|
|
|
|
|
jsize values_size = sync_env->GetArrayLength(values); |
|
|
jsize values_size = o->env()->GetArrayLength(values); |
|
|
for (jsize i = 0; i < values_size; i++) { |
|
|
for (jsize i = 0; i < values_size; i++) { |
|
|
jobject element = sync_env->GetObjectArrayElement(values, i); |
|
|
jobject element = o->env()->GetObjectArrayElement(values, i); |
|
|
assert(element); |
|
|
assert(element); |
|
|
jint value = sync_env->GetIntField(element, field_value); |
|
|
jint value = o->env()->GetIntField(element, field_value); |
|
|
if (value == (jint) signal) { |
|
|
if (value == (jint) signal) { |
|
|
signal_ = element; |
|
|
signal_ = element; |
|
|
break; |
|
|
break; |
|
|
@ -243,154 +141,114 @@ extern "C" { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
jint result = sync_env->CallIntMethod(sync_obj, notifyHandShakeMethodID, me_, partner_, signal_); |
|
|
jint result = o->env()->CallIntMethod(o->obj(), notifyHandShakeMethodID, me_, partner_, signal_); |
|
|
|
|
|
|
|
|
return (PEP_STATUS) result; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Called by sync thread only
|
|
|
|
|
|
PEP_STATUS message_to_send(void *obj, message *msg) |
|
|
|
|
|
{ |
|
|
|
|
|
jobject msg_ = NULL; |
|
|
|
|
|
|
|
|
|
|
|
msg_ = sync_env->NewObject(messageClass, messageConstructorMethodID, (jlong) msg); |
|
|
|
|
|
|
|
|
|
|
|
jint result = sync_env->CallIntMethod(sync_obj, messageToSendMethodID, msg_); |
|
|
|
|
|
|
|
|
|
|
|
return (PEP_STATUS) result; |
|
|
return (PEP_STATUS) result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// called indirectly by decrypt message
|
|
|
} |
|
|
int inject_sync_msg(void *msg, void *arg) |
|
|
|
|
|
{ |
|
|
|
|
|
if(arg == NULL) |
|
|
|
|
|
return 1; |
|
|
|
|
|
|
|
|
|
|
|
locked_queue< sync_msg_t * > *queue = (locked_queue< sync_msg_t * > *) arg; |
|
|
|
|
|
|
|
|
|
|
|
queue->push_back((sync_msg_t *)msg); |
|
|
extern "C" { |
|
|
return 0; |
|
|
using namespace pEp; |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void *retrieve_next_sync_msg(void *arg, time_t *timeout) |
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_init( |
|
|
|
|
|
JNIEnv *env, |
|
|
|
|
|
jobject me |
|
|
|
|
|
) |
|
|
{ |
|
|
{ |
|
|
locked_queue< sync_msg_t * > *queue = (locked_queue< sync_msg_t * > *) arg; |
|
|
thread_env = env; |
|
|
|
|
|
thread_obj = me; |
|
|
|
|
|
|
|
|
time_t now, end; |
|
|
assert(o == nullptr); |
|
|
void *msg; |
|
|
o = new JNISync(env, me); |
|
|
|
|
|
|
|
|
jboolean needs_fast_poll = (*timeout != 0); |
|
|
if (!messageClass) |
|
|
|
|
|
messageClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/Message"))); |
|
|
|
|
|
|
|
|
if(timeout && *timeout != 0){ |
|
|
if (!identityClass) |
|
|
now = time(NULL); |
|
|
identityClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/_Identity"))); |
|
|
end = now + *timeout; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
sync_env->CallIntMethod(sync_obj, needsFastPollMethodID, needs_fast_poll); |
|
|
if (!signalClass) |
|
|
|
|
|
signalClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/SyncHandshakeSignal"))); |
|
|
|
|
|
|
|
|
while (!queue->size()){ |
|
|
if (!engineClass) |
|
|
// TODO: add blocking dequeue
|
|
|
engineClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/Engine"))); |
|
|
usleep(100000); |
|
|
|
|
|
|
|
|
|
|
|
if(timeout && *timeout != 0){ |
|
|
if (!messageConstructorMethodID) |
|
|
now = time(NULL); |
|
|
messageConstructorMethodID = env->GetMethodID(messageClass, "<init>", "(J)V"); |
|
|
if(now > end) |
|
|
|
|
|
return NULL; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(timeout && *timeout != 0){ |
|
|
if (!messageToSendMethodID) { |
|
|
// put back remaining time in timeout
|
|
|
messageToSendMethodID = env->GetMethodID( |
|
|
now = time(NULL); |
|
|
engineClass, |
|
|
if(now < end) |
|
|
"messageToSendCallFromC", |
|
|
*timeout = end - now; |
|
|
"(Lorg/pEp/jniadapter/Message;)I"); |
|
|
else |
|
|
assert(messageToSendMethodID); |
|
|
*timeout = 0; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
msg = queue->front(); |
|
|
startup<JNISync>(messageToSend, notifyHandshake, o, &JNISync::startup_sync, &JNISync::shutdown_sync); |
|
|
queue->pop_front(); |
|
|
|
|
|
return msg; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
typedef struct _sync_thread_arg_t { |
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_release( |
|
|
PEP_SESSION session; |
|
|
JNIEnv *env, |
|
|
locked_queue< sync_msg_t * > *queue; |
|
|
jobject me |
|
|
JavaVM* sync_jvm; |
|
|
) |
|
|
} sync_thread_arg_t; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void *sync_thread_routine(void *arg) |
|
|
|
|
|
{ |
|
|
{ |
|
|
sync_thread_arg_t *a = (sync_thread_arg_t*)arg; |
|
|
shutdown(); |
|
|
PEP_SESSION session = (PEP_SESSION) a->session; |
|
|
delete o; |
|
|
#ifdef ANDROID |
|
|
session(pEp::Adapter::release); |
|
|
a->sync_jvm->AttachCurrentThread(&sync_env, NULL); |
|
|
} |
|
|
#else |
|
|
|
|
|
a->sync_jvm->AttachCurrentThread((void **) &sync_env, NULL); |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
jclass clazz = sync_env->GetObjectClass(sync_obj); |
|
|
|
|
|
|
|
|
|
|
|
needsFastPollMethodID = sync_env->GetMethodID( |
|
|
|
|
|
clazz, |
|
|
|
|
|
"needsFastPollCallFromC", |
|
|
|
|
|
"(Z)I"); |
|
|
|
|
|
assert(needsFastPollMethodID); |
|
|
|
|
|
|
|
|
|
|
|
notifyHandShakeMethodID = sync_env->GetMethodID( |
|
|
|
|
|
clazz, |
|
|
|
|
|
"notifyHandshakeCallFromC", |
|
|
|
|
|
"(Lorg/pEp/jniadapter/_Identity;Lorg/pEp/jniadapter/_Identity;Lorg/pEp/jniadapter/SyncHandshakeSignal;)I"); |
|
|
|
|
|
assert(notifyHandShakeMethodID); |
|
|
|
|
|
|
|
|
|
|
|
messageToSendMethodID = sync_env->GetMethodID( |
|
|
int examine_identity(pEp_identity *ident, void *arg) |
|
|
clazz, |
|
|
{ |
|
|
"messageToSendCallFromC", |
|
|
locked_queue< pEp_identity * > *queue = (locked_queue< pEp_identity * > *) arg; |
|
|
"(Lorg/pEp/jniadapter/Message;)I"); |
|
|
queue->push_back(identity_dup(ident)); |
|
|
assert(messageToSendMethodID); |
|
|
return 0; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
sync_env->DeleteLocalRef(clazz); |
|
|
pEp_identity *retrieve_next_identity(void *arg) |
|
|
|
|
|
{ |
|
|
|
|
|
locked_queue< pEp_identity * > *queue = (locked_queue< pEp_identity * > *) arg; |
|
|
|
|
|
|
|
|
|
|
|
while (!queue->size()) |
|
|
|
|
|
usleep(100000); |
|
|
|
|
|
|
|
|
PEP_STATUS status = do_sync_protocol(session, a->queue); |
|
|
pEp_identity *ident = queue->front(); |
|
|
|
|
|
queue->pop_front(); |
|
|
|
|
|
return ident; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
locked_queue< sync_msg_t * > *queue = (locked_queue< sync_msg_t * > *) arg; |
|
|
static void *keyserver_thread_routine(void *arg) |
|
|
|
|
|
{ |
|
|
|
|
|
PEP_STATUS status = do_keymanagement(retrieve_next_identity, arg); |
|
|
|
|
|
locked_queue< pEp_identity * > *queue = (locked_queue< pEp_identity * > *) arg; |
|
|
|
|
|
|
|
|
while (queue->size()) { |
|
|
while (queue->size()) { |
|
|
sync_msg_t *msg = queue->front(); |
|
|
pEp_identity *ident = queue->front(); |
|
|
queue->pop_front(); |
|
|
queue->pop_front(); |
|
|
free_sync_msg(msg); |
|
|
free_identity(ident); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
sync_env->DeleteLocalRef(messageClass); |
|
|
|
|
|
|
|
|
|
|
|
a->sync_jvm->DetachCurrentThread(); |
|
|
|
|
|
|
|
|
|
|
|
delete queue; |
|
|
delete queue; |
|
|
free(a); |
|
|
|
|
|
|
|
|
|
|
|
return (void *) status; |
|
|
return (void *) status; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_startSync( |
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_startKeyserverLookup( |
|
|
JNIEnv *env, |
|
|
JNIEnv *env, |
|
|
jobject obj |
|
|
jobject obj |
|
|
) |
|
|
) |
|
|
{ |
|
|
{ |
|
|
LOGD("Start Sync"); |
|
|
|
|
|
PEP_SESSION session = (PEP_SESSION) callLongMethod(env, obj, "getHandle"); |
|
|
PEP_SESSION session = (PEP_SESSION) callLongMethod(env, obj, "getHandle"); |
|
|
|
|
|
|
|
|
pthread_t *thread = NULL; |
|
|
pthread_t *thread = nullptr; |
|
|
locked_queue< sync_msg_t * > *queue = NULL; |
|
|
locked_queue< pEp_identity * > *queue = nullptr; |
|
|
|
|
|
|
|
|
jfieldID thread_handle; |
|
|
jfieldID thread_handle; |
|
|
jfieldID queue_handle; |
|
|
jfieldID queue_handle; |
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
thread_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "syncThread", "J"); |
|
|
thread_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "keyserverThread", "J"); |
|
|
queue_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "syncQueue", "J"); |
|
|
queue_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "keyserverQueue", "J"); |
|
|
} |
|
|
} |
|
|
catch (std::exception& ex) { |
|
|
catch (std::exception& ex) { |
|
|
assert(0); |
|
|
assert(0); |
|
|
@ -405,51 +263,30 @@ extern "C" { |
|
|
assert(thread); |
|
|
assert(thread); |
|
|
env->SetLongField(obj, thread_handle, (jlong) thread); |
|
|
env->SetLongField(obj, thread_handle, (jlong) thread); |
|
|
|
|
|
|
|
|
queue = new locked_queue< sync_msg_t * >(); |
|
|
queue = new locked_queue< pEp_identity * >(); |
|
|
env->SetLongField(obj, queue_handle, (jlong) queue); |
|
|
env->SetLongField(obj, queue_handle, (jlong) queue); |
|
|
|
|
|
|
|
|
// for callbacks
|
|
|
register_examine_function(session, examine_identity, (void *) queue); |
|
|
sync_obj = env->NewGlobalRef(obj); |
|
|
|
|
|
sync_thread_arg_t *a = (sync_thread_arg_t*) malloc(sizeof(sync_thread_arg_t)); |
|
|
|
|
|
assert(a); |
|
|
|
|
|
a->session = session; |
|
|
|
|
|
a->queue = queue; |
|
|
|
|
|
messageClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/Message"))); |
|
|
|
|
|
identityClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/_Identity"))); |
|
|
|
|
|
signalClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/SyncHandshakeSignal"))); |
|
|
|
|
|
messageConstructorMethodID = env->GetMethodID(messageClass, "<init>", "(J)V"); |
|
|
|
|
|
|
|
|
|
|
|
env->GetJavaVM(&a->sync_jvm); |
|
|
|
|
|
|
|
|
|
|
|
sync_session = session; |
|
|
|
|
|
|
|
|
|
|
|
register_sync_callbacks(session, |
|
|
|
|
|
(void *) queue, |
|
|
|
|
|
message_to_send, |
|
|
|
|
|
notify_handshake, |
|
|
|
|
|
inject_sync_msg, |
|
|
|
|
|
retrieve_next_sync_msg); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pthread_create(thread, NULL, sync_thread_routine, (void *) a); |
|
|
pthread_create(thread, nullptr, keyserver_thread_routine, (void *) queue); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_stopSync( |
|
|
JNIEXPORT void JNICALL Java_org_pEp_jniadapter_AbstractEngine_stopKeyserverLookup( |
|
|
JNIEnv *env, |
|
|
JNIEnv *env, |
|
|
jobject obj |
|
|
jobject obj |
|
|
) |
|
|
) |
|
|
{ |
|
|
{ |
|
|
PEP_SESSION session = (PEP_SESSION) callLongMethod(env, obj, "getHandle"); |
|
|
PEP_SESSION session = (PEP_SESSION) callLongMethod(env, obj, "getHandle"); |
|
|
|
|
|
|
|
|
pthread_t *thread = NULL; |
|
|
pthread_t *thread = nullptr; |
|
|
locked_queue< sync_msg_t * > *queue = NULL; |
|
|
locked_queue< pEp_identity * > *queue = nullptr; |
|
|
|
|
|
|
|
|
jfieldID thread_handle; |
|
|
jfieldID thread_handle; |
|
|
jfieldID queue_handle; |
|
|
jfieldID queue_handle; |
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
thread_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "syncThread", "J"); |
|
|
thread_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "keyserverThread", "J"); |
|
|
queue_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "syncQueue", "J"); |
|
|
queue_handle = getFieldID(env, "org/pEp/jniadapter/Engine", "keyserverQueue", "J"); |
|
|
} |
|
|
} |
|
|
catch (std::exception& ex) { |
|
|
catch (std::exception& ex) { |
|
|
assert(0); |
|
|
assert(0); |
|
|
@ -460,28 +297,17 @@ extern "C" { |
|
|
if (!thread) |
|
|
if (!thread) |
|
|
return; |
|
|
return; |
|
|
|
|
|
|
|
|
queue = (locked_queue< sync_msg_t * > *) env->GetLongField(obj, queue_handle); |
|
|
queue = (locked_queue< pEp_identity * > *) env->GetLongField(obj, queue_handle); |
|
|
|
|
|
|
|
|
env->SetLongField(obj, queue_handle, (jlong) 0); |
|
|
env->SetLongField(obj, queue_handle, (jlong) 0); |
|
|
env->SetLongField(obj, thread_handle, (jlong) 0); |
|
|
env->SetLongField(obj, thread_handle, (jlong) 0); |
|
|
|
|
|
|
|
|
sync_session = NULL; |
|
|
register_examine_function(session, nullptr, nullptr); |
|
|
|
|
|
|
|
|
unregister_sync_callbacks(session); |
|
|
|
|
|
env->DeleteGlobalRef(sync_obj); |
|
|
|
|
|
env->DeleteGlobalRef(messageClass); |
|
|
|
|
|
env->DeleteGlobalRef(identityClass); |
|
|
|
|
|
env->DeleteGlobalRef(signalClass); |
|
|
|
|
|
|
|
|
|
|
|
sync_obj = NULL; |
|
|
queue->push_front(nullptr); |
|
|
messageClass = NULL; |
|
|
pthread_join(*thread, nullptr); |
|
|
identityClass = NULL; |
|
|
|
|
|
signalClass = NULL; |
|
|
|
|
|
|
|
|
|
|
|
queue->push_front(NULL); |
|
|
|
|
|
pthread_join(*thread, NULL); |
|
|
|
|
|
free(thread); |
|
|
free(thread); |
|
|
} |
|
|
} |
|
|
} // extern "C"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // extern "C"
|
|
|
|
|
|
|
|
|
|
Volker Birk
7 years ago