diff --git a/EduNetworkBuilder/EduNetworkBuilder.csproj b/EduNetworkBuilder/EduNetworkBuilder.csproj index e3e31d8..41ca208 100644 --- a/EduNetworkBuilder/EduNetworkBuilder.csproj +++ b/EduNetworkBuilder/EduNetworkBuilder.csproj @@ -245,6 +245,7 @@ + diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs index 13851b8..ab69567 100644 --- a/EduNetworkBuilder/NB.cs +++ b/EduNetworkBuilder/NB.cs @@ -32,7 +32,7 @@ namespace EduNetworkBuilder public enum ResponseToPacket { none, accept, masq, drop, reject } public enum DebugLevel { none=0, info=1, routing=2, switching=4, natting=8, filtering=16, debug=32 , packet=64, all=127} public enum NetworkComponentType { none, router, net_switch, net_hub, laptop, pc, server, wap , - wrouter, wbridge, wrepeater, link, firewall, ip_phone, printer, copier, microwave, fluorescent } + wrouter, wbridge, wrepeater, link, firewall, ip_phone, printer, copier, microwave, fluorescent, cellphone, tablet } public enum NicType { none, lo, eth, wlan, wan, vpn, tun, management_interface, port, wport } public enum IPAddressType { ip, gw, route, ip_only } public enum nb_direction { none, to_src, to_dst } @@ -62,6 +62,7 @@ namespace EduNetworkBuilder Level2_VPN_woes, Level3_BlackHole, Level3_Busted, Level3_Middle_Man_Out, Level3_PhoneyNetwork, Level3_VPNify, Level3_EncryptionTroubles, Level3_NowhereToGo, Level3_GrandCentralStation, Level3_Dead, Level0_NetworkLoop2, Level0_BrokenLink, + Level3_TwoDHCPServers, Level4_DualWans, Level4_SinglesLife, Level4_SmallSubnets, Level4_OneRoute, Level4_RouterReplacement, Level4_InternalSubnetting, Level4_Internalhemorrhage } diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs index 0d63311..f2796dc 100644 --- a/EduNetworkBuilder/NetworkBuilder.cs +++ b/EduNetworkBuilder/NetworkBuilder.cs @@ -288,6 +288,8 @@ namespace EduNetworkBuilder BuildButton("btnWRouter", Properties.Resources.WRouter, "Add a Wireless Router to the network."); BuildButton("btnWBridge", Properties.Resources.WBridge, "Add a Wireless Bridge to the network."); BuildButton("btnWRepeater", Properties.Resources.WRepeater, "Add a Wireless Repeater to the network."); + BuildButton("btnCellphone", Properties.Resources.cellphone, "Add a Cellhone to the network."); + BuildButton("btnTablet", Properties.Resources.tablet, "Add a Tablet to the network."); BuildButton("btnLink", Properties.Resources.link, "Use a network cable to connect network components."); BuildButton("btnSelect", Properties.Resources.select, "Select items from the network."); } @@ -802,6 +804,12 @@ namespace EduNetworkBuilder case "btnWRouter": NC = myNetwork.AddItem(NetworkComponentType.wrouter, CenteredLocation); break; + case "btnCellphone": + NC = myNetwork.AddItem(NetworkComponentType.cellphone, CenteredLocation); + break; + case "btnTablet": + NC = myNetwork.AddItem(NetworkComponentType.tablet, CenteredLocation); + break; case "btnWBridge": NC = myNetwork.AddItem(NetworkComponentType.wbridge, CenteredLocation); break; diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index 3eba9cb..24c23b7 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -90,6 +90,22 @@ namespace EduNetworkBuilder NICs.Add(tnic); } } + if (what == NetworkComponentType.wap) + { + NICs.Clear(); + tnic = new NetworkCard(0, GetUniqueIdentifier, hostname, NicType.lo); + NICs.Add(tnic); + //tnic = new NetworkCard(0, GetUniqueIdentifier, hostname, NicType.management_interface); + //NICs.Add(tnic); --we use the wlan port for this + tnic = new NetworkCard(NICs.Count(), GetUniqueIdentifier, hostname, NicType.eth); //Add a physical network card + NICs.Add(tnic); + //A bridge is a switch with an ethernet nic, add some wireless ports + for (int a = 0; a < 6; a++) + { + tnic = new NetworkCard(NICs.Count(), GetUniqueIdentifier, hostname, NicType.wport); //Add a wireless nic + NICs.Add(tnic); + } + } if (what == NetworkComponentType.wrepeater) { NICs.Clear(); @@ -135,7 +151,16 @@ namespace EduNetworkBuilder //Add one wan port tnic = new NetworkCard(0, GetUniqueIdentifier, hostname, NicType.wan); NICs.Insert(1,tnic); //Make this first in the list + } + if (what == NetworkComponentType.cellphone || what == NetworkComponentType.tablet) + { + NICs.Clear(); + tnic = new NetworkCard(0, GetUniqueIdentifier, hostname, NicType.lo); + NICs.Add(tnic); + tnic = new NetworkCard(0, GetUniqueIdentifier, hostname, NicType.wlan); + NICs.Add(tnic); } + } ApplyRulesToDevice(); } @@ -178,7 +203,8 @@ namespace EduNetworkBuilder setNicsCanUseDHCP(false); } if (myType == NetworkComponentType.pc || myType == NetworkComponentType.laptop || - myType == NetworkComponentType.copier || myType == NetworkComponentType.printer) + myType == NetworkComponentType.copier || myType == NetworkComponentType.printer || + myType == NetworkComponentType.tablet || myType == NetworkComponentType.cellphone) { CanServeDHCP = false; CanUseDHCP = true; @@ -559,6 +585,12 @@ namespace EduNetworkBuilder case NetworkComponentType.microwave: MyImage = Properties.Resources.microwave; break; + case NetworkComponentType.cellphone: + MyImage = Properties.Resources.cellphone; + break; + case NetworkComponentType.tablet: + MyImage = Properties.Resources.tablet; + break; } } @@ -2438,7 +2470,7 @@ namespace EduNetworkBuilder } foreach(ArpEntry dhcp in DHCPLeases) { - if (dhcp.MACAddress == MAC && dhcp.IPAddr != NB.ZeroIPString) + if (dhcp.MACAddress == MAC && dhcp.IPAddr != NB.ZeroIPString && NIC_IP != null && gateway != null) return new IPAddress(dhcp.IPAddr, NIC_IP.GetMask.ToIpString(), gateway.GetIP.ToIpString()); } return null; diff --git a/EduNetworkBuilder/Properties/Resources.Designer.cs b/EduNetworkBuilder/Properties/Resources.Designer.cs index cd8b09f..7d4b21e 100644 --- a/EduNetworkBuilder/Properties/Resources.Designer.cs +++ b/EduNetworkBuilder/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -578,6 +578,16 @@ namespace EduNetworkBuilder.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] Level3_TwoDHCPServers { + get { + object obj = ResourceManager.GetObject("Level3_TwoDHCPServers", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -720,11 +730,13 @@ namespace EduNetworkBuilder.Properties { /// /// Looks up a localized string similar to {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}} - ///{\*\generator Riched20 6.3.9600}\viewkind4\uc1 - ///\pard\sa200\sl276\slmult1\f0\fs22\lang9 Version 1.0.22\line Version 1.0.21 08/15/2015\par - ///* Added a microwave and fluorescent light. They corrupt data when packets run close to them.\par - ///* Added some packet corruption puzzles\par - ///* Fixed window resize-on-load issue where the help window popped up first, then the builder window resized over to hide the help windo [rest of string was truncated]";. + ///{\*\generator Riched20 10.0.10240}\viewkind4\uc1 + ///\pard\sa200\sl276\slmult1\b\f0\fs22\lang9 Version 1.0.22\b0\par + ///* Added ssid and keys for wireless links\par + ///* Wireless will auto-disconnect if link is too long\par + ///* Wireless will auto-connect if ssid and key match, if link is short enough\par + ///* Packets will drop on wireless links if distance is too great\par + ///* wport has no interface (cannot edit IP address)\p [rest of string was truncated]";. /// internal static string ReleaseNotes { get { diff --git a/EduNetworkBuilder/Properties/Resources.resx b/EduNetworkBuilder/Properties/Resources.resx index 2d23468..4dfe8a1 100644 --- a/EduNetworkBuilder/Properties/Resources.resx +++ b/EduNetworkBuilder/Properties/Resources.resx @@ -352,4 +352,7 @@ ..\Resources\tablet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Level3_TwoDHCPServers.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/EduNetworkBuilder/Resources/Level3_TwoDHCPServers.enbx b/EduNetworkBuilder/Resources/Level3_TwoDHCPServers.enbx new file mode 100644 index 0000000..4457d71 --- /dev/null +++ b/EduNetworkBuilder/Resources/Level3_TwoDHCPServers.enbx @@ -0,0 +1,1731 @@ + + + + + There is a problem with the DHCP on the network. Have all of the devices do a DHCP request. Then have laptop3 ping the various hosts (right-click laptop3 and see what to ping). See if you can determine what the problem is. + Two DHCP servers + 1024 + 1024 + 100 + True + 3 + 6 + 282 + basic + + laptop0 + 100 + 103 + 820,650 + laptop + False + False + + 192.168.1.1 + 255.255.255.0 + 0.0.0.0 + gw + + + lo + lo0 + + 103 + 104 + laptop0 + lo0 + + lo + 104 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 103 + 105 + laptop0 + eth0 + + eth + 105 + True + + + + eth0 + + 192.168.1.21 + 255.255.255.0 + 192.168.1.1 + route + + + + + + laptop1 + 100 + 123 + 810,30 + laptop + False + False + + 192.168.2.1 + 255.255.255.0 + 0.0.0.0 + gw + + + lo + lo0 + + 123 + 124 + laptop1 + lo0 + + lo + 124 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 123 + 125 + laptop1 + eth0 + + eth + 125 + False + + + + eth0 + + 192.168.2.2 + 255.255.255.0 + 0.0.0.0 + ip + + + + + + laptop2 + 100 + 149 + 230,680 + laptop + False + False + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 149 + 150 + laptop2 + lo0 + + lo + 150 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 149 + 151 + laptop2 + eth0 + + eth + 151 + False + + + + eth0 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wlan + wlan2 + + 149 + 152 + laptop2 + wlan2 + + wlan + 152 + True + Encryption + linksys + + wlan2 + + 192.168.1.24 + 255.255.255.0 + 192.168.1.1 + route + + + + + + laptop3 + 100 + 154 + 50,480 + laptop + False + False + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 154 + 155 + laptop3 + lo0 + + lo + 155 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 154 + 156 + laptop3 + eth0 + + eth + 156 + False + + + + eth0 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wlan + wlan2 + + 154 + 157 + laptop3 + wlan2 + + wlan + 157 + True + Encryption + linksys + + wlan2 + + 192.168.1.20 + 255.255.255.0 + 192.168.1.1 + route + + + + + + laptop4 + 100 + 207 + 60,80 + laptop + False + False + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 207 + 208 + laptop4 + lo0 + + lo + 208 + False + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 207 + 209 + laptop4 + eth0 + + eth + 209 + False + + eth0 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wlan + wlan2 + + 207 + 210 + laptop4 + wlan2 + + wlan + 210 + True + Encryption + linksys + + wlan2 + + 192.168.0.9 + 255.255.255.0 + 0.0.0.0 + route + + + + + + net_switch0 + 100 + 109 + 500,310 + net_switch + False + False + + 192.168.1.1 + 255.255.255.0 + 0.0.0.0 + gw + + + lo + lo0 + + 109 + 110 + net_switch0 + lo0 + + lo + 110 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + management_interface + management_interface0 + + 109 + 111 + net_switch0 + management_interface0 + + management_interface + 111 + False + + + + management_interface0 + + 192.168.1.10 + 255.255.255.0 + 0.0.0.0 + ip + + + + + port + port1 + + 109 + 112 + net_switch0 + port1 + + port + 112 + False + + + + port1 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port2 + + 109 + 113 + net_switch0 + port2 + + port + 113 + False + + + + port2 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port3 + + 109 + 114 + net_switch0 + port3 + + port + 114 + False + + + + port3 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port4 + + 109 + 115 + net_switch0 + port4 + + port + 115 + False + + + + port4 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port5 + + 109 + 116 + net_switch0 + port5 + + port + 116 + False + + + + port5 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port6 + + 109 + 117 + net_switch0 + port6 + + port + 117 + False + + + + port6 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port7 + + 109 + 118 + net_switch0 + port7 + + port + 118 + False + + + + port7 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + + pc0 + 100 + 100 + 540,680 + pc + False + False + + 192.168.1.1 + 255.255.255.0 + 0.0.0.0 + gw + + + lo + lo0 + + 100 + 101 + pc0 + lo0 + + lo + 101 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 100 + 102 + pc0 + eth0 + + eth + 102 + True + + + + eth0 + + 192.168.0.8 + 255.255.255.0 + 0.0.0.0 + route + + + + + + router0 + 100 + 119 + 490,30 + router + False + False + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 119 + 120 + router0 + lo0 + + lo + 120 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 119 + 121 + router0 + eth0 + + eth + 121 + False + + + + eth0 + + 192.168.1.1 + 255.255.255.0 + 0.0.0.0 + ip + + + + + eth + eth1 + + 119 + 122 + router0 + eth1 + + eth + 122 + False + + + + eth1 + + 192.168.2.1 + 255.255.255.0 + 0.0.0.0 + ip + + + + + + server0 + 100 + 161 + 790,310 + server + False + True + + 192.168.1.1 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 161 + 162 + server0 + lo0 + + lo + 162 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 161 + 163 + server0 + eth0 + + eth + 163 + False + + + + eth0 + + 192.168.1.2 + 255.255.255.0 + 0.0.0.0 + ip + + + + + 127.0.0.1 + 0.0.0.0 + 0.0.0.0 + route + + + 192.168.1.2 + 192.168.1.20 + 192.168.1.30 + route + + + + wrouter0 + 100 + 130 + 230,310 + wrouter + False + True + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 130 + 133 + wrouter0 + lo0 + + lo + 133 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + wan + wan0 + + 130 + 147 + wrouter0 + wan0 + + wan + 147 + False + + + + wan0 + + 0.0.0.0 + 255.255.255.0 + 0.0.0.0 + ip + + + + + management_interface + management_interface0 + + 130 + 134 + wrouter0 + management_interface0 + + management_interface + 134 + False + + + + management_interface0 + + 192.168.0.1 + 255.255.255.0 + 0.0.0.0 + ip + + + + + port + port2 + + 130 + 135 + wrouter0 + port2 + + port + 135 + False + + + + port2 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port3 + + 130 + 136 + wrouter0 + port3 + + port + 136 + False + + + + port3 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port4 + + 130 + 137 + wrouter0 + port4 + + port + 137 + False + + + + port4 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port5 + + 130 + 138 + wrouter0 + port5 + + port + 138 + False + + + + port5 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport6 + + 130 + 139 + wrouter0 + wport6 + + wport + 139 + False + Encryption + linksys + + wport6 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport7 + + 130 + 140 + wrouter0 + wport7 + + wport + 140 + False + Encryption + linksys + + wport7 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport8 + + 130 + 141 + wrouter0 + wport8 + + wport + 141 + False + Encryption + linksys + + wport8 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport9 + + 130 + 142 + wrouter0 + wport9 + + wport + 142 + False + Encryption + linksys + + wport9 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport10 + + 130 + 143 + wrouter0 + wport10 + + wport + 143 + False + Encryption + linksys + + wport10 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport11 + + 130 + 144 + wrouter0 + wport11 + + wport + 144 + False + Encryption + linksys + + wport11 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport12 + + 130 + 145 + wrouter0 + wport12 + + wport + 145 + False + Encryption + linksys + + wport12 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport13 + + 130 + 146 + wrouter0 + wport13 + + wport + 146 + False + Encryption + linksys + + wport13 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + 127.0.0.1 + 0.0.0.0 + 0.0.0.0 + route + + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + route + + + 192.168.0.1 + 192.168.0.5 + 192.168.0.20 + route + + + + wrepeater0 + 100 + 229 + 230,80 + wrepeater + False + False + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 229 + 232 + wrepeater0 + lo0 + + lo + 232 + False + + + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + wlan + wlan1 + + 229 + 233 + wrepeater0 + wlan1 + + wlan + 233 + True + Encryption + linksys + + wlan1 + + 192.168.1.23 + 255.255.255.0 + 192.168.1.1 + route + + + + + wport + wport2 + + 229 + 234 + wrepeater0 + wport2 + + wport + 234 + False + Encryption + linksys + + wport2 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + + + 154 + 157 + laptop3 + wlan2 + + + 130 + 140 + wrouter0 + wport7 + + + wireless + 319 + + + + 229 + 233 + wrepeater0 + wlan1 + + + 130 + 142 + wrouter0 + wport9 + + + wireless + 326 + + + + 154 + 157 + laptop3 + wlan2 + + + 130 + 140 + wrouter0 + wport7 + + + wireless + 317 + + + + 229 + 233 + wrepeater0 + wlan1 + + + 130 + 142 + wrouter0 + wport9 + + + wireless + 324 + + + + 154 + 157 + laptop3 + wlan2 + + + 130 + 140 + wrouter0 + wport7 + + + wireless + 307 + + + + 229 + 233 + wrepeater0 + wlan1 + + + 130 + 142 + wrouter0 + wport9 + + + wireless + 314 + + + + 154 + 157 + laptop3 + wlan2 + + + 130 + 140 + wrouter0 + wport7 + + + wireless + 301 + + + + 229 + 233 + wrepeater0 + wlan1 + + + 130 + 142 + wrouter0 + wport9 + + + wireless + 308 + + + + 154 + 157 + laptop3 + wlan2 + + + 130 + 140 + wrouter0 + wport7 + + + wireless + 286 + + + + 103 + 105 + laptop0 + eth0 + + + 109 + 113 + net_switch0 + port2 + + + normal + 127 + + + + 109 + 116 + net_switch0 + port5 + + + 161 + 163 + server0 + eth0 + + + normal + 164 + + + + 100 + 102 + pc0 + eth0 + + + 109 + 112 + net_switch0 + port1 + + + normal + 126 + + + + 119 + 122 + router0 + eth1 + + + 123 + 125 + laptop1 + eth0 + + + normal + 129 + + + + 130 + 135 + wrouter0 + port2 + + + 109 + 115 + net_switch0 + port4 + + + normal + 148 + + + + 109 + 114 + net_switch0 + port3 + + + 119 + 121 + router0 + eth0 + + + normal + 128 + + + + 229 + 233 + wrepeater0 + wlan1 + + + 130 + 142 + wrouter0 + wport9 + + + wireless + 238 + + + + 149 + 152 + laptop2 + wlan2 + + + 130 + 139 + wrouter0 + wport6 + + + wireless + 356 + + + + 149 + 152 + laptop2 + wlan2 + + + 130 + 139 + wrouter0 + wport6 + + + wireless + 358 + + + + 149 + 152 + laptop2 + wlan2 + + + 130 + 139 + wrouter0 + wport6 + + + wireless + 354 + + + + 207 + 210 + laptop4 + wlan2 + + + 229 + 234 + wrepeater0 + wport2 + + + wireless + 269 + + + + 149 + 152 + laptop2 + wlan2 + + + 130 + 139 + wrouter0 + wport6 + + + wireless + 360 + + + + 149 + 152 + laptop2 + wlan2 + + + 130 + 139 + wrouter0 + wport6 + + + wireless + 281 + + + wrouter0 + False + DHCPServerEnabled + + + laptop3 + laptop2 + SuccessfullyPings + + + laptop3 + pc0 + SuccessfullyPings + + + laptop3 + laptop0 + SuccessfullyPings + + DHCP + DHCPServer + + \ No newline at end of file diff --git a/EduNetworkBuilder/Resources/ReleaseNotes.rtf b/EduNetworkBuilder/Resources/ReleaseNotes.rtf index 1224b7a..fe8ff41 100644 --- a/EduNetworkBuilder/Resources/ReleaseNotes.rtf +++ b/EduNetworkBuilder/Resources/ReleaseNotes.rtf @@ -10,7 +10,10 @@ * wireless router handles dhcp requests properly (both responds to it but also passes it on)\par * right-clicking light and microwave no longer has ping, arp, edit, and other context menus\par * added net-test for DHCP server status (on/off)\par -* If multiple DHCP servers, client randomly chooses which to keep.\line\b Version 1.0.21 08/15/2015\b0\par +* If multiple DHCP servers, client randomly chooses which to keep.\par +*Add Wireless Puzzle\par +*Fix many wireless device bugs\par +\line\b Version 1.0.21 08/15/2015\b0\par * Added a microwave and fluorescent light. They corrupt data when packets run close to them.\par * Added some packet corruption puzzles\par * Fixed window resize-on-load issue where the help window popped up first, then the builder window resized over to hide the help window. \par