CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-06-19 21:05:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Manually free local references in sendConnectionsDump

Browse Source 
This is needed to avoid the "local reference table overflow" error.
Also impose a maximum number for dumped connections.
This commit is contained in:
emanuele-f 2020-02-19 19:53:48 +01:00
parent 8c89b5508a
commit 6d665bf9d8
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/jni/vpnproxy-jni/vpnproxy.c
View File

@ -30,6 +30,7 @@
#define MAX_JAVA_DUMP_DELAY_MS 1000
#define MAX_DPI_PACKETS 12
#define JAVA_PCAP_BUFFER_SIZE (1*1024*1204)
#define MAX_NUM_CONNECTIONS_DUMPED 64
/* ******************************************************* */
@ -681,7 +682,12 @@ static int connection_dumper(zdtun_t *tun, const zdtun_conn_t *conn_info, void *
data->uid);
#endif
if(dump_data->idx >= dump_data->num_connections) {
if(dump_data->idx >= MAX_NUM_CONNECTIONS_DUMPED) {
__android_log_print(ANDROID_LOG_INFO, VPN_TAG, "Max connections reached, %d skipped.", (dump_data->num_connections - dump_data->idx));
/* Abort */
return(1);
} else if(dump_data->idx >= dump_data->num_connections) {
/* Cannot proceed as dump_data->connections would overflow */
__android_log_print(ANDROID_LOG_ERROR, VPN_TAG, "Connections count is inconsistent! num_connections=%d",
dump_data->num_connections);
@ -709,6 +715,15 @@ static int connection_dumper(zdtun_t *tun, const zdtun_conn_t *conn_info, void *
(*env)->SetObjectArrayElement(env, dump_data->connections, dump_data->idx++, conn_descriptor);
data->notified = true;
/* Free local references manually as we are running in a loop and java can't free them
* automatically until the native method returns. */
(*env)->DeleteLocalRef(env, info_string);
(*env)->DeleteLocalRef(env, url_string);
(*env)->DeleteLocalRef(env, proto_string);
(*env)->DeleteLocalRef(env, src_string);
(*env)->DeleteLocalRef(env, dst_string);
(*env)->DeleteLocalRef(env, conn_descriptor);
/* Continue */
return(0);
}