folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ETHER: Fix reflection count error logic recently broken

Browse source 
Removed overloaded ambiguous return values from eth_reflect() and
eth_check_address_conflic().
This commit is contained in:
Mark Pizzolato 2019-01-20 15:02:25 -08:00
parent 344e24dcbb
commit 6f1255c142
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sim_ether.c
View file

@ -2445,8 +2445,10 @@ if (!rand_initialized)
return (rand() & 0xFF); return (rand() & 0xFF);
} }
t_stat eth_check_address_conflict (ETH_DEV* dev, t_stat eth_check_address_conflict_ex (ETH_DEV* dev,
ETH_MAC* const mac) ETH_MAC* const mac,
int *reflections,
t_bool silent)
{ {
ETH_PACK send, recv; ETH_PACK send, recv;
t_stat status; t_stat status;
@ -2455,6 +2457,8 @@ int responses = 0;
uint32 offset, function; uint32 offset, function;
char mac_string[32]; char mac_string[32];
if (reflections)
*reflections = 0;
eth_mac_fmt(mac, mac_string); eth_mac_fmt(mac, mac_string);
sim_debug(dev->dbit, dev->dptr, "Determining Address Conflict for MAC address: %s\n", mac_string); sim_debug(dev->dbit, dev->dptr, "Determining Address Conflict for MAC address: %s\n", mac_string);
@ -2578,13 +2582,23 @@ do {
} while (recv.len > 0); } while (recv.len > 0);
sim_debug(dev->dbit, dev->dptr, "Address Conflict = %d\n", responses); sim_debug(dev->dbit, dev->dptr, "Address Conflict = %d\n", responses);
if (responses) if (responses && !silent)
return sim_messagef (SCPE_ARG, "%s: MAC Address Conflict on LAN for address %s, change the MAC address to a unique value\n", sim_dname (dev->dptr), mac_string); return sim_messagef (SCPE_ARG, "%s: MAC Address Conflict on LAN for address %s, change the MAC address to a unique value\n", sim_dname (dev->dptr), mac_string);
return responses; if (reflections)
*reflections = responses;
return SCPE_OK;
}
t_stat eth_check_address_conflict (ETH_DEV* dev,
ETH_MAC* const mac)
{
return eth_check_address_conflict_ex (dev, mac, NULL, FALSE);
} }
t_stat eth_reflect(ETH_DEV* dev) t_stat eth_reflect(ETH_DEV* dev)
{ {
t_stat r;
/* Test with an address no NIC should have. */ /* Test with an address no NIC should have. */
/* We do this to avoid reflections from the wire, */ /* We do this to avoid reflections from the wire, */
/* in the event that a simulated NIC has a MAC address conflict. */ /* in the event that a simulated NIC has a MAC address conflict. */
@ -2592,11 +2606,12 @@ static ETH_MAC mac = {0xfe,0xff,0xff,0xff,0xff,0xfe};
sim_debug(dev->dbit, dev->dptr, "Determining Reflections...\n"); sim_debug(dev->dbit, dev->dptr, "Determining Reflections...\n");
dev->reflections = 0; r = eth_check_address_conflict_ex (dev, &mac, &dev->reflections, TRUE);
dev->reflections = eth_check_address_conflict (dev, &mac); if (r != SCPE_OK)
return sim_messagef (r, "eth: Error determining reflection count\n");
sim_debug(dev->dbit, dev->dptr, "Reflections = %d\n", dev->reflections); sim_debug(dev->dbit, dev->dptr, "Reflections = %d\n", dev->reflections);
return dev->reflections; return SCPE_OK;
} }
static void static void
@ -3643,7 +3658,7 @@ else
/* test reflections. This is done early in this routine since eth_reflect */ /* test reflections. This is done early in this routine since eth_reflect */
/* calls eth_filter recursively and thus changes the state of the device. */ /* calls eth_filter recursively and thus changes the state of the device. */
if (dev->reflections == -1) if (dev->reflections == -1)
status = eth_reflect(dev); eth_reflect(dev);
/* set new filter addresses */ /* set new filter addresses */
for (i = 0; i < addr_count; i++) for (i = 0; i < addr_count; i++)