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

Fix invalid capture stats

Browse Source 
Bug was introduced in 275eefa
This commit is contained in:
emanuele-f 2023-01-15 10:08:06 +01:00
parent 6483b53bca
commit 9628fd6ce9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/jni/core/jni_impl.c
View File

@ -74,7 +74,7 @@ static void sendStatsDump(pcapdroid_t *pd) {
const zdtun_statistics_t *stats = &pd->stats;
jstring allocs_summary =
#ifdef PCAPDROID_TRACK_ALLOCS
(*pd->env)->NewStringUTF(pd->env, get_allocs_summary());
(*pd->env)->NewStringUTF(pd->env, get_allocs_summary());
#else
NULL;
#endif
@ -92,7 +92,7 @@ static void sendStatsDump(pcapdroid_t *pd) {
(*env)->CallVoidMethod(env, stats_obj, mids.statsSetData,
allocs_summary,
capstats->sent_bytes, capstats->rcvd_bytes,
pd->pcap_dump.dumper ? pcap_get_dump_size(pd->pcap_dump.dumper) : 0,
(jlong)(pd->pcap_dump.dumper ? pcap_get_dump_size(pd->pcap_dump.dumper) : 0),
capstats->sent_pkts, capstats->rcvd_pkts,
min(pd->num_dropped_pkts, INT_MAX), pd->num_dropped_connections,
stats->num_open_sockets, stats->all_max_fd, active_conns, tot_conns,

2
app/src/main/jni/core/pcap_dump.c
View File

@ -297,7 +297,7 @@ bool pcap_check_export(pcap_dumper_t *dumper) {
/* ******************************************************* */
int pcap_get_dump_size(pcap_dumper_t *dumper) {
uint64_t pcap_get_dump_size(pcap_dumper_t *dumper) {
return dumper->dump_size;
}

2
app/src/main/jni/core/pcap_dump.h
View File

@ -128,7 +128,7 @@ void pcap_destroy_dumper(pcap_dumper_t *dumper);
bool pcap_dump_packet(pcap_dumper_t *dumper, const char *pkt, int pktlen, const struct timeval *tv, int uid);
bool pcap_dump_secret(pcap_dumper_t *dumper, int8_t *sec_data, int seclen);
int pcap_get_preamble(pcap_dumper_t *dumper, char **out);
int pcap_get_dump_size(pcap_dumper_t *dumper);
uint64_t pcap_get_dump_size(pcap_dumper_t *dumper);
bool pcap_check_export(pcap_dumper_t *dumper);
#endif // __MY_PCAP_H__