mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-02-26 16:13:01 +00:00
Code Issues Releases Wiki Activity

Native fixed start/stop

Browse source
This commit is contained in:
M66B 2016-01-14 07:46:23 +01:00
parent 30e1f17e37
commit 3e4cc108bc
1 changed files with 46 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
app/src/main/jni/netguard/netguard.c
View file

@ -82,8 +82,8 @@ char *hex(const u_int8_t *, const u_int16_t);
// Global variables // Global variables
static JavaVM *jvm; static JavaVM *jvm;
int running = 0;
pthread_t thread_id; pthread_t thread_id;
int signaled = 0;
struct connection *connection = NULL; struct connection *connection = NULL;
// JNI // JNI
@ -92,36 +92,42 @@ JNIEXPORT void JNICALL
Java_eu_faircode_netguard_SinkholeService_jni_1start(JNIEnv *env, jobject instance, jint tun) { Java_eu_faircode_netguard_SinkholeService_jni_1start(JNIEnv *env, jobject instance, jint tun) {
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Starting tun=%d", tun); __android_log_print(ANDROID_LOG_DEBUG, TAG, "Starting tun=%d", tun);
jint rs = (*env)->GetJavaVM(env, &jvm); if (pthread_kill(thread_id, 0) == 0)
if (rs != JNI_OK) __android_log_print(ANDROID_LOG_WARN, TAG, "Already running thread %u", thread_id);
__android_log_print(ANDROID_LOG_ERROR, TAG, "GetJavaVM failed"); else {
jint rs = (*env)->GetJavaVM(env, &jvm);
if (rs != JNI_OK)
__android_log_print(ANDROID_LOG_ERROR, TAG, "GetJavaVM failed");
struct arguments *args = malloc(sizeof(struct arguments)); struct arguments *args = malloc(sizeof(struct arguments));
args->instance = (*env)->NewGlobalRef(env, instance); args->instance = (*env)->NewGlobalRef(env, instance);
args->tun = tun; args->tun = tun;
if (pthread_create(&thread_id, NULL, handle_events, args) != 0) int err = pthread_create(&thread_id, NULL, handle_events, args);
__android_log_print(ANDROID_LOG_ERROR, TAG, "pthread_create error %d: %s", if (err != 0)
errno, strerror(errno)); __android_log_print(ANDROID_LOG_ERROR, TAG, "pthread_create error %d: %s",
else err, strerror(err));
running = 1; }
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_eu_faircode_netguard_SinkholeService_jni_1stop(JNIEnv *env, jobject instance, jint tun) { Java_eu_faircode_netguard_SinkholeService_jni_1stop(JNIEnv *env, jobject instance, jint tun) {
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Stop"); __android_log_print(ANDROID_LOG_DEBUG, TAG, "Stop thread %u", thread_id);
if (running) { if (pthread_kill(thread_id, 0) == 0) {
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Kill"); __android_log_print(ANDROID_LOG_DEBUG, TAG, "Kill thread %u", thread_id);
int err = pthread_kill(thread_id, SIGUSR1); int err = pthread_kill(thread_id, SIGUSR1);
if (err != 0) if (err != 0)
__android_log_print(ANDROID_LOG_WARN, TAG, "pthread_kill error %d", err); __android_log_print(ANDROID_LOG_WARN, TAG, "pthread_kill error %d: %s",
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Join"); err, strerror(err));
pthread_join(thread_id, NULL); else {
if (err != 0) __android_log_print(ANDROID_LOG_DEBUG, TAG, "Join thread %u", thread_id);
__android_log_print(ANDROID_LOG_WARN, TAG, "pthread_join error %d", err); pthread_join(thread_id, NULL);
running = 0; if (err != 0)
__android_log_print(ANDROID_LOG_WARN, TAG, "pthread_join error %d: %s",
err, strerror(err));
}
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Stopped");
} else } else
__android_log_print(ANDROID_LOG_WARN, TAG, "Notrunning"); __android_log_print(ANDROID_LOG_WARN, TAG, "Not running");
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Stopped");
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
@ -136,11 +142,13 @@ Java_eu_faircode_netguard_SinkholeService_jni_1reload(JNIEnv *env, jobject insta
void sig_handler(int sig, siginfo_t *info, void *context) { void sig_handler(int sig, siginfo_t *info, void *context) {
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Signal %d", sig); __android_log_print(ANDROID_LOG_DEBUG, TAG, "Signal %d", sig);
signaled = 1;
} }
void *handle_events(void *a) { void *handle_events(void *a) {
struct arguments *args = (struct arguments *) a; struct arguments *args = (struct arguments *) a;
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Start events tun=%d", args->tun); __android_log_print(ANDROID_LOG_DEBUG, TAG, "Start events tun=%d thread %u", args->tun,
thread_id);
JNIEnv *env; JNIEnv *env;
jint rs = (*jvm)->AttachCurrentThread(jvm, &env, NULL); jint rs = (*jvm)->AttachCurrentThread(jvm, &env, NULL);
@ -168,10 +176,12 @@ void *handle_events(void *a) {
sa.sa_flags = SA_RESTART; sa.sa_flags = SA_RESTART;
sigaction(SIGUSR1, &sa, NULL); sigaction(SIGUSR1, &sa, NULL);
signaled = 0;
// Loop // Loop
while (1) { while (1) {
time_t now = time(NULL); time_t now = time(NULL);
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Select"); __android_log_print(ANDROID_LOG_DEBUG, TAG, "Select thread %u", thread_id);
// Select // Select
FD_ZERO(&rfds); FD_ZERO(&rfds);
@ -252,13 +262,17 @@ void *handle_events(void *a) {
int ready = pselect(max + 1, &rfds, &wfds, &efds, &ts, &emptyset); int ready = pselect(max + 1, &rfds, &wfds, &efds, &ts, &emptyset);
if (ready < 0) { if (ready < 0) {
if (errno == EINTR) { if (errno == EINTR) {
__android_log_print(ANDROID_LOG_INFO, TAG, "pselect interrupted"); if (signaled) { ;
break; __android_log_print(ANDROID_LOG_DEBUG, TAG, "pselect signaled");
break;
} else {
__android_log_print(ANDROID_LOG_WARN, TAG, "pselect interrupted");
continue;
}
} else { } else {
__android_log_print(ANDROID_LOG_ERROR, TAG, "select error %d: %s", __android_log_print(ANDROID_LOG_ERROR, TAG, "select error %d: %s",
errno, strerror(errno)); errno, strerror(errno));
nsleep(1000 * 1000L * 1000L); break;
continue;
} }
} }
@ -335,7 +349,7 @@ void *handle_events(void *a) {
cur->state = TCP_CLOSE; cur->state = TCP_CLOSE;
} }
else if (bytes == 0) { else if (bytes == 0) {
__android_log_print(ANDROID_LOG_ERROR, TAG, "recv socket closed"); __android_log_print(ANDROID_LOG_ERROR, TAG, "recv empty");
cur->state = TCP_CLOSE; cur->state = TCP_CLOSE;
} else { } else {
__android_log_print(ANDROID_LOG_DEBUG, TAG, "recv lport %u bytes %d", __android_log_print(ANDROID_LOG_DEBUG, TAG, "recv lport %u bytes %d",
@ -355,7 +369,8 @@ void *handle_events(void *a) {
__android_log_print(ANDROID_LOG_ERROR, TAG, "DetachCurrentThread failed"); __android_log_print(ANDROID_LOG_ERROR, TAG, "DetachCurrentThread failed");
free(args); free(args);
__android_log_print(ANDROID_LOG_DEBUG, TAG, "Stopped events tun=%d", args->tun); __android_log_print(ANDROID_LOG_DEBUG, TAG, "Stopped events tun=%d thread %u",
args->tun, thread_id);
} }
void handle_tcp(JNIEnv *env, jobject instance, const uint8_t *buffer, uint16_t length) { void handle_tcp(JNIEnv *env, jobject instance, const uint8_t *buffer, uint16_t length) {