diff --git a/EduNetworkBuilder/EduNetworkBuilder.csproj b/EduNetworkBuilder/EduNetworkBuilder.csproj index 823d838..6c3f7f3e 100644 --- a/EduNetworkBuilder/EduNetworkBuilder.csproj +++ b/EduNetworkBuilder/EduNetworkBuilder.csproj @@ -254,6 +254,7 @@ + diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs index ab69567..6c17eec 100644 --- a/EduNetworkBuilder/NB.cs +++ b/EduNetworkBuilder/NB.cs @@ -64,7 +64,8 @@ namespace EduNetworkBuilder 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 + Level4_InternalSubnetting, Level4_Internalhemorrhage, + Level5_WirelessDevices } public enum DebugPausePoint { none=0, packet_create=1, packet_kill=2, packet_in=4, packet_out=8, packet_duplicate=16, all=63, diff --git a/EduNetworkBuilder/Properties/Resources.Designer.cs b/EduNetworkBuilder/Properties/Resources.Designer.cs index 7d4b21e..0c4540f 100644 --- a/EduNetworkBuilder/Properties/Resources.Designer.cs +++ b/EduNetworkBuilder/Properties/Resources.Designer.cs @@ -668,6 +668,16 @@ namespace EduNetworkBuilder.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] Level5_WirelessDevices { + get { + object obj = ResourceManager.GetObject("Level5_WirelessDevices", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -731,12 +741,11 @@ namespace EduNetworkBuilder.Properties { /// /// Looks up a localized string similar to {\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.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]";. + ///\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\ [rest of string was truncated]";. /// internal static string ReleaseNotes { get { diff --git a/EduNetworkBuilder/Properties/Resources.resx b/EduNetworkBuilder/Properties/Resources.resx index 4dfe8a1..7382fcb 100644 --- a/EduNetworkBuilder/Properties/Resources.resx +++ b/EduNetworkBuilder/Properties/Resources.resx @@ -355,4 +355,7 @@ ..\Resources\Level3_TwoDHCPServers.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Level5_WirelessDevices.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/EduNetworkBuilder/Resources/Level5_WirelessDevices.enbx b/EduNetworkBuilder/Resources/Level5_WirelessDevices.enbx new file mode 100644 index 0000000..9996977 --- /dev/null +++ b/EduNetworkBuilder/Resources/Level5_WirelessDevices.enbx @@ -0,0 +1,705 @@ + + + + + Start by adding a cellphone, tablet, and laptop all to the network. When you add them, you need to configure the wireless SSID and Key of the device. You can do this two ways. You can drag a link from the device to the wireless access point, or you can edit the wireless nic and manually configure the ssid and key. +You also want to give all three devices IP addresses (via DHCP or static). + Wireless Devices + 1024 + 1024 + 100 + False + 5 + 1 + 132 + full + + pc0 + 100 + 123 + 630,180 + pc + False + False + + 192.168.7.1 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 123 + 124 + pc0 + lo0 + + lo + 124 + False + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 123 + 125 + pc0 + eth0 + + eth + 125 + False + + eth0 + + 192.168.7.2 + 255.255.255.0 + 0.0.0.0 + ip + + + + + + pc1 + 100 + 128 + 430,560 + pc + False + False + + 192.168.1.1 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 128 + 129 + pc1 + lo0 + + lo + 129 + False + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + eth + eth0 + + 128 + 130 + pc1 + eth0 + + eth + 130 + False + + eth0 + + 192.168.1.2 + 255.255.255.0 + 0.0.0.0 + ip + + + + + + router0 + 100 + 119 + 430,180 + 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.6.1 + 255.255.255.0 + 0.0.0.0 + ip + + + + + eth + eth1 + + 119 + 122 + router0 + eth1 + + eth + 122 + False + + eth1 + + 192.168.7.1 + 255.255.255.0 + 0.0.0.0 + ip + + + + + 192.168.1.1 + 255.255.255.0 + 192.168.6.2 + route + + + + wrouter0 + 100 + 100 + 430,390 + wrouter + False + True + + 192.168.6.1 + 0.0.0.0 + 0.0.0.0 + gw + + + lo + lo0 + + 100 + 103 + wrouter0 + lo0 + + lo + 103 + False + + lo0 + + 127.0.0.1 + 255.0.0.0 + 0.0.0.0 + ip + + + + + wan + wan0 + + 100 + 118 + wrouter0 + wan0 + + wan + 118 + False + + wan0 + + 192.168.6.2 + 255.255.255.0 + 0.0.0.0 + ip + + + + + vpn + vpn0 + + 100 + 117 + wrouter0 + vpn0 + + vpn + 117 + False + + vpn0 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + management_interface + management_interface0 + + 100 + 104 + wrouter0 + management_interface0 + + management_interface + 104 + False + + management_interface0 + + 192.168.1.1 + 255.255.255.0 + 0.0.0.0 + ip + + + + + port + port2 + + 100 + 105 + wrouter0 + port2 + + port + 105 + False + + port2 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port3 + + 100 + 106 + wrouter0 + port3 + + port + 106 + False + + port3 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port4 + + 100 + 107 + wrouter0 + port4 + + port + 107 + False + + port4 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + port + port5 + + 100 + 108 + wrouter0 + port5 + + port + 108 + False + + port5 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport6 + + 100 + 109 + wrouter0 + wport6 + + wport + 109 + False + TheKey + my_ssid + + wport6 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport7 + + 100 + 110 + wrouter0 + wport7 + + wport + 110 + False + TheKey + my_ssid + + wport7 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport8 + + 100 + 111 + wrouter0 + wport8 + + wport + 111 + False + TheKey + my_ssid + + wport8 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport9 + + 100 + 112 + wrouter0 + wport9 + + wport + 112 + False + TheKey + my_ssid + + wport9 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport10 + + 100 + 113 + wrouter0 + wport10 + + wport + 113 + False + TheKey + my_ssid + + wport10 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport11 + + 100 + 114 + wrouter0 + wport11 + + wport + 114 + False + TheKey + my_ssid + + wport11 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport12 + + 100 + 115 + wrouter0 + wport12 + + wport + 115 + False + TheKey + my_ssid + + wport12 + + 0.0.0.0 + 0.0.0.0 + 0.0.0.0 + ip + + + + + wport + wport13 + + 100 + 116 + wrouter0 + wport13 + + wport + 116 + False + TheKey + my_ssid + + 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.6.2 + 0.0.0.0 + 0.0.0.0 + route + + + 192.168.1.1 + 192.168.1.5 + 192.168.1.10 + route + + + + + 100 + 118 + wrouter0 + wan0 + + + 119 + 121 + router0 + eth0 + + + normal + 126 + + + + 119 + 122 + router0 + eth1 + + + 123 + 125 + pc0 + eth0 + + + normal + 127 + + + + 128 + 130 + pc1 + eth0 + + + 100 + 105 + wrouter0 + port2 + + + normal + 131 + + + tablet0 + wrouter0 + NeedsLinkToDevice + + + laptop0 + wrouter0 + NeedsLinkToDevice + + + cellphone0 + wrouter0 + NeedsLinkToDevice + + + cellphone0 + tablet0 + SuccessfullyPings + + + cellphone0 + laptop0 + SuccessfullyPings + + + \ No newline at end of file