From 612935be8f01fa13ddda3d7b4e3e4418d22b34c1 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Sun, 1 Nov 2015 19:43:48 -0500 Subject: [PATCH] Fixed bad DHCP Gateway issue. Gateway was bad on Wireless Router at times. --- EduNetworkBuilder/NetworkDevice.cs | 10 ++++------ EduNetworkBuilder/Resources/ReleaseNotes.rtf | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index 5a71242..d77b55c 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -2560,15 +2560,13 @@ namespace EduNetworkBuilder while(stillOK) { ipstring = sIPNum.ToIpString(); + tAddress = new IPAddress(ipstring, NIC_IP.GetMask.ToIpString(),NB.ZeroIPString); if (!IPAlreadyUsed(ipstring)) { MakeDHCPLease(ipstring, MAC); - IPAddress gateway; - if (myType != NetworkComponentType.firewall) - { - gateway = GetGateway(); - } - else + IPAddress gateway = GetGateway(); + //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 = NIC_IP; //Return the firewall IP that it came in on } diff --git a/EduNetworkBuilder/Resources/ReleaseNotes.rtf b/EduNetworkBuilder/Resources/ReleaseNotes.rtf index 0beb878..e8a5e5c 100644 --- a/EduNetworkBuilder/Resources/ReleaseNotes.rtf +++ b/EduNetworkBuilder/Resources/ReleaseNotes.rtf @@ -5,6 +5,7 @@ * Add sound fail when save is canceled (will use it later if ctrl-s fails)\par * Added some wireless puzzles\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 \b0 * Fixed issues with broadcast packets\par * Fixed a network loop issue\par