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

Revert "Disable TPACKET v3 to prevent packets reordering in root mode"

Browse Source 
This reverts commit f715c06be1.

Further testing comparing the dumps produced by simultaneuosly running
PCAPdroid in non-immediate mode with tcpdump in immediate mode has
shown that packets reordering can also occur in immediate mode, so
it does not depend on TPACKET v3.
This commit is contained in:
emanuele-f 2022-01-27 11:59:54 +01:00
parent f715c06be1
commit e1bafef088
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/jni/pcapd/pcapd.c
View File

@ -417,19 +417,7 @@ static int open_interface(pcapd_iface_t *iface, pcapd_runtime_t *rt, const char
/* The snaplen includes the datalink overhead. Max datalink overhead (SLL2): 20 B */
int snaplen = mtu + SLL2_HDR_LEN;
// pcap_set_immediate_mode necessary to avoid using TPACKET v3, which sometimes causes packets
// reordering in the capture
pcap_t *pd;
if(!(pd = pcap_create(ifname, errbuf)) ||
pcap_set_immediate_mode(pd, 1) ||
pcap_set_snaplen(pd, snaplen) ||
pcap_activate(pd)) {
if(pd) {
pcap_close(pd);
pd = NULL;
}
}
pcap_t *pd = pcap_open_live(ifname, snaplen, 0, 1, errbuf);
if(!pd) {
// try to open as file
pd = pcap_open_offline(ifname, errbuf);