DEV9: Drop looped IP packets

PCSX2 · Nov 21, 2024 · 5f134a1 · 5f134a1
1 parent 5a37e3a
commit 5f134a1
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/pcsx2/DEV9/pcap_io.cpp b/pcsx2/DEV9/pcap_io.cpp
@@ -191,11 +191,17 @@ bool PCAPAdapter::recv(NetPacket* pkt)
 				continue;
 			}
 
+			// Avoid pcap looping packets by checking IP
+			IP_Packet ipPkt(const_cast<u_char*>(pkt_data), header->len);
+			if (ipPkt.sourceIP == ps2IP)
+			{
+				continue;
+			}
+
 			pxAssert(header->len == header->caplen);
 
 			// Build EtherFrame using captured packet
 			PayloadPtr* pl = new PayloadPtr(const_cast<u_char*>(pkt_data), header->len);
-			IP_Packet test(const_cast<u_char*>(pkt_data), header->len, false);
 			EthernetFrame frame(pl);
 			frame.sourceMAC = internalMAC;
 			frame.destinationMAC = ps2MAC;
@@ -238,6 +244,11 @@ bool PCAPAdapter::send(NetPacket* pkt)
 			PayloadPtr* payload = frame.GetPayload();
 			IP_Packet pkt(payload->data, payload->GetLength());
 
+			if (pkt.sourceIP != IP_Address{{{0, 0, 0, 0}}})
+			{
+				ps2IP = pkt.sourceIP;
+			}
+
 			if (pcap_sendpacket(hpcap, payload->data, pkt.GetLength()))
 				return false;
 			else