timy/EduNetworkBuilder
timy/EduNetworkBuilder
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updates for final bug fixes and preparation for next release

Browse Source
This commit is contained in:
Tim Young 2015-09-20 17:23:31 -04:00
parent 418f8ec6c7
commit 1af724bbe9
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
EduNetworkBuilder/NetworkCard.cs
View File

@ -235,6 +235,7 @@ namespace EduNetworkBuilder
if (dest == null) return false; if (dest == null) return false;
foreach (NetworkInterface iface in interfaces) foreach (NetworkInterface iface in interfaces)
{ {
if (iface.myIP.BroadcastAddress == 0) continue; //a netmask of 0.0.0.0 causes grief
if (iface.myIP.BroadcastAddress == dest.GetIP) if (iface.myIP.BroadcastAddress == dest.GetIP)
return true;//If they are pinging the broadcast IP return true;//If they are pinging the broadcast IP
if (iface.myIP.GetIPString == NB.BroadcastIPString) if (iface.myIP.GetIPString == NB.BroadcastIPString)

12
EduNetworkBuilder/NetworkDevice.cs
View File

@ -1028,6 +1028,7 @@ namespace EduNetworkBuilder
//} //}
public bool HasBroadcastAddress(IPAddress dest) public bool HasBroadcastAddress(IPAddress dest)
{ {
if (dest.BroadcastAddress == dest.GetIP) return true;
foreach(NetworkCard nic in NICs) foreach(NetworkCard nic in NICs)
{ {
if (nic.HasBroadcastAddresses(dest)) if (nic.HasBroadcastAddresses(dest))
@ -1368,7 +1369,9 @@ namespace EduNetworkBuilder
// if (nic == tPacket.InboundNic) break; //this case is dealt with in nic.SendPacketOutNic // if (nic == tPacket.InboundNic) break; //this case is dealt with in nic.SendPacketOutNic
//Pass it to the NIC to send out each nic+interface. //Pass it to the NIC to send out each nic+interface.
//The nic checks to see if it works and then processes it //The nic checks to see if it works and then processes it
if (!tPacket.isFresh && HasBroadcastAddress(tPacket.destIP)) break; if(myType != NetworkComponentType.wbridge && myType != NetworkComponentType.wrepeater)
if (!tPacket.isFresh && HasBroadcastAddress(tPacket.destIP))
break;
string tMAC = tPacket.destMAC; string tMAC = tPacket.destMAC;
string ttMAC = tPacket.OutboundDestMAC; string ttMAC = tPacket.OutboundDestMAC;
if (BroadcastMatch && tPacket.MyType != PacketType.dhcp_answer) if (BroadcastMatch && tPacket.MyType != PacketType.dhcp_answer)
@ -1701,6 +1704,13 @@ namespace EduNetworkBuilder
{ {
dst = RequestDHCPLease(tPacket.sourceMAC, tPacket.InboundInterface.myIP); dst = RequestDHCPLease(tPacket.sourceMAC, tPacket.InboundInterface.myIP);
} }
//if we the packet came in on a port...
if (tPacket.InboundNic.GetNicType == NicType.wport || tPacket.InboundNic.GetNicType == NicType.port)
{
IPAddress theIP = HubManagementIP();
if (theIP != null)
dst = RequestDHCPLease(tPacket.sourceMAC, theIP);
}
string tmac = nPacket.sourceMAC; string tmac = nPacket.sourceMAC;
nPacket.sourceMAC = tPacket.OutboundMAC; nPacket.sourceMAC = tPacket.OutboundMAC;
if (tPacket.InboundInterface != null) if (tPacket.InboundInterface != null)

5
EduNetworkBuilder/Resources/ReleaseNotes.rtf
View File

@ -1,9 +1,10 @@
{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}} {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
{\*\generator Riched20 10.0.10240}\viewkind4\uc1 {\*\generator Riched20 10.0.10240}\viewkind4\uc1
\pard\sa200\sl276\slmult1\b\f0\fs22\lang9 Version 1.0.23 \par \pard\sa200\sl276\slmult1\b\f0\fs22\lang9 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
* Fixed issue with multiple interfaces and being able to go out a different interface than we came in on\b\par * Fixed issue with multiple interfaces and being able to go out a different interface than we came in on\par
* Fixed many small bugs that crept in when fixing other bugs. Now all puzzles seem to play correctly\b\par
Version 1.0.22 09/01/2015\b0\par Version 1.0.22 09/01/2015\b0\par
* Added ssid and keys for wireless links\par * Added ssid and keys for wireless links\par
* Wireless will auto-disconnect if link is too long\par * Wireless will auto-disconnect if link is too long\par