diff --git a/EduNetworkBuilder/EduNetworkBuilder.csproj b/EduNetworkBuilder/EduNetworkBuilder.csproj
index fe73bfd..3fe9eb5 100644
--- a/EduNetworkBuilder/EduNetworkBuilder.csproj
+++ b/EduNetworkBuilder/EduNetworkBuilder.csproj
@@ -287,6 +287,7 @@
+
diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs
index c7de61d..c545758 100644
--- a/EduNetworkBuilder/NB.cs
+++ b/EduNetworkBuilder/NB.cs
@@ -74,7 +74,7 @@ namespace EduNetworkBuilder
Level5_WirelessAccessPoint, Level5_WirelessCorruption, Level5_Failed, Level5_LostPacket, Level5_HereComesTrouble,
Level6_VLAN_Intro, Level6_VLAN_Intro2, Level6_Intro3_LockedOut, Level6_ForbiddenVLAN, Level6_TaggedBetweenSwitches,
Level6_VLANRouting, Level6_VLANRouting2, level6_UntaggedAndDHCP, Level6_SorryBoss, Level6_VLANFrustrations,
- Level6_TwoAccessPoints, Level6_VlanRouting3,
+ Level6_TwoAccessPoints, Level6_VlanRouting3, Level6_ConnectTheLaptop,
}
public enum DebugPausePoint { none=0, packet_create=1, packet_kill=2,
@@ -172,6 +172,13 @@ namespace EduNetworkBuilder
}
}
+ public class PingTestStatus
+ {
+ public string Source;
+ public string Dest;
+ public bool Succeeded = false;
+ }
+
[Serializable]
public struct ArpEntry
{
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 9ee4fa1..0533e4d 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -59,6 +59,7 @@ namespace EduNetworkBuilder
private List PacketColors = new List();
private List PacketImages = new List();
+ private List PingTestStats = new List();
public Network(string Name)
{
@@ -808,6 +809,10 @@ namespace EduNetworkBuilder
{
string sHost = ReverseDNSLookup(source, sIP);
string dHost = ReverseDNSLookup(source, dIP);
+ if (packet_type == PacketType.ping_answer)
+ {
+ RegisterPingSuccess(sHost, dHost);
+ }
//If we are checking a ping, but we already have done it, we see if there is a ping-again
foreach (NetTest nt in NetTests)
{
@@ -1084,6 +1089,15 @@ namespace EduNetworkBuilder
ND.ClearIPConnectionInfo();
}
}
+ foreach(PingTestStatus PTS in PingTestStats)
+ {
+ if (PTS.Succeeded == false)
+ {
+ //We mark it as failed
+ NoteActionDone(NetTestType.FailedPing, PTS.Source, PTS.Dest);
+ }
+ }
+ PingTestStats.Clear(); //empty it for now.
DebugPausePoint WhatIsSet = NB.GetDebugPauseSetting();
if (WhatIsSet != 0)
{
@@ -1352,6 +1366,28 @@ namespace EduNetworkBuilder
return found;
}
+ public void RegisterPingTest(string source, string dest)
+ {
+ PingTestStatus PTS = new PingTestStatus();
+ PTS.Source = source;
+ PTS.Dest = dest;
+ PTS.Succeeded = false;
+ PingTestStats.Add(PTS);
+ }
+
+ public void RegisterPingSuccess(string source, string dest)
+ {
+ foreach (PingTestStatus PST in PingTestStats)
+ {
+ if (PST.Source == source &&
+ PST.Dest == dest)
+ {
+ PST.Succeeded = true;
+ break;
+ }
+ }
+ }
+
/****************************************
* Do On All Devices
* **************************************/
diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs
index 96c37a8..025d81b 100644
--- a/EduNetworkBuilder/NetworkDevice.cs
+++ b/EduNetworkBuilder/NetworkDevice.cs
@@ -1290,6 +1290,8 @@ namespace EduNetworkBuilder
//We need to create a packet
Packet PingPacket = new Packet(this,Destination, NB.Translate("H_Ping_Title"), PacketType.ping_request);
Network myNet = NB.GetNetwork();
+ string dHost = myNet.ReverseDNSLookup(this, Destination);
+ myNet.RegisterPingTest(hostname, dHost);
myNet.addPacket(PingPacket);
}
diff --git a/EduNetworkBuilder/Packet.cs b/EduNetworkBuilder/Packet.cs
index 6fdea84..c2340df 100644
--- a/EduNetworkBuilder/Packet.cs
+++ b/EduNetworkBuilder/Packet.cs
@@ -435,17 +435,19 @@ namespace EduNetworkBuilder
}
if (MyStatus != PacketStatus.finished)
myNet.AddMessage(Tracking); //We only store finished_failed, and finished_ok
- if (sourceIP != null && destIP != null)
- {
- if (MyType == PacketType.ping_answer && MyStatus == PacketStatus.finished_failed)
- {
- myNet.NoteActionDone(NetTestType.FailedPing, destIP.GetIPString, sourceIP.GetIPString);
- }
- if (MyType == PacketType.ping_request && MyStatus == PacketStatus.finished_failed)
- {
- myNet.NoteActionDone(NetTestType.FailedPing, sourceIP.GetIPString, destIP.GetIPString);
- }
- }
+ //if (sourceIP != null && destIP != null)
+ //{
+ // if (MyType == PacketType.ping_answer && MyStatus == PacketStatus.finished_failed)
+ // {
+ // myNet.NoteActionDone(NetTestType.FailedPing, destIP.GetIPString, sourceIP.GetIPString);
+ // }
+ // if (MyType == PacketType.ping_request && MyStatus == PacketStatus.finished_failed)
+ // {
+ // myNet.NoteActionDone(NetTestType.FailedPing, sourceIP.GetIPString, destIP.GetIPString);
+ // if(WhereAmI != null)
+ // Console.WriteLine("Dropping at: "+ WhereAmI.hostname);
+ // }
+ //}
}
}
diff --git a/EduNetworkBuilder/Properties/Resources.Designer.cs b/EduNetworkBuilder/Properties/Resources.Designer.cs
index 189bda0..683745a 100644
--- a/EduNetworkBuilder/Properties/Resources.Designer.cs
+++ b/EduNetworkBuilder/Properties/Resources.Designer.cs
@@ -782,6 +782,16 @@ namespace EduNetworkBuilder.Properties {
}
}
+ ///
+ /// Looks up a localized resource of type System.Byte[].
+ ///
+ internal static byte[] Level6_ConnectTheLaptop {
+ get {
+ object obj = ResourceManager.GetObject("Level6_ConnectTheLaptop", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
///
/// Looks up a localized resource of type System.Byte[].
///
diff --git a/EduNetworkBuilder/Properties/Resources.resx b/EduNetworkBuilder/Properties/Resources.resx
index a0e996c..98f56d5 100644
--- a/EduNetworkBuilder/Properties/Resources.resx
+++ b/EduNetworkBuilder/Properties/Resources.resx
@@ -433,4 +433,7 @@
..\Resources\Level6_VlanRouting3.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\Level6_ConnectTheLaptop.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level6_ConnectTheLaptop.enbx b/EduNetworkBuilder/Resources/Level6_ConnectTheLaptop.enbx
new file mode 100644
index 0000000..939cb57
--- /dev/null
+++ b/EduNetworkBuilder/Resources/Level6_ConnectTheLaptop.enbx
@@ -0,0 +1,1680 @@
+
+
+
+
+ Fix the vlan so that the laptop is on the guest LAN.
+ Guest Laptop
+ 1024
+ 1024
+ 100
+ False
+ 6
+ 3.6
+ 171
+ none
+ True
+ True
+
+ firewall0
+ 100
+ 100
+ 760,80
+ firewall
+ False
+ False
+ True
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 100
+ 101
+ firewall0
+ lo0
+
+ lo
+ 101
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ wan
+ wan0
+
+ 100
+ 104
+ firewall0
+ wan0
+
+ wan
+ 104
+ False
+
+ wan0
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 100
+ 102
+ firewall0
+ eth0
+
+ eth
+ 102
+ False
+
+ eth0
+
+ 192.168.1.1
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Tagged
+
+
+ eth0:1
+
+ 192.168.2.1
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Tagged
+
+
+ eth0:2
+
+ 192.168.3.1
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Tagged
+
+
+ eth0:3
+
+ 192.168.0.1
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Tagged
+
+
+
+ eth
+ eth1
+
+ 100
+ 103
+ firewall0
+ eth1
+
+ eth
+ 103
+ False
+
+ eth1
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+ eth0:3
+ Drop
+
+
+
+ eth0:1
+ Drop
+
+
+
+ eth0
+ Drop
+
+
+
+ eth0:3
+ Drop
+
+
+
+ laptop0
+ 100
+ 166
+ 420,170
+ laptop
+ False
+ False
+ Green
+
+ 192.168.3.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 166
+ 167
+ laptop0
+ lo0
+
+ lo
+ 167
+ False
+
+
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 166
+ 168
+ laptop0
+ eth0
+
+ eth
+ 168
+ False
+
+
+
+ eth0
+
+ 192.168.3.7
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+ net_switch0
+ 100
+ 105
+ 120,380
+ net_switch
+ False
+ False
+
+ 192.168.0.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 105
+ 106
+ net_switch0
+ lo0
+
+ lo
+ 106
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ management_interface
+ management_interface0
+
+ 105
+ 107
+ net_switch0
+ management_interface0
+
+ management_interface
+ 107
+ False
+
+ management_interface0
+
+ 192.168.0.4
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ port
+ port1
+
+ 105
+ 108
+ net_switch0
+ port1
+
+ port
+ 108
+ False
+
+ port1
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Untagged
+
+
+
+ port
+ port2
+
+ 105
+ 109
+ net_switch0
+ port2
+
+ port
+ 109
+ False
+
+ port2
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Untagged
+
+
+
+ port
+ port3
+
+ 105
+ 110
+ net_switch0
+ port3
+
+ port
+ 110
+ False
+
+ port3
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port4
+
+ 105
+ 111
+ net_switch0
+ port4
+
+ port
+ 111
+ False
+
+ port4
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port5
+
+ 105
+ 112
+ net_switch0
+ port5
+
+ port
+ 112
+ False
+
+ port5
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Untagged
+
+
+
+ port
+ port6
+
+ 105
+ 113
+ net_switch0
+ port6
+
+ port
+ 113
+ False
+
+ port6
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Tagged
+ Tagged
+ Tagged
+ Tagged
+
+
+
+ port
+ port7
+
+ 105
+ 114
+ net_switch0
+ port7
+
+ port
+ 114
+ False
+
+ port7
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Tagged
+ Tagged
+ Tagged
+ Tagged
+
+
+
+
+ net_switch1
+ 100
+ 115
+ 420,380
+ net_switch
+ False
+ False
+
+ 192.168.0.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 115
+ 116
+ net_switch1
+ lo0
+
+ lo
+ 116
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ management_interface
+ management_interface0
+
+ 115
+ 117
+ net_switch1
+ management_interface0
+
+ management_interface
+ 117
+ False
+
+ management_interface0
+
+ 192.168.0.3
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Untagged
+
+
+
+ port
+ port1
+
+ 115
+ 118
+ net_switch1
+ port1
+
+ port
+ 118
+ False
+
+ port1
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Untagged
+ Forbidden
+
+
+
+ port
+ port2
+
+ 115
+ 119
+ net_switch1
+ port2
+
+ port
+ 119
+ False
+
+ port2
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port3
+
+ 115
+ 120
+ net_switch1
+ port3
+
+ port
+ 120
+ False
+
+ port3
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port4
+
+ 115
+ 121
+ net_switch1
+ port4
+
+ port
+ 121
+ False
+
+ port4
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port5
+
+ 115
+ 122
+ net_switch1
+ port5
+
+ port
+ 122
+ False
+
+ port5
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port6
+
+ 115
+ 123
+ net_switch1
+ port6
+
+ port
+ 123
+ False
+
+ port6
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Tagged
+ Tagged
+ Tagged
+ Tagged
+
+
+
+ port
+ port7
+
+ 115
+ 124
+ net_switch1
+ port7
+
+ port
+ 124
+ False
+
+ port7
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Tagged
+ Tagged
+ Tagged
+ Tagged
+
+
+
+
+ net_switch2
+ 100
+ 125
+ 760,380
+ net_switch
+ False
+ False
+
+ 192.168.0.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 125
+ 126
+ net_switch2
+ lo0
+
+ lo
+ 126
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ management_interface
+ management_interface0
+
+ 125
+ 127
+ net_switch2
+ management_interface0
+
+ management_interface
+ 127
+ False
+
+ management_interface0
+
+ 192.168.0.2
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port1
+
+ 125
+ 128
+ net_switch2
+ port1
+
+ port
+ 128
+ False
+
+ port1
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Untagged
+ Forbidden
+
+
+
+ port
+ port2
+
+ 125
+ 129
+ net_switch2
+ port2
+
+ port
+ 129
+ False
+
+ port2
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Forbidden
+ Forbidden
+ Untagged
+
+
+
+ port
+ port3
+
+ 125
+ 130
+ net_switch2
+ port3
+
+ port
+ 130
+ False
+
+ port3
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port4
+
+ 125
+ 131
+ net_switch2
+ port4
+
+ port
+ 131
+ False
+
+ port4
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port5
+
+ 125
+ 132
+ net_switch2
+ port5
+
+ port
+ 132
+ False
+
+ port5
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+ Forbidden
+
+
+
+ port
+ port6
+
+ 125
+ 133
+ net_switch2
+ port6
+
+ port
+ 133
+ False
+
+ port6
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Tagged
+ Tagged
+ Tagged
+ Tagged
+
+
+
+ port
+ port7
+
+ 125
+ 134
+ net_switch2
+ port7
+
+ port
+ 134
+ False
+
+ port7
+
+ 0.0.0.0
+ 0.0.0.0
+ 0.0.0.0
+ ip
+
+ Tagged
+ Tagged
+ Tagged
+ Tagged
+
+
+
+
+ pc0
+ 100
+ 135
+ 0,670
+ pc
+ False
+ False
+ Purple
+
+ 192.168.1.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 135
+ 136
+ pc0
+ lo0
+
+ lo
+ 136
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 135
+ 137
+ pc0
+ eth0
+
+ eth
+ 137
+ False
+
+ eth0
+
+ 192.168.1.5
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+ pc1
+ 100
+ 138
+ 150,640
+ pc
+ False
+ False
+ Purple
+
+ 192.168.1.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 138
+ 139
+ pc1
+ lo0
+
+ lo
+ 139
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 138
+ 140
+ pc1
+ eth0
+
+ eth
+ 140
+ False
+
+ eth0
+
+ 192.168.1.6
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+ pc2
+ 100
+ 141
+ 340,700
+ pc
+ False
+ False
+ Yellow
+
+ 192.168.2.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 141
+ 142
+ pc2
+ lo0
+
+ lo
+ 142
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 141
+ 143
+ pc2
+ eth0
+
+ eth
+ 143
+ False
+
+ eth0
+
+ 192.168.2.5
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+ pc3
+ 100
+ 144
+ 460,650
+ pc
+ False
+ False
+ Yellow
+
+ 192.168.2.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 144
+ 145
+ pc3
+ lo0
+
+ lo
+ 145
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 144
+ 146
+ pc3
+ eth0
+
+ eth
+ 146
+ False
+
+ eth0
+
+ 192.168.2.6
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+ pc4
+ 100
+ 147
+ 710,780
+ pc
+ False
+ False
+ Green
+
+ 192.168.3.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 147
+ 148
+ pc4
+ lo0
+
+ lo
+ 148
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 147
+ 149
+ pc4
+ eth0
+
+ eth
+ 149
+ False
+
+ eth0
+
+ 192.168.3.5
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+ pc5
+ 100
+ 150
+ 830,700
+ pc
+ False
+ False
+ Green
+
+ 192.168.3.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 150
+ 151
+ pc5
+ lo0
+
+ lo
+ 151
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 150
+ 152
+ pc5
+ eth0
+
+ eth
+ 152
+ False
+
+ eth0
+
+ 192.168.3.6
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+ server0
+ 100
+ 153
+ 120,190
+ server
+ False
+ False
+ Purple
+
+ 192.168.1.1
+ 0.0.0.0
+ 0.0.0.0
+ gw
+
+
+ lo
+ lo0
+
+ 153
+ 154
+ server0
+ lo0
+
+ lo
+ 154
+ False
+
+ lo0
+
+ 127.0.0.1
+ 255.0.0.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+ eth
+ eth0
+
+ 153
+ 155
+ server0
+ eth0
+
+ eth
+ 155
+ False
+
+ eth0
+
+ 192.168.1.2
+ 255.255.255.0
+ 0.0.0.0
+ ip
+
+ Untagged
+
+
+
+
+
+ 147
+ 149
+ pc4
+ eth0
+
+
+ 125
+ 128
+ net_switch2
+ port1
+
+
+ normal
+ 163
+
+
+
+ 105
+ 112
+ net_switch0
+ port5
+
+
+ 153
+ 155
+ server0
+ eth0
+
+
+ normal
+ 165
+
+
+
+ 105
+ 114
+ net_switch0
+ port7
+
+
+ 115
+ 123
+ net_switch1
+ port6
+
+
+ normal
+ 156
+
+
+
+ 144
+ 146
+ pc3
+ eth0
+
+
+ 115
+ 119
+ net_switch1
+ port2
+
+
+ normal
+ 162
+
+
+
+ 125
+ 134
+ net_switch2
+ port7
+
+
+ 100
+ 102
+ firewall0
+ eth0
+
+
+ normal
+ 158
+
+
+
+ 166
+ 168
+ laptop0
+ eth0
+
+
+ 115
+ 120
+ net_switch1
+ port3
+
+
+ normal
+ 170
+
+
+
+ 150
+ 152
+ pc5
+ eth0
+
+
+ 125
+ 129
+ net_switch2
+ port2
+
+
+ normal
+ 164
+
+
+
+ 105
+ 108
+ net_switch0
+ port1
+
+
+ 135
+ 137
+ pc0
+ eth0
+
+
+ normal
+ 159
+
+
+
+ 138
+ 140
+ pc1
+ eth0
+
+
+ 105
+ 109
+ net_switch0
+ port2
+
+
+ normal
+ 160
+
+
+
+ 141
+ 143
+ pc2
+ eth0
+
+
+ 115
+ 118
+ net_switch1
+ port1
+
+
+ normal
+ 161
+
+
+
+ 115
+ 124
+ net_switch1
+ port7
+
+
+ 125
+ 133
+ net_switch2
+ port6
+
+
+ normal
+ 157
+
+
+ laptop0
+ pc5
+ SuccessfullyPings
+
+ Firewall
+ VLAN
+ Default
+ Staff
+ Student
+ Guest
+
+
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/Level6_Intro3_LockedOut.enbx b/EduNetworkBuilder/Resources/Level6_Intro3_LockedOut.enbx
index 6814680..34d6831 100644
--- a/EduNetworkBuilder/Resources/Level6_Intro3_LockedOut.enbx
+++ b/EduNetworkBuilder/Resources/Level6_Intro3_LockedOut.enbx
@@ -4,16 +4,16 @@
By default, switches are managed using the "Management Interface" IP Address. Most managed switches have a "Management VLAN" that you can communicate with the Management IP on. When that IP address is not accessible, you are locked out of the switch. You can also lock yourself out by forgetting the password, or forgetting the IP address.
-In EduNetworkBuilder, the only real way to lock yourself out is by setting all the VLANs on the management interface to "forbidden", or, if you "firbid" the vlan that the management interface uses.
+In EduNetworkBuilder, the only real way to lock yourself out is by setting all the VLANs on the management interface to "forbidden", or, if you "forbid" the vlan that the management interface uses.
-This puzzle has one switch that you have been locked out of. Reset it. Then, you need to set the trunk-port (port1) to tagged for both vlans, and set the port that pc2 is on to be on vlan 2.
+This puzzle has one switch that you have been locked out of. Reset it (right-click). Then, you need to set the trunk-port (port1) to tagged for both vlans, and set the port that pc2 is on to be on vlan 2.
VLAN Intro 3 Locked Out
1024
1024
100
True
6
- 0.7
+ 3.2
145
full
True
diff --git a/EduNetworkBuilder/Resources/Level6_SorryBoss.enbx b/EduNetworkBuilder/Resources/Level6_SorryBoss.enbx
index 8481eb0..f675dd9 100644
--- a/EduNetworkBuilder/Resources/Level6_SorryBoss.enbx
+++ b/EduNetworkBuilder/Resources/Level6_SorryBoss.enbx
@@ -40,8 +40,6 @@
lo
147
False
-
-
lo0
@@ -66,8 +64,6 @@
wan
150
False
-
-
wan0
@@ -92,8 +88,6 @@
eth
148
False
-
-
eth0
@@ -131,8 +125,6 @@
eth
149
False
-
-
eth1
@@ -197,8 +189,6 @@
lo
143
False
-
-
lo0
@@ -223,8 +213,6 @@
eth
144
True
-
-
eth0
@@ -264,7 +252,7 @@
lo
110
False
-
+
lo0
@@ -289,7 +277,7 @@
management_interface
111
False
-
+
management_interface0
@@ -314,7 +302,7 @@
port
112
False
-
+
port1
@@ -341,7 +329,7 @@
port
113
False
-
+
port2
@@ -368,7 +356,7 @@
port
114
False
-
+
port3
@@ -395,7 +383,7 @@
port
115
False
-
+
port4
@@ -422,7 +410,7 @@
port
116
False
-
+
port5
@@ -449,7 +437,7 @@
port
117
False
-
+
port6
@@ -476,7 +464,7 @@
port
118
False
-
+
port7
@@ -519,7 +507,7 @@
lo
122
False
-
+
lo0
@@ -544,7 +532,7 @@
eth
123
False
-
+
eth0
@@ -585,7 +573,7 @@
lo
125
False
-
+
lo0
@@ -610,7 +598,7 @@
eth
126
False
-
+
eth0
@@ -651,7 +639,7 @@
lo
128
False
-
+
lo0
@@ -676,7 +664,7 @@
eth
129
False
-
+
eth0
@@ -717,7 +705,7 @@
lo
131
False
-
+
lo0
@@ -742,7 +730,7 @@
eth
132
False
-
+
eth0
@@ -863,6 +851,11 @@
pc1
SuccessfullyPings
+
+ laptop0
+ pc3
+ NeedsLocalIPTo
+
VLAN
- This map shows how VLANs affect DHCP. Change the ports on net_switch1 that are connected to the wireless access point and laptop1. The WAP does not know how to do VLANS, so you control the VLAN that the accesspoint is connected to on net_switch1. Untag the port for the vlan that the laptop is supposed to be connected to do, doing a dhcp-request after you change it.
+ This map shows how VLANs affect DHCP. Change the ports on net_switch1 that are connected to the wireless access point and laptop1. The WAP does not know how to do VLANS, so you control the VLAN that the accesspoint is connected to on net_switch1. Untag the port for the vlan that the laptop is supposed to be connected to do (mouse-over the laptop to see what it is supposed to be "local" to), doing a dhcp-request after you change it.
For this map, the VLAN packets are displayed with the color of the PC on that VLAN. That will help you visualize when the packet is tagged and when it is not.
Untagged ports and DHCP
1024