Add Wireless Repeater puzzles & fix issue with WAP not forwarding packets.
This commit is contained in:
parent
1a5efe1925
commit
cb2bf83f2b
@ -256,6 +256,8 @@
|
||||
<None Include="Resources\Level4_SmallSubnets.enbx" />
|
||||
<None Include="Resources\Level5_WirelessBridge.enbx" />
|
||||
<None Include="Resources\Level5_WirelessDevices.enbx" />
|
||||
<None Include="Resources\Level5_WirelessRepeater.enbx" />
|
||||
<None Include="Resources\Level5_WirelessRepeater2.enbx" />
|
||||
<None Include="Resources\Level5_WirelessRouters.enbx" />
|
||||
<None Include="Resources\OneNet.enbx" />
|
||||
<None Include="Resources\Puzzle-BadDHCP.enbx" />
|
||||
|
@ -65,7 +65,7 @@ namespace EduNetworkBuilder
|
||||
Level3_TwoDHCPServers,
|
||||
Level4_DualWans, Level4_SinglesLife, Level4_SmallSubnets, Level4_OneRoute, Level4_RouterReplacement,
|
||||
Level4_InternalSubnetting, Level4_Internalhemorrhage,
|
||||
Level5_WirelessRouters, Level5_WirelessDevices, Level5_WirelessBridge
|
||||
Level5_WirelessRouters, Level5_WirelessDevices, Level5_WirelessBridge, Level5_WirelessRepeater, Level5_WirelessRepeater2
|
||||
}
|
||||
public enum DebugPausePoint { none=0, packet_create=1, packet_kill=2,
|
||||
packet_in=4, packet_out=8, packet_duplicate=16, all=63,
|
||||
|
@ -1054,8 +1054,10 @@ namespace EduNetworkBuilder
|
||||
|
||||
public bool DoesForwarding()
|
||||
{
|
||||
if (myType == NetworkComponentType.net_hub) return true;
|
||||
if (myType == NetworkComponentType.net_switch) return true;
|
||||
if (myType == NetworkComponentType.net_hub)
|
||||
return true;
|
||||
if (myType == NetworkComponentType.net_switch)
|
||||
return true;
|
||||
if (myType == NetworkComponentType.wap)
|
||||
return true;
|
||||
if (myType == NetworkComponentType.wbridge)
|
||||
@ -1352,7 +1354,10 @@ namespace EduNetworkBuilder
|
||||
bool PacketSentOutWAN = false;
|
||||
foreach(NetworkCard nic in NICs)
|
||||
{
|
||||
switch(nic.GetNicType)
|
||||
NicType NT = nic.GetNicType;
|
||||
if (myType == NetworkComponentType.wap)
|
||||
NT = NicType.port;
|
||||
switch(NT)
|
||||
{
|
||||
case NicType.lo:
|
||||
case NicType.management_interface:
|
||||
|
20
EduNetworkBuilder/Properties/Resources.Designer.cs
generated
20
EduNetworkBuilder/Properties/Resources.Designer.cs
generated
@ -697,6 +697,26 @@ namespace EduNetworkBuilder.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Byte[].
|
||||
/// </summary>
|
||||
internal static byte[] Level5_WirelessRepeater {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Level5_WirelessRepeater", resourceCulture);
|
||||
return ((byte[])(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Byte[].
|
||||
/// </summary>
|
||||
internal static byte[] Level5_WirelessRepeater2 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("Level5_WirelessRepeater2", resourceCulture);
|
||||
return ((byte[])(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Byte[].
|
||||
/// </summary>
|
||||
|
@ -370,4 +370,10 @@
|
||||
<data name="noBeep" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\noBeep.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="Level5_WirelessRepeater" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Level5_WirelessRepeater.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="Level5_WirelessRepeater2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Level5_WirelessRepeater2.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
</root>
|
1244
EduNetworkBuilder/Resources/Level5_WirelessRepeater.enbx
Normal file
1244
EduNetworkBuilder/Resources/Level5_WirelessRepeater.enbx
Normal file
File diff suppressed because it is too large
Load Diff
1133
EduNetworkBuilder/Resources/Level5_WirelessRepeater2.enbx
Normal file
1133
EduNetworkBuilder/Resources/Level5_WirelessRepeater2.enbx
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,159 +1,386 @@
|
||||
{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
|
||||
{\*\generator Riched20 10.0.10240}\viewkind4\uc1
|
||||
\pard\sa200\sl276\slmult1\b\f0\fs22\lang9 Version 1.0.23 09/20/2015\par
|
||||
\b0 * Fixed issues with broadcast packets\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\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
|
||||
* 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)\par
|
||||
* wireless router works properly - forwards broadcast packets\par
|
||||
* 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.\par
|
||||
*Add Wireless Puzzle\par
|
||||
*Fix many wireless device bugs\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
|
||||
\b Version 1.0.20 08/12/2015\b0\par
|
||||
* wports do not display on tooltips or when printing the device info\par
|
||||
* Added ctrl-s to quick-save a network we are working on\par
|
||||
* commented out wireless devices for now - doing a big demo and wireless is not yet complete\par
|
||||
* added search box to help\par
|
||||
\b Version 1.0.19 08/08/2015\b0\par
|
||||
*Updated context help for most puzzles that introduce new ideas.\par
|
||||
* Sorted Help topics when adding them in net-tests.\par
|
||||
* Added some images to the help to help clarify things.\par
|
||||
* Start with the help windows being the same "height" as the network window.\par
|
||||
* Open Help so it can be kept open while the puzzles progress.\par
|
||||
* Deal with minimized state better (used to shrink window to smallest possible state)\par
|
||||
* Remember size and location of main window between uses.\par
|
||||
\b Version 1.0.18 08/08/2015\b0\par
|
||||
* Added Context Help for puzzles.\par
|
||||
- Each puzzle can have context help\par
|
||||
- There is a net-test to have us read help\par
|
||||
* fixed minor problem with a "ding" sound when we load a puzzle that has something locked.\par
|
||||
\b Version 1.0.17 08/01/2015\b0\par
|
||||
* Added more help\par
|
||||
* Much progress made in preparing for a French translation\par
|
||||
* allow for Puzzle's description to be in another language\par
|
||||
* Added more to help\par
|
||||
* Removed edit -> cut, paste, copy, undo. They never did anything. So why have them?\par
|
||||
* Save box starts in the directory of the file we opened (if we have one)\par
|
||||
* Choose a language at startup if one has never been chosen, and have option to change language.\par
|
||||
* Added another puzzle, showing what happens (or does not happen) if we have two networks that use the same IP addresses, and we want to build a VPN between them.\par
|
||||
\b Version 1.0.16 07/18/2015\b0\par
|
||||
* Added ability to break links (bad network wire)\par
|
||||
* "connection lights" on network cards / ports when we edit devices\par
|
||||
* Test for "needs link to" does not succeed if the link in question is a broken link\par
|
||||
* Added a puzzle to show you how to find broken links \par
|
||||
* Used broken links in other puzzles\par
|
||||
* Fixed bug: switches could not use DHCP for many different reasons. Now it works for them.\par
|
||||
\b Version 1.0.15 07/11/2015\b0\par
|
||||
* Added ping time progress bar\par
|
||||
* Fixed issue with things timing out before they completed. If the network screen is too large, it makes it go just a tiny bit slower and various things would fail. When the first packet successfully makes it to the far end, it recomputes the time needed and gives extra time.\par
|
||||
* Added context menu ping. If an item is supposed to ping something, right-clicking adds the ping test to the menu. Takes some of the guess-work out of things.\par
|
||||
* Fixed minor issue with this change log. Had two 1.0.11 versions & somehow was stating we were at version 10.x.x instead of 1.x.x (sigh) \par
|
||||
* Fixed the VPNify puzzle. Had a goof in it.\par
|
||||
* Made it so you cannot connect a link to a VPN. A VPN should be a virtual connection, not a physical connection.\par
|
||||
\b Version 1.0.14 07/10/2015\b0\par
|
||||
* When we finish a puzzle, allow us to auto-open the "next puzzle" box.\par
|
||||
* Added lots more puzzles\par
|
||||
* Added more help & documentation\par
|
||||
* Made it so test for local IP also checked to make sure the subnet-masks matched\par
|
||||
* Made it so the test for a matching route compared netmasks\par
|
||||
* Added a printer object\par
|
||||
* Added a copier object\par
|
||||
\b Version 1.0.13 06/21/2015\b0\par
|
||||
* Fixed issues with arp - arp could go through routers. Now works correctly\par
|
||||
* Made it test for puzzle completion after adding devices\par
|
||||
* Made it test for completion after changing / deleting devices\par
|
||||
* Let you delete / add NICs on PCs, primarily so we can solve the duplicate MAC puzzle\par
|
||||
* Replaced the "Network Loop" puzzle with the correct one.\par
|
||||
\b Version 1.0.12 06/20/2015\b0\par
|
||||
* Added VPN and TUN nic types\par
|
||||
* Fixed numerous small bugs\par
|
||||
* Fixed bug with early solution to failed ping test\par
|
||||
* Added "ding" when a test is solved.\par
|
||||
* Added a "firewall" network that has a firewall and vpns\par
|
||||
* Added numerous firewall / vpn puzzles\par
|
||||
* Fixed a DNS issue. It now more intelligently finds the right IP address when you ping it\par
|
||||
\b Version 1.0.11 06/14/2015\b0\par
|
||||
* Added the ability to lock various important features to make puzzles better\par
|
||||
* Able to add interfaces (multiple IPs on a Network Card)\par
|
||||
* Right-click context menu to add net-tests. \par
|
||||
* Del key now deletes the last item we had clicked on\par
|
||||
* Can add NICs (on some devices)\par
|
||||
* Can delete NICs\par
|
||||
* Fixed minor bug with broadcast pinging solving ping test for individual computers\par
|
||||
\b Version 1.0.10 06/13/2015\b0\par
|
||||
* Renamed puzzles to manage them easier\par
|
||||
* Deal with duplicate IPs, and what happens when a packet returns to a computer that did not send it.\par
|
||||
* Change to the help window so you can keep the window open while working with the puzzle.\par
|
||||
* Change to the donation link. Not that it will ever be used, but it makes me feel better having a few places for people to donate to if they wish.\par
|
||||
* Minor change for how broadcast packets work, specifically dealing with duplicate IP addresses.\par
|
||||
* Added a "firewall" device & WAN port with masquerade\par
|
||||
* Added a FailedPing test so we can ping things that must fail (show the firewall works)\par
|
||||
* added more to the help\par
|
||||
* added more puzzles\par
|
||||
\b Version 1.0.0.9 05/29/2015\b0\par
|
||||
* Add a grid to the network map. It makes things easier to straighten up\par
|
||||
* Sorted and organized the puzzles\par
|
||||
* Made a level for each puzzle.\par
|
||||
* Tracked the puzzles which have been completed\par
|
||||
* When we open the puzzle list, we now show the first level of puzzles that have an uncompleted puzzle.\par
|
||||
* Added more "tests", viewing help, pinging, arp, and dhcp.\par
|
||||
* Reset buttons when we load a new network.\par
|
||||
* Added a bunch more puzzles\par
|
||||
* Sometimes the remembered IP gets annoying when it remembers odd gateways and numbers we cannot change. Fixed that in many cases.\par
|
||||
\b Version 1.0.0.8 05/25/2015\b0\par
|
||||
* Always Start with level0 puzzles for now\par
|
||||
* Fixed the icon when program running\par
|
||||
* Added an infrastructure for Puzzles (needs work)\par
|
||||
* Added a number of basic puzzles\par
|
||||
* Fixed DHCP Leases. Now it clears leases when you change the DHCP server range.\par
|
||||
\b Version 1.0.0.7 05/16/2015\b0\par
|
||||
* Added file association so we can double-click an enbx file\par
|
||||
* Fixed the icon so it looks right (removed left edge)\par
|
||||
\b Version 1.0.0.6 05/16/2015\b0\par
|
||||
* Able to delete a route (right click route and delete it)\par
|
||||
* Add map title as something we can load/save\par
|
||||
* Add message as something we can load and save\par
|
||||
* Changing size of items affects all items\par
|
||||
* Allow entering a hostname in the IP address field (ping / gateway)\par
|
||||
\b Version 1.0.0.5 04/26/2015\b0\par
|
||||
* Fixed ping from switch\par
|
||||
* Fixed error message when pinging IP that does not exist\par
|
||||
\b Version 1.0.0.4 04/26/2015\b0\par
|
||||
* Fixed broadcast ping\par
|
||||
*Fixed dhcp request error\par
|
||||
\b Version 1.0.0.3 04/15/2015\par
|
||||
\b0 * Added "file" -> "new" to erase and start a clean new network\par
|
||||
* Fixed pc2 to have gateway on "solved"->"Two Networks"\par
|
||||
* Fixed - only machines capable of doing DHCP do dhcp request if we do DHCP request on all\par
|
||||
* Changed - major overhaul to tcp-stack.\par
|
||||
* Downgrade - Arp temporarily removed from system while tcp-stack overhaul completed\par
|
||||
\b Version 1.0.0.2 4/19/2015\b0\par
|
||||
* Added IP-Phone\par
|
||||
* Packets terminate at the far end - this makes it easier to see packets go both directions\par
|
||||
* Packets are randomized in transit - Allows packets to arrive at slightly different times\par
|
||||
\b Version 1.0.0.1 4/11/2015\b0\par
|
||||
* DHCP selection on nics is not functioning correctly\par
|
||||
* Various small bug-fixes\par
|
||||
\b Version 1.0.0.0 4/10/2015\b0\par
|
||||
This is the initial alpha build\par
|
||||
* basic pinging\par
|
||||
* basic arp\par
|
||||
* Routers\par
|
||||
* Switches/Hubs\par
|
||||
* PCs/Laptops\par
|
||||
* Network Links (ethernet)\par
|
||||
* Basic DHCP\par
|
||||
}
|
||||
|