1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-01-31 03:41:20 +00:00

Clear on unload

This commit is contained in:
M66B 2017-08-12 13:49:21 +02:00
parent 51d6dac142
commit 5f501f16e6

View file

@ -87,6 +87,8 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
void JNI_OnUnload(JavaVM *vm, void *reserved) { void JNI_OnUnload(JavaVM *vm, void *reserved) {
log_android(ANDROID_LOG_INFO, "JNI unload"); log_android(ANDROID_LOG_INFO, "JNI unload");
clear();
JNIEnv *env; JNIEnv *env;
if ((*vm)->GetEnv(vm, (void **) &env, JNI_VERSION_1_6) != JNI_OK) if ((*vm)->GetEnv(vm, (void **) &env, JNI_VERSION_1_6) != JNI_OK)
log_android(ANDROID_LOG_INFO, "JNI load GetEnv failed"); log_android(ANDROID_LOG_INFO, "JNI load GetEnv failed");
@ -188,8 +190,7 @@ Java_eu_faircode_netguard_ServiceSinkhole_jni_1stop(
clear(); clear();
log_android(ANDROID_LOG_WARN, "Stopped thread %x", t); log_android(ANDROID_LOG_WARN, "Stopped thread %x", t);
} } else
else
log_android(ANDROID_LOG_WARN, "Not running thread %x", t); log_android(ANDROID_LOG_WARN, "Not running thread %x", t);
} }
@ -212,12 +213,10 @@ Java_eu_faircode_netguard_ServiceSinkhole_jni_1get_1stats(JNIEnv *env, jobject i
if (s->protocol == IPPROTO_ICMP || s->protocol == IPPROTO_ICMPV6) { if (s->protocol == IPPROTO_ICMP || s->protocol == IPPROTO_ICMPV6) {
if (!s->icmp.stop) if (!s->icmp.stop)
jcount[0]++; jcount[0]++;
} } else if (s->protocol == IPPROTO_UDP) {
else if (s->protocol == IPPROTO_UDP) {
if (s->udp.state == UDP_ACTIVE) if (s->udp.state == UDP_ACTIVE)
jcount[1]++; jcount[1]++;
} } else if (s->protocol == IPPROTO_TCP) {
else if (s->protocol == IPPROTO_TCP) {
if (s->tcp.state != TCP_CLOSING && s->tcp.state != TCP_CLOSE) if (s->tcp.state != TCP_CLOSING && s->tcp.state != TCP_CLOSE)
jcount[2]++; jcount[2]++;
} }
@ -273,8 +272,7 @@ Java_eu_faircode_netguard_ServiceSinkhole_jni_1pcap(
pcap_file = NULL; pcap_file = NULL;
} }
log_android(ANDROID_LOG_WARN, "PCAP disabled"); log_android(ANDROID_LOG_WARN, "PCAP disabled");
} } else {
else {
const char *name = (*env)->GetStringUTFChars(env, name_, 0); const char *name = (*env)->GetStringUTFChars(env, name_, 0);
log_android(ANDROID_LOG_WARN, "PCAP file %s record size %d truncate @%ld", log_android(ANDROID_LOG_WARN, "PCAP file %s record size %d truncate @%ld",
name, pcap_record_size, pcap_file_size); name, pcap_record_size, pcap_file_size);
@ -292,8 +290,7 @@ Java_eu_faircode_netguard_ServiceSinkhole_jni_1pcap(
if (size == 0) { if (size == 0) {
log_android(ANDROID_LOG_WARN, "PCAP initialize"); log_android(ANDROID_LOG_WARN, "PCAP initialize");
write_pcap_hdr(); write_pcap_hdr();
} } else
else
log_android(ANDROID_LOG_WARN, "PCAP current size %ld", size); log_android(ANDROID_LOG_WARN, "PCAP current size %ld", size);
} }