Fix resize issue, reactivate light and microwave, and add puzzles

This commit is contained in:
Tim Young 2015-08-15 08:29:05 -06:00
parent e24d9fd8c1
commit f144429554
11 changed files with 3377 additions and 10417 deletions

View File

@ -215,6 +215,8 @@
<None Include="Resources\Level0_BrokenLink.enbx" /> <None Include="Resources\Level0_BrokenLink.enbx" />
<None Include="Resources\Level0_NetworkLoop.enbx" /> <None Include="Resources\Level0_NetworkLoop.enbx" />
<None Include="Resources\Level0_NetworkLoop2.enbx" /> <None Include="Resources\Level0_NetworkLoop2.enbx" />
<None Include="Resources\Level0_PacketCorruption1.enbx" />
<None Include="Resources\Level0_PacketCorruption2.enbx" />
<None Include="Resources\Level1-BadDHCP.enbx" /> <None Include="Resources\Level1-BadDHCP.enbx" />
<None Include="Resources\Level1-BadIP.enbx" /> <None Include="Resources\Level1-BadIP.enbx" />
<None Include="Resources\Level1-DuplicateIPs.enbx" /> <None Include="Resources\Level1-DuplicateIPs.enbx" />

View File

@ -48,12 +48,13 @@ namespace EduNetworkBuilder
public enum HelpTopics { public enum HelpTopics {
None, DHCP, DHCPServer, Firewall, Gateway, Help, IPAddress, Link, Subnet, Ping, None, DHCP, DHCPServer, Firewall, Gateway, Help, IPAddress, Link, Subnet, Ping,
VPN, Hub, Switch, ARP, StaticRoute, Subnetting, WhenToSubnet, ComparingAddresses, MACAddress, VPN, Hub, Switch, ARP, StaticRoute, Subnetting, WhenToSubnet, ComparingAddresses, MACAddress,
Network, Packet, NIC, Interface, Router Network, Packet, NIC, Interface, Router, PacketCorruption
} }
public enum PuzzleNames public enum PuzzleNames
{ {
Level0_IP, Level1_NoGateway, Level0_NeedsLink, Level0_NoSwitch, Level1_BadDHCP, Level1_BadGateway, Level0_IP, Level1_NoGateway, Level0_NeedsLink, Level0_NoSwitch, Level1_BadDHCP, Level1_BadGateway,
Level0_SimpleDHCP, Level1_BadIP, Level0_Help, Level0_Ping, Level0_HubVsSwitch, Level1_MixedNetwork, Level0_SimpleDHCP, Level1_BadIP, Level0_Help, Level0_Ping, Level0_HubVsSwitch,
Level0_PacketCorruption1, Level0_PacketCorruption2, Level1_MixedNetwork,
Level1_MidDHCP, Level1_OneNetTwoSubnets, Level1_DuplicateIPs, Level0_NetworkLoop, Level1_DuplicateMAC, Level1_MidDHCP, Level1_OneNetTwoSubnets, Level1_DuplicateIPs, Level0_NetworkLoop, Level1_DuplicateMAC,
Level2_FirewallDemo, Level1_OneNetTwoSubnets2, Level2_VPN_Demo, Level2_Bad_VPN_IP, Level2_Bad_Encryption, Level2_FirewallDemo, Level1_OneNetTwoSubnets2, Level2_VPN_Demo, Level2_Bad_VPN_IP, Level2_Bad_Encryption,
Level2_Bad_Route, Level2_Blast_From_Past, Level2_Not_Working, Level2_Build_A_VPN, Level2_Connect_The_Dots, Level2_Bad_Route, Level2_Blast_From_Past, Level2_Not_Working, Level2_Build_A_VPN, Level2_Connect_The_Dots,

View File

@ -282,8 +282,8 @@ namespace EduNetworkBuilder
BuildButton("btnFirewall", Properties.Resources.firewall, "Add a firewall to the network."); BuildButton("btnFirewall", Properties.Resources.firewall, "Add a firewall to the network.");
BuildButton("btnPrinter", Properties.Resources.Printer, "Add a printer to the network."); BuildButton("btnPrinter", Properties.Resources.Printer, "Add a printer to the network.");
BuildButton("btnCopier", Properties.Resources.Copier, "Add a copier to the network."); BuildButton("btnCopier", Properties.Resources.Copier, "Add a copier to the network.");
//BuildButton("btnMicrowave", Properties.Resources.microwave, "Add a microwave to the network."); BuildButton("btnMicrowave", Properties.Resources.microwave, "Add a microwave to the network.");
//BuildButton("btnFluorescent", Properties.Resources.fluorescent, "Add a light to the network."); BuildButton("btnFluorescent", Properties.Resources.fluorescent, "Add a light to the network.");
//BuildButton("btnWAP", Properties.Resources.wap, "Add a Wireless Access Point to the network."); //BuildButton("btnWAP", Properties.Resources.wap, "Add a Wireless Access Point to the network.");
//BuildButton("btnWRouter", Properties.Resources.WRouter, "Add a Wireless Router to the network."); //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("btnWBridge", Properties.Resources.WBridge, "Add a Wireless Bridge to the network.");
@ -1113,6 +1113,15 @@ namespace EduNetworkBuilder
private void BuilderWindow_Load(object sender, EventArgs e) private void BuilderWindow_Load(object sender, EventArgs e)
{ {
if (Properties.Settings.Default.MainWindowX != -1 && Properties.Settings.Default.MainWindowY != -1)
{
Location = new Point(Properties.Settings.Default.MainWindowX, Properties.Settings.Default.MainWindowY);
}
if (Properties.Settings.Default.MainWindowHeight != -1 && Properties.Settings.Default.MainWindowWidth != -1)
{
Height = Properties.Settings.Default.MainWindowHeight;
Width = Properties.Settings.Default.MainWindowWidth;
}
//If we started by clicking on a file, load that file //If we started by clicking on a file, load that file
if (AppDomain.CurrentDomain.SetupInformation.ActivationArguments != null && AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData != null && AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData.Any()) if (AppDomain.CurrentDomain.SetupInformation.ActivationArguments != null && AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData != null && AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData.Any())
{ {
@ -1138,15 +1147,6 @@ namespace EduNetworkBuilder
puzzlesToolStripMenuItem_Click(null, null); puzzlesToolStripMenuItem_Click(null, null);
} }
} }
if (Properties.Settings.Default.MainWindowX != -1 && Properties.Settings.Default.MainWindowY != -1)
{
Location = new Point(Properties.Settings.Default.MainWindowX, Properties.Settings.Default.MainWindowY);
}
if (Properties.Settings.Default.MainWindowHeight != -1 && Properties.Settings.Default.MainWindowWidth != -1)
{
Height = Properties.Settings.Default.MainWindowHeight;
Width = Properties.Settings.Default.MainWindowWidth;
}
} }
private void btnHelp_Click(object sender, EventArgs e) private void btnHelp_Click(object sender, EventArgs e)

