timy/EduNetworkBuilder
timy/EduNetworkBuilder
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Let it work if the nic has been replaced

Browse Source
This commit is contained in:
Tim Young 2018-04-05 16:40:42 +03:00
parent 88ec8a6cf5
commit 7707ddc0e1
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
EduNetworkBuilder/NetTest.cs
View File

@ -543,6 +543,7 @@ namespace EduNetworkBuilder
case NetTestType.DeviceIsFrozen: case NetTestType.DeviceIsFrozen:
case NetTestType.DeviceBlowsUpWithPower: case NetTestType.DeviceBlowsUpWithPower:
case NetTestType.DeviceNeedsUPS: case NetTestType.DeviceNeedsUPS:
case NetTestType.DeviceNICSprays:
return TaskWasDone; //This variable will tell us if these tests have been done. return TaskWasDone; //This variable will tell us if these tests have been done.
case NetTestType.DHCPServerEnabled: case NetTestType.DHCPServerEnabled:
if (Source == null) return false; //Unable to do it. Do not count it against them. if (Source == null) return false; //Unable to do it. Do not count it against them.

7
EduNetworkBuilder/NetworkCard.cs
View File

@ -479,6 +479,8 @@ namespace EduNetworkBuilder
what = NicType.wport; what = NicType.wport;
if (myNet.ItemHasTest(WhereFrom.hostname, NicName(), NetTestType.DeviceNICSprays)) if (myNet.ItemHasTest(WhereFrom.hostname, NicName(), NetTestType.DeviceNICSprays))
{
if (!myNet.ItemTestIsComplete(WhereFrom.hostname, NicName(), NetTestType.DeviceNICSprays))
{ {
if (tPacket.MyType == PacketType.bad_packet) return false; if (tPacket.MyType == PacketType.bad_packet) return false;
//We should drop the current packet. //We should drop the current packet.
@ -490,6 +492,7 @@ namespace EduNetworkBuilder
WhereFrom.BadPacketFromHere(); WhereFrom.BadPacketFromHere();
return false; return false;
} }
}
switch (what) switch (what)
@ -767,6 +770,8 @@ namespace EduNetworkBuilder
nd = mynet.GetDeviceFromID(myID); nd = mynet.GetDeviceFromID(myID);
if (mynet.ItemHasTest(nd.hostname, NicName(), NetTestType.DeviceNICSprays)) if (mynet.ItemHasTest(nd.hostname, NicName(), NetTestType.DeviceNICSprays))
{
if (!mynet.ItemTestIsComplete(nd.hostname, NicName(), NetTestType.DeviceNICSprays))
{ {
//We should drop the current packet. //We should drop the current packet.
tPacket.AddMessage(DebugLevel.info, NB.Translate("N_ProssShouldContinTime")); tPacket.AddMessage(DebugLevel.info, NB.Translate("N_ProssShouldContinTime"));
@ -775,7 +780,7 @@ namespace EduNetworkBuilder
//Then, we make a bad packet go out from here //Then, we make a bad packet go out from here
nd.BadPacketFromHere(); nd.BadPacketFromHere();
nd.BadSprayCount = NB.NumBadPackets; nd.BadSprayCount = NB.NumBadPackets;
}
} }
if (mynet.ItemHasTest(nd.hostname,NetTestType.DeviceIsFrozen)) if (mynet.ItemHasTest(nd.hostname,NetTestType.DeviceIsFrozen))
{ {