Fixed bad DHCP Gateway issue. Gateway was bad on Wireless Router at times.

This commit is contained in:
Tim Young 2015-11-01 19:43:48 -05:00
parent a4f5cb0eba
commit 612935be8f
2 changed files with 5 additions and 6 deletions

View File

@ -2560,15 +2560,13 @@ namespace EduNetworkBuilder
while(stillOK) while(stillOK)
{ {
ipstring = sIPNum.ToIpString(); ipstring = sIPNum.ToIpString();
tAddress = new IPAddress(ipstring, NIC_IP.GetMask.ToIpString(),NB.ZeroIPString);
if (!IPAlreadyUsed(ipstring)) if (!IPAlreadyUsed(ipstring))
{ {
MakeDHCPLease(ipstring, MAC); MakeDHCPLease(ipstring, MAC);
IPAddress gateway; IPAddress gateway = GetGateway();
if (myType != NetworkComponentType.firewall) //If the gateway is not local to the IP address we are giving out, give the IP of this device
{ if(!tAddress.IsLocal(gateway))
gateway = GetGateway();
}
else
{ {
gateway = NIC_IP; //Return the firewall IP that it came in on gateway = NIC_IP; //Return the firewall IP that it came in on
} }

View File

@ -5,6 +5,7 @@
* Add sound fail when save is canceled (will use it later if ctrl-s fails)\par * Add sound fail when save is canceled (will use it later if ctrl-s fails)\par
* Added some wireless puzzles\par * Added some wireless puzzles\par
* Fix issue with WAP not forwarding packets correctly\par * Fix issue with WAP not forwarding packets correctly\par
* Clear out old status message if we do something. So we do not say "saved" forever...\par
\b Version 1.0.23 09/20/2015\par \b Version 1.0.23 09/20/2015\par
\b0 * Fixed issues with broadcast packets\par \b0 * Fixed issues with broadcast packets\par
* Fixed a network loop issue\par * Fixed a network loop issue\par