View File

@ -22,6 +22,10 @@ namespace EduNetworkBuilder
get { return _MyStatus; } get { return _MyStatus; }
set { set {
_MyStatus = value; _MyStatus = value;
if(_MyStatus == PacketStatus.finished_ok)
{
Tracking.Finished = true;
}
if (_MyStatus == PacketStatus.finished_failed || _MyStatus == PacketStatus.finished_ok) if (_MyStatus == PacketStatus.finished_failed || _MyStatus == PacketStatus.finished_ok)
{ {
string status = _MyStatus.ToString(); string status = _MyStatus.ToString();

View File

@ -126,8 +126,11 @@ namespace EduNetworkBuilder.Properties {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;} /// Looks up a localized string similar to {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Calibri;}{\f1\fnil\fcharset0 Calibri;}{\f2\fmodern\fprq1\fcharset0 Courier New;}{\f3\fmodern\fprq1\fcharset0 Consolas;}}
///{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbi [rest of string was truncated]&quot;;. ///{\colortbl ;\red0\green0\blue255;}
///{\*\generator Riched20 6.3.9600}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1
///\pard\widctlpar\sa200\sl276\slmult1\b\f0\fs22\lang9 Help:\b0\par
///This is a basic help document for EduNetworkBuilder. You can get to this by going to &quot; [rest of string was truncated]&quot;;.
/// </summary> /// </summary>
internal static string Help { internal static string Help {
get { get {
@ -245,6 +248,26 @@ namespace EduNetworkBuilder.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] Level0_PacketCorruption1 {
get {
object obj = ResourceManager.GetObject("Level0_PacketCorruption1", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] Level0_PacketCorruption2 {
get {
object obj = ResourceManager.GetObject("Level0_PacketCorruption2", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Byte[]. /// Looks up a localized resource of type System.Byte[].
/// </summary> /// </summary>
@ -688,13 +711,12 @@ namespace EduNetworkBuilder.Properties {
/// <summary> /// <summary>
/// Looks up a localized string similar to {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}} /// 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 ///{\*\generator Riched20 6.3.9600}\viewkind4\uc1
///\pard\sa200\sl276\slmult1\f0\fs22\lang9 Version 1.0.20 08/12/2015\par ///\pard\sa200\sl276\slmult1\f0\fs22\lang9 Version 1.0.21\par
///* Added a microwave and fluorescent light. They corrupt data when packets run close to them. \par
///Version 1.0.20 08/12/2015\par
///* wports do not display on tooltips or when printing the device info\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 ///* 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 ///* commented out wireless devices for now - [rest of string was truncated]&quot;;.
///* added search box to help\par
///Version 1.0.19 08/08/2015\par
/// [rest of string was truncated]&quot;;.
/// </summary> /// </summary>
internal static string ReleaseNotes { internal static string ReleaseNotes {
get { get {

View File

@ -340,4 +340,10 @@
<data name="microwave" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="microwave" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\microwave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\microwave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Level0_PacketCorruption1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Level0_PacketCorruption1.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Level0_PacketCorruption2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Level0_PacketCorruption2.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root> </root>

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,645 @@
<?xml version="1.0" encoding="utf-8"?>
<EduNetworkBuilder>
<!--This is a network file for EduNetworkBuilder.-->
<Network>
<en_message>Network wires that run too close to electrical wires or fluorescent lights can cause packet corruption. Move the light out of the way if the packet get corrupted.</en_message>
<en_title>Packet Corruption</en_title>
<height>1024</height>
<width>1024</width>
<itemsize>100</itemsize>
<showlabels>True</showlabels>
<level>0</level>
<sortorder>6.5</sortorder>
<uniqueidentifier>133</uniqueidentifier>
<startinghelplevel>full</startinghelplevel>
<device>
<hostname>laptop0</hostname>
<size>100</size>
<uniqueidentifier>103</uniqueidentifier>
<location>559,560</location>
<mytype>laptop</mytype>
<isdns>False</isdns>
<isdhcp>False</isdhcp>
<gateway>
<ip>192.168.1.1</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>gw</type>
</gateway>
<nic>
<nictype>lo</nictype>
<nicname>lo0</nicname>
<myid>
<hostid>103</hostid>
<nicid>104</nicid>
<hostname>laptop0</hostname>
<nicname>lo0</nicname>
</myid>
<nictype>lo</nictype>
<uniqueidentifier>104</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>lo0</nicname>
<myip>
<ip>127.0.0.1</ip>
<mask>255.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>eth</nictype>
<nicname>eth0</nicname>
<myid>
<hostid>103</hostid>
<nicid>105</nicid>
<hostname>laptop0</hostname>
<nicname>eth0</nicname>
</myid>
<nictype>eth</nictype>
<uniqueidentifier>105</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>eth0</nicname>
<myip>
<ip>192.168.1.3</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
</device>
<device>
<hostname>laptop1</hostname>
<size>100</size>
<uniqueidentifier>123</uniqueidentifier>
<location>680,147</location>
<mytype>laptop</mytype>
<isdns>False</isdns>
<isdhcp>False</isdhcp>
<gateway>
<ip>192.168.2.1</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>gw</type>
</gateway>
<nic>
<nictype>lo</nictype>
<nicname>lo0</nicname>
<myid>
<hostid>123</hostid>
<nicid>124</nicid>
<hostname>laptop1</hostname>
<nicname>lo0</nicname>
</myid>
<nictype>lo</nictype>
<uniqueidentifier>124</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>lo0</nicname>
<myip>
<ip>127.0.0.1</ip>
<mask>255.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>eth</nictype>
<nicname>eth0</nicname>
<myid>
<hostid>123</hostid>
<nicid>125</nicid>
<hostname>laptop1</hostname>
<nicname>eth0</nicname>
</myid>
<nictype>eth</nictype>
<uniqueidentifier>125</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>eth0</nicname>
<myip>
<ip>192.168.2.2</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
</device>
<device>
<hostname>net_switch0</hostname>
<size>100</size>
<uniqueidentifier>109</uniqueidentifier>
<location>406,328</location>
<mytype>net_switch</mytype>
<isdns>False</isdns>
<isdhcp>False</isdhcp>
<gateway>
<ip>192.168.1.1</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>gw</type>
</gateway>
<nic>
<nictype>lo</nictype>
<nicname>lo0</nicname>
<myid>
<hostid>109</hostid>
<nicid>110</nicid>
<hostname>net_switch0</hostname>
<nicname>lo0</nicname>
</myid>
<nictype>lo</nictype>
<uniqueidentifier>110</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>lo0</nicname>
<myip>
<ip>127.0.0.1</ip>
<mask>255.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>management_interface</nictype>
<nicname>management_interface0</nicname>
<myid>
<hostid>109</hostid>
<nicid>111</nicid>
<hostname>net_switch0</hostname>
<nicname>management_interface0</nicname>
</myid>
<nictype>management_interface</nictype>
<uniqueidentifier>111</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>management_interface0</nicname>
<myip>
<ip>192.168.1.4</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>port</nictype>
<nicname>port1</nicname>
<myid>
<hostid>109</hostid>
<nicid>112</nicid>
<hostname>net_switch0</hostname>
<nicname>port1</nicname>
</myid>
<nictype>port</nictype>
<uniqueidentifier>112</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>port1</nicname>
<myip>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>port</nictype>
<nicname>port2</nicname>
<myid>
<hostid>109</hostid>
<nicid>113</nicid>
<hostname>net_switch0</hostname>
<nicname>port2</nicname>
</myid>
<nictype>port</nictype>
<uniqueidentifier>113</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>port2</nicname>
<myip>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>port</nictype>
<nicname>port3</nicname>
<myid>
<hostid>109</hostid>
<nicid>114</nicid>
<hostname>net_switch0</hostname>
<nicname>port3</nicname>
</myid>
<nictype>port</nictype>
<uniqueidentifier>114</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>port3</nicname>
<myip>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>port</nictype>
<nicname>port4</nicname>
<myid>
<hostid>109</hostid>
<nicid>115</nicid>
<hostname>net_switch0</hostname>
<nicname>port4</nicname>
</myid>
<nictype>port</nictype>
<uniqueidentifier>115</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>port4</nicname>
<myip>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>port</nictype>
<nicname>port5</nicname>
<myid>
<hostid>109</hostid>
<nicid>116</nicid>
<hostname>net_switch0</hostname>
<nicname>port5</nicname>
</myid>
<nictype>port</nictype>
<uniqueidentifier>116</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>port5</nicname>
<myip>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>port</nictype>
<nicname>port6</nicname>
<myid>
<hostid>109</hostid>
<nicid>117</nicid>
<hostname>net_switch0</hostname>
<nicname>port6</nicname>
</myid>
<nictype>port</nictype>
<uniqueidentifier>117</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>port6</nicname>
<myip>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>port</nictype>
<nicname>port7</nicname>
<myid>
<hostid>109</hostid>
<nicid>118</nicid>
<hostname>net_switch0</hostname>
<nicname>port7</nicname>
</myid>
<nictype>port</nictype>
<uniqueidentifier>118</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>port7</nicname>
<myip>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
</device>
<device>
<hostname>pc0</hostname>
<size>100</size>
<uniqueidentifier>100</uniqueidentifier>
<location>246,560</location>
<mytype>pc</mytype>
<isdns>False</isdns>
<isdhcp>False</isdhcp>
<gateway>
<ip>192.168.1.1</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>gw</type>
</gateway>
<nic>
<nictype>lo</nictype>
<nicname>lo0</nicname>
<myid>
<hostid>100</hostid>
<nicid>101</nicid>
<hostname>pc0</hostname>
<nicname>lo0</nicname>
</myid>
<nictype>lo</nictype>
<uniqueidentifier>101</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>lo0</nicname>
<myip>
<ip>127.0.0.1</ip>
<mask>255.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>eth</nictype>
<nicname>eth0</nicname>
<myid>
<hostid>100</hostid>
<nicid>102</nicid>
<hostname>pc0</hostname>
<nicname>eth0</nicname>
</myid>
<nictype>eth</nictype>
<uniqueidentifier>102</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>eth0</nicname>
<myip>
<ip>192.168.1.2</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
</device>
<device>
<hostname>router0</hostname>
<size>100</size>
<uniqueidentifier>119</uniqueidentifier>
<location>400,158</location>
<mytype>router</mytype>
<isdns>False</isdns>
<isdhcp>False</isdhcp>
<gateway>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>gw</type>
</gateway>
<nic>
<nictype>lo</nictype>
<nicname>lo0</nicname>
<myid>
<hostid>119</hostid>
<nicid>120</nicid>
<hostname>router0</hostname>
<nicname>lo0</nicname>
</myid>
<nictype>lo</nictype>
<uniqueidentifier>120</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>lo0</nicname>
<myip>
<ip>127.0.0.1</ip>
<mask>255.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>eth</nictype>
<nicname>eth0</nicname>
<myid>
<hostid>119</hostid>
<nicid>121</nicid>
<hostname>router0</hostname>
<nicname>eth0</nicname>
</myid>
<nictype>eth</nictype>
<uniqueidentifier>121</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>eth0</nicname>
<myip>
<ip>192.168.1.1</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>eth</nictype>
<nicname>eth1</nicname>
<myid>
<hostid>119</hostid>
<nicid>122</nicid>
<hostname>router0</hostname>
<nicname>eth1</nicname>
</myid>
<nictype>eth</nictype>
<uniqueidentifier>122</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>eth1</nicname>
<myip>
<ip>192.168.2.1</ip>
<mask>255.255.255.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
</device>
<device>
<hostname>fluorescent0</hostname>
<size>100</size>
<uniqueidentifier>130</uniqueidentifier>
<location>570,310</location>
<mytype>fluorescent</mytype>
<isdns>False</isdns>
<isdhcp>False</isdhcp>
<gateway>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>gw</type>
</gateway>
<nic>
<nictype>lo</nictype>
<nicname>lo0</nicname>
<myid>
<hostid>130</hostid>
<nicid>131</nicid>
<hostname>fluorescent0</hostname>
<nicname>lo0</nicname>
</myid>
<nictype>lo</nictype>
<uniqueidentifier>131</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>lo0</nicname>
<myip>
<ip>127.0.0.1</ip>
<mask>255.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
<nic>
<nictype>eth</nictype>
<nicname>eth0</nicname>
<myid>
<hostid>130</hostid>
<nicid>132</nicid>
<hostname>fluorescent0</hostname>
<nicname>eth0</nicname>
</myid>
<nictype>eth</nictype>
<uniqueidentifier>132</uniqueidentifier>
<usesdhcp>False</usesdhcp>
<encryptionkey />
<interface>
<nicname>eth0</nicname>
<myip>
<ip>0.0.0.0</ip>
<mask>0.0.0.0</mask>
<gateway>0.0.0.0</gateway>
<type>ip</type>
</myip>
</interface>
</nic>
</device>
<link>
<SrcNic>
<hostid>100</hostid>
<nicid>102</nicid>
<hostname>pc0</hostname>
<nicname>eth0</nicname>
</SrcNic>
<DstNic>
<hostid>109</hostid>
<nicid>112</nicid>
<hostname>net_switch0</hostname>
<nicname>port1</nicname>
</DstNic>
<hostname />
<linktype>normal</linktype>
<uniqueidentifier>126</uniqueidentifier>
</link>
<link>
<SrcNic>
<hostid>103</hostid>
<nicid>105</nicid>
<hostname>laptop0</hostname>
<nicname>eth0</nicname>
</SrcNic>
<DstNic>
<hostid>109</hostid>
<nicid>113</nicid>
<hostname>net_switch0</hostname>
<nicname>port2</nicname>
</DstNic>
<hostname />
<linktype>normal</linktype>
<uniqueidentifier>127</uniqueidentifier>
</link>
<link>
<SrcNic>
<hostid>109</hostid>
<nicid>114</nicid>
<hostname>net_switch0</hostname>
<nicname>port3</nicname>
</SrcNic>
<DstNic>
<hostid>119</hostid>
<nicid>121</nicid>
<hostname>router0</hostname>
<nicname>eth0</nicname>
</DstNic>
<hostname />
<linktype>normal</linktype>
<uniqueidentifier>128</uniqueidentifier>
</link>
<link>
<SrcNic>
<hostid>119</hostid>
<nicid>122</nicid>
<hostname>router0</hostname>
<nicname>eth1</nicname>
</SrcNic>
<DstNic>
<hostid>123</hostid>
<nicid>125</nicid>
<hostname>laptop1</hostname>
<nicname>eth0</nicname>
</DstNic>
<hostname />
<linktype>normal</linktype>
<uniqueidentifier>129</uniqueidentifier>
</link>
<nettest>
<shost>fluorescent0</shost>
<dhost>All</dhost>
<thetest>LockAll</thetest>
</nettest>
<nettest>
<shost>laptop0</shost>
<dhost>laptop1</dhost>
<thetest>SuccessfullyPings</thetest>
</nettest>
<tag>PacketCorruption</tag>
</Network>
</EduNetworkBuilder>

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,8 @@
{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}} {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
{\*\generator Riched20 6.3.9600}\viewkind4\uc1 {\*\generator Riched20 6.3.9600}\viewkind4\uc1
\pard\sa200\sl276\slmult1\f0\fs22\lang9 Version 1.0.20 08/12/2015\par \pard\sa200\sl276\slmult1\f0\fs22\lang9 Version 1.0.21\par
* Added a microwave and fluorescent light. They corrupt data when packets run close to them. \par
Version 1.0.20 08/12/2015\par
* wports do not display on tooltips or when printing the device info\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 * 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 * commented out wireless devices for now - doing a big demo and wireless is not yet complete\par

View File

@ -721,4 +721,10 @@
<value>Microwave: corrupts wireless packets that travel too close</value> <value>Microwave: corrupts wireless packets that travel too close</value>
<comment>NetworkDevice Microwave Tooltip = Microwave: corrupts wireless packets that travel too close</comment> <comment>NetworkDevice Microwave Tooltip = Microwave: corrupts wireless packets that travel too close</comment>
</data> </data>
<data name="H_PacketCorruption_Key" xml:space="preserve">
<value>Packet Corruption:</value>
</data>
<data name="H_PacketCorruption_Title" xml:space="preserve">
<value>Packet Corruption</value>
</data>
</root> </root>