From 7707ddc0e124fbb69f0822b8a731120c1743a234 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Thu, 5 Apr 2018 16:40:42 +0300
Subject: [PATCH] Let it work if the nic has been replaced

---
 EduNetworkBuilder/NetTest.cs     |  1 +
 EduNetworkBuilder/NetworkCard.cs | 39 ++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/EduNetworkBuilder/NetTest.cs b/EduNetworkBuilder/NetTest.cs
index 5778ba6..d761a7c 100644
--- a/EduNetworkBuilder/NetTest.cs
+++ b/EduNetworkBuilder/NetTest.cs
@@ -543,6 +543,7 @@ namespace EduNetworkBuilder
                 case NetTestType.DeviceIsFrozen:
                 case NetTestType.DeviceBlowsUpWithPower:
                 case NetTestType.DeviceNeedsUPS:
+                case NetTestType.DeviceNICSprays:
                     return TaskWasDone; //This variable will tell us if these tests have been done.
                 case NetTestType.DHCPServerEnabled:
                     if (Source == null) return false; //Unable to do it.  Do not count it against them.
diff --git a/EduNetworkBuilder/NetworkCard.cs b/EduNetworkBuilder/NetworkCard.cs
index 44aa662..c22a2e2 100644
--- a/EduNetworkBuilder/NetworkCard.cs
+++ b/EduNetworkBuilder/NetworkCard.cs
@@ -480,15 +480,18 @@ namespace EduNetworkBuilder
 
             if (myNet.ItemHasTest(WhereFrom.hostname, NicName(), NetTestType.DeviceNICSprays))
             {
-                if (tPacket.MyType == PacketType.bad_packet) return false;
-                //We should drop the current packet.
-                tPacket.AddMessage(DebugLevel.info, NB.Translate("N_ProssShouldContinTime"));
-                tPacket.Tracking.Status = NB.Translate("N_ProssShouldContinTime");
-                tPacket.MyStatus = PacketStatus.finished_failed;
-                //Then, we make a bad packet go out from here
-                WhereFrom.BadSprayCount = NB.NumBadPackets;
-                WhereFrom.BadPacketFromHere();
-                return false;
+                if (!myNet.ItemTestIsComplete(WhereFrom.hostname, NicName(), NetTestType.DeviceNICSprays))
+                {
+                    if (tPacket.MyType == PacketType.bad_packet) return false;
+                    //We should drop the current packet.
+                    tPacket.AddMessage(DebugLevel.info, NB.Translate("N_ProssShouldContinTime"));
+                    tPacket.Tracking.Status = NB.Translate("N_ProssShouldContinTime");
+                    tPacket.MyStatus = PacketStatus.finished_failed;
+                    //Then, we make a bad packet go out from here
+                    WhereFrom.BadSprayCount = NB.NumBadPackets;
+                    WhereFrom.BadPacketFromHere();
+                    return false;
+                }
             }
 
 
@@ -768,14 +771,16 @@ namespace EduNetworkBuilder
 
             if (mynet.ItemHasTest(nd.hostname, NicName(), NetTestType.DeviceNICSprays))
             {
-                //We should drop the current packet.
-                tPacket.AddMessage(DebugLevel.info, NB.Translate("N_ProssShouldContinTime"));
-                tPacket.Tracking.Status = NB.Translate("N_ProssShouldContinTime");
-                tPacket.MyStatus = PacketStatus.finished_failed;
-                //Then, we make a bad packet go out from here
-                nd.BadPacketFromHere();
-                nd.BadSprayCount = NB.NumBadPackets;
-
+                if (!mynet.ItemTestIsComplete(nd.hostname, NicName(), NetTestType.DeviceNICSprays))
+                {
+                    //We should drop the current packet.
+                    tPacket.AddMessage(DebugLevel.info, NB.Translate("N_ProssShouldContinTime"));
+                    tPacket.Tracking.Status = NB.Translate("N_ProssShouldContinTime");
+                    tPacket.MyStatus = PacketStatus.finished_failed;
+                    //Then, we make a bad packet go out from here
+                    nd.BadPacketFromHere();
+                    nd.BadSprayCount = NB.NumBadPackets;
+                }
             }
             if (mynet.ItemHasTest(nd.hostname,NetTestType.DeviceIsFrozen))
             {