80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Some more stuff reworked in the network poller.

Browse Source
This commit is contained in:
OBattler
2017-01-05 02:39:35 +01:00
parent 9b6a869083
commit 93b3137e3d
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ne2000.c
View File

@@ -1549,6 +1549,10 @@ if(net_is_slirp) {
}//end slirp
if(net_is_pcap && net_pcap!=NULL)
{
if((ne2000->DCR.loop == 0) || (ne2000->TCR.loop_cntl != 0))
{
return;
}
data=_pcap_next(net_pcap,&h);
if(data==0x0){goto WTF;}
/* Received. */
@@ -1558,18 +1562,16 @@ if(net_is_pcap && net_pcap!=NULL)
mac_cmp32[1] = *(uint32_t *) (maclocal);
mac_cmp16[1] = *(uint16_t *) (maclocal+4);
// if((memcmp(data+6,maclocal,6))==0)
if ((mac_cmp32[0] == mac_cmp32[1]) && (mac_cmp16[0] == mac_cmp16[1]))
/* if ((mac_cmp32[0] == mac_cmp32[1]) && (mac_cmp16[0] == mac_cmp16[1]))
{
ne2000_log("ne2000 we just saw ourselves\n");
else {
if((ne2000->DCR.loop == 0) || (ne2000->TCR.loop_cntl != 0))
{
return;
}
ne2000_log("ne2000 pcap received a frame %d bytes\n",h.caplen);
ne2000_rx_frame(ne2000,data,h.caplen);
}
WTF:
{}
}
else { */
if ((mac_cmp32[0] != mac_cmp32[1]) || (mac_cmp16[0] != mac_cmp16[1]))
{
// ne2000_log("ne2000 pcap received a frame %d bytes\n",h.caplen);
ne2000_rx_frame(ne2000,data,h.caplen);
}
}
}