Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-24 17:33:46 +00:00
Code Releases Activity

fix jni

Browse Source
This commit is contained in:
Max Lv
2014-05-09 20:06:10 +08:00
parent 815c61f853
commit 11c9030120
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android.cpp
+13 -11
View File
@@ -58,9 +58,6 @@ private:
static UnionJNIEnvToVoid uenv;
static jmethodID newProtectedSocketMethod = NULL;
static jmethodID freeProtectedSocketMethod = NULL;
static jclass clazz = NULL;
static const char *classPathName = "com/github/shadowsocks/Daemon";
int main (int argc, char **argv);
@@ -93,15 +90,18 @@ jint Java_com_github_shadowsocks_daemon_exec(JNIEnv *env, jobject thiz, jobjectA
/*
* Register several native methods for one class.
*/
static int registerNativeMethods(JNIEnv* env, const char* className)
static int registerNativeMethods(JNIEnv* env)
{
jclass clazz = NULL;
const char *daemonClassPathName = "com/github/shadowsocks/Daemon";
const char *vpnClassPathName = "com/github/shadowsocks/ShadowsocksVPNService";
clazz = env->FindClass(vpnClassPathName);
if (clazz == NULL)
{
clazz = env->FindClass(className);
}
if (clazz == NULL)
{
LOGE("Native registration unable to find class '%s'", className);
LOGE("Native registration unable to find class '%s'", vpnClassPathName);
return JNI_FALSE;
}
newProtectedSocketMethod = env->GetStaticMethodID(clazz, "newProtectedSocket", "()I");
@@ -117,13 +117,15 @@ static int registerNativeMethods(JNIEnv* env, const char* className)
return JNI_FALSE;
}
clazz = env->FindClass(daemonClassPathName);
JNINativeMethod methods[] = {
{ "exec", "([Ljava/lang/String;)I",
(void*) Java_com_github_shadowsocks_daemon_exec }
};
if (env->RegisterNatives(clazz, methods, 1) < 0) {
LOGE("RegisterNatives failed for '%s'", className);
LOGE("RegisterNatives failed for '%s'", daemonClassPathName);
return JNI_FALSE;
}
@@ -163,7 +165,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
}
env = uenv.env;
if (registerNativeMethods(env, classPathName) != JNI_TRUE) {
if (registerNativeMethods(env) != JNI_TRUE) {
LOGE("ERROR: registerNatives failed");
goto bail;
}