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

Use monotonic timer for root purging logic

Browse Source
This commit is contained in:
emanuele-f 2021-07-06 18:43:35 +02:00
parent fa4fdb1e1b
commit dfeb9e5006
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/jni/vpnproxy-jni/capture_root.c
View File

@ -329,6 +329,7 @@ static void handle_packet(vpnproxy_data_t *proxy, pcap_conn_t **connections, pca
}
proxy->last_pkt_ts = hdr->ts;
conn->data->last_update_ms = proxy->now_ms;
uint64_t pkt_ms = (uint64_t)hdr->ts.tv_sec * 1000 + hdr->ts.tv_usec / 1000;
account_packet(proxy, &pkt, from_tun, &conn->tuple, conn->data, pkt_ms);
@ -340,7 +341,6 @@ static void handle_packet(vpnproxy_data_t *proxy, pcap_conn_t **connections, pca
static void purge_expired_connections(vpnproxy_data_t *proxy, pcap_conn_t **connections, uint8_t purge_all) {
pcap_conn_t *conn, *tmp;
uint64_t last_pkt_ms = timeval2ms(&proxy->last_pkt_ts);
HASH_ITER(hh, *connections, conn, tmp) {
uint64_t timeout = 0;
@ -357,7 +357,7 @@ static void purge_expired_connections(vpnproxy_data_t *proxy, pcap_conn_t **conn
break;
}
if(purge_all || (last_pkt_ms >= (conn->data->last_seen + timeout))) {
if(purge_all || (proxy->now_ms >= (conn->data->last_update_ms + timeout))) {
//log_d("IDLE (type=%d)", conn->tuple.ipproto);
// The connection data will be purged

1
app/src/main/jni/vpnproxy-jni/vpnproxy.h
View File

@ -64,6 +64,7 @@ typedef struct conn_data {
struct ndpi_id_struct *src_id, *dst_id;
ndpi_protocol l7proto;
uint64_t last_update_ms; // like last_seen but monotonic (only root)
jlong first_seen;
jlong last_seen;
jlong sent_bytes;