ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV9: Pcap loop instead of returning on invalid packet 

Should improve pcap bridged performance when lots of unrelated network traffic is present.
This commit is contained in:
TheLastRar 2023-01-22 17:14:07 +00:00 committed by refractionpcsx2
parent dc9f61e70a
commit bf21254b13
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcsx2/DEV9/pcap_io.cpp
View File

@ -150,12 +150,14 @@ bool PCAPAdapter::recv(NetPacket* pkt)
pcap_pkthdr* header; pcap_pkthdr* header;
const u_char* pkt_data; const u_char* pkt_data;
if (pcap_next_ex(hpcap, &header, &pkt_data) > 0) // pcap bridged will pick up packets not intended for us, returning false on those packets will incur a 1ms wait.
// This delays getting packets we need, so instead loop untill a valid packet, or no packet, is returned from pcap_next_ex.
while (pcap_next_ex(hpcap, &header, &pkt_data) > 0)
{ {
if (header->len > sizeof(pkt->buffer)) if (header->len > sizeof(pkt->buffer))
{ {
Console.Error("DEV9: Dropped jumbo frame of size: %u", header->len); Console.Error("DEV9: Dropped jumbo frame of size: %u", header->len);
return false; continue;
} }
pxAssert(header->len == header->caplen); pxAssert(header->len == header->caplen);
@ -168,17 +170,16 @@ bool PCAPAdapter::recv(NetPacket* pkt)
if (hpcap_dumper) if (hpcap_dumper)
pcap_dump((u_char*)hpcap_dumper, header, pkt_data); pcap_dump((u_char*)hpcap_dumper, header, pkt_data);
}
else
return false;
if (VerifyPkt(pkt, header->len)) if (VerifyPkt(pkt, header->len))
{ {
InspectRecv(pkt); InspectRecv(pkt);
return true; return true;
}
// continue.
} }
else
return false; return false;
} }
//sends the packet .rv :true success //sends the packet .rv :true success
bool PCAPAdapter::send(NetPacket* pkt) bool PCAPAdapter::send(NetPacket* pkt)