From d3124c95bbbddb342a79b460c9a14abe6c954366 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Tue, 13 Feb 2018 10:27:11 +0000
Subject: [PATCH] Network itemhastest
---
EduNetworkBuilder/Network.cs | 19 +++++++++++++++++++
EduNetworkBuilder/NetworkCard.cs | 1 +
2 files changed, 20 insertions(+)
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 64c0128..b4a77ea 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -940,6 +940,25 @@ namespace EduNetworkBuilder
return false;
}
+ public bool ItemHasTest(string host, string dest, NetTestType WhatToCheck)
+ {
+ foreach (NetTest nt in NetTests)
+ {
+ if (nt.sHost == host || WhatToCheck == NetTestType.LockVLANNames)
+ {
+ if (WhatToCheck == nt.TheTest && (dest == "" || dest == nt.dHost))
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public bool ItemHasTest(string host, NetTestType WhatToCheck)
+ {
+ return ItemHasTest(host, "", WhatToCheck);
+ }
+
+
private void MarkAsSolved()
{
PuzzleIsSolved = true;
diff --git a/EduNetworkBuilder/NetworkCard.cs b/EduNetworkBuilder/NetworkCard.cs
index 97ee23f..2399eb9 100644
--- a/EduNetworkBuilder/NetworkCard.cs
+++ b/EduNetworkBuilder/NetworkCard.cs
@@ -729,6 +729,7 @@ namespace EduNetworkBuilder
//We make sure the MAC matches.
mynet = NB.GetNetwork();
nd = mynet.GetDeviceFromID(myID);
+
if (tPacket == null) return;
tPacket.InboundNic = this; //track which nic we came in on.
if (myNicType == NicType.port || myNicType == NicType.wport || (nd.IsWirelessForwarder() && (myNicType == NicType.wlan ||