denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linked-list: Change interface of callback for invoke_function()

Browse Source 
This avoids the unportable five pointer hack.
This commit is contained in:
Tobias Brunner
2017-05-26 13:56:44 +02:00
parent 5cafea6edd
commit 8a2e4d4a8b
9 changed files with 98 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c
+12 -4
View File
@@ -215,7 +215,7 @@ failed:
/**
* Bypass a single socket
*/
static bool bypass_single_socket(intptr_t fd, private_charonservice_t *this)
static bool bypass_single_socket(private_charonservice_t *this, int fd)
{
JNIEnv *env;
jmethodID method_id;
@@ -242,16 +242,24 @@ failed:
return FALSE;
}
CALLBACK(bypass_single_socket_cb, void,
intptr_t fd, va_list args)
{
private_charonservice_t *this;
VA_ARGS_VGET(args, this);
bypass_single_socket(this, fd);
}
METHOD(charonservice_t, bypass_socket, bool,
private_charonservice_t *this, int fd, int family)
{
if (fd >= 0)
{
this->sockets->insert_last(this->sockets, (void*)(intptr_t)fd);
return bypass_single_socket((intptr_t)fd, this);
return bypass_single_socket(this, fd);
}
this->sockets->invoke_function(this->sockets, (void*)bypass_single_socket,
this);
this->sockets->invoke_function(this->sockets, bypass_single_socket_cb, this);
return TRUE;
}