Dhcp and vlans work, colored packets, etc. Added puzzle

EduNetworkBuilder/EduNetworkBuilder.csproj

@@ -280,6 +280,7 @@
     <None Include="Resources\Level5_WirelessRouters.enbx" />
     <None Include="Resources\Level6_ForbiddenVLAN.enbx" />
     <None Include="Resources\Level6_TaggedBetweenSwitches.enbx" />
+    <None Include="Resources\level6_UntaggedAndDHCP.enbx" />
     <None Include="Resources\Level6_VLANRouting.enbx" />
     <None Include="Resources\Level6_VLANRouting2.enbx" />
     <None Include="Resources\Level6_VLAN_Intro.enbx" />

EduNetworkBuilder/NB.cs

@@ -72,7 +72,7 @@ namespace EduNetworkBuilder
         Level5_WirelessRouters, Level5_WirelessDevices, Level5_WirelessBridge, Level5_WirelessRepeater, Level5_WirelessRepeater2,
         Level5_WirelessAccessPoint, Level5_WirelessCorruption, Level5_Failed, Level5_LostPacket, Level5_HereComesTrouble,
         Level6_VLAN_Intro, Level6_VLAN_Intro2, Level6_ForbiddenVLAN, Level6_TaggedBetweenSwitches, Level6_VLANRouting,
-        Level6_VLANRouting2,
+        Level6_VLANRouting2, level6_UntaggedAndDHCP,
 
     }
     public enum DebugPausePoint { none=0, packet_create=1, packet_kill=2, 

EduNetworkBuilder/Properties/Resources.Designer.cs

@@ -792,6 +792,16 @@ namespace EduNetworkBuilder.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] level6_UntaggedAndDHCP {
+            get {
+                object obj = ResourceManager.GetObject("level6_UntaggedAndDHCP", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>

EduNetworkBuilder/Properties/Resources.resx

@@ -397,6 +397,9 @@
   <data name="Level6_TaggedBetweenSwitches" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Level6_TaggedBetweenSwitches.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="level6_UntaggedAndDHCP" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\level6_UntaggedAndDHCP.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="Level6_VLANRouting" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Level6_VLANRouting.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>

EduNetworkBuilder/VLANConfig.cs

@@ -216,6 +216,10 @@ namespace EduNetworkBuilder
 
             //if (dgv_VLANNames.RowCount == theNet.VlanNames.Count) return; //Nothing was added or removed.
 
+            BindingList<VLANName> oList = new BindingList<VLANName>();
+            foreach (VLANName vn in theNet.VlanNames)
+                oList.Add(vn); //stash it for keeping colors for now
+
             theNet.VlanNames.Clear(); //Remove them all.  We will re-add them
 
             //add it if it was added
@@ -230,10 +234,11 @@ namespace EduNetworkBuilder
                 {
                     if (!VLANNamesHasID(theNet.VlanNames, id))
                     {
+                        Color tColor = oList[theNet.VlanNames.Count].PacketColor;
                         if (DR.Cells["Name"].Value == null) //When we are still adding
-                            theNet.VlanNames.Add(new VLANName(id, "----"));
+                            theNet.VlanNames.Add(new VLANName(id, "----", tColor));
                         else
-                            theNet.VlanNames.Add(new VLANName(id, DR.Cells["Name"].Value.ToString()));
+                            theNet.VlanNames.Add(new VLANName(id, DR.Cells["Name"].Value.ToString(),tColor));
                     }
                 }
             }

EduNetworkBuilder/VLANStuff.cs

@@ -22,7 +22,7 @@ namespace EduNetworkBuilder
 
         Color _Color = Color.Empty;
         [DisplayName("ColorString")]
-        public string PacketColorString { get { return _Color.ToString(); } set { _Color = Color.FromName(value); } }
+        public string PacketColorString { get { return _Color.Name; } set { _Color = Color.FromName(value); } }
         public Color PacketColor {  get { return _Color; } set { _Color = value; } }
 
         public VLANName()