From d38a81c3febb299c358db0af5a8d865f72085555 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Sat, 12 Nov 2016 16:55:16 -0700 Subject: [PATCH] fixing the packet dropped error message --- EduNetworkBuilder/DeviceConfig.cs | 1 + EduNetworkBuilder/NetworkDevice.cs | 1 + EduNetworkBuilder/Packet.cs | 5 +++-- EduNetworkBuilder/Resources/languages/edustrings.resx | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/EduNetworkBuilder/DeviceConfig.cs b/EduNetworkBuilder/DeviceConfig.cs index 0ef067a..d5bef25 100644 --- a/EduNetworkBuilder/DeviceConfig.cs +++ b/EduNetworkBuilder/DeviceConfig.cs @@ -96,6 +96,7 @@ namespace EduNetworkBuilder nicLocked = true; interfacesLocked = true; } + cbFirewall.Checked = ndCLonedItem.HasAdvFirewall; if (ndCLonedItem.HasAdvFirewall && ndCLonedItem.DoesFirewall()) btnFirewall.Visible = true; else diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index 44be002..2199afe 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -1240,6 +1240,7 @@ namespace EduNetworkBuilder MustUseDHCP = ndCopyFrom.MustUseDHCP; isDHCPServer = ndCopyFrom.isDHCPServer; isDNSServer = ndCopyFrom.isDNSServer; + HasAdvFirewall = ndCopyFrom.HasAdvFirewall; MyLocation = ndCopyFrom.MyLocation; diff --git a/EduNetworkBuilder/Packet.cs b/EduNetworkBuilder/Packet.cs index c3e999d..495104e 100644 --- a/EduNetworkBuilder/Packet.cs +++ b/EduNetworkBuilder/Packet.cs @@ -379,8 +379,9 @@ namespace EduNetworkBuilder string message = string.Format(NB.Translate("P_FirewallDropped"), start_device.hostname); AddMessage(DebugLevel.filtering, message); Tracking.Status = message; - AddMessage(DebugLevel.filtering, message); - MyStatus = PacketStatus.finished_failed; + Tracking.AddMessage(DebugLevel.info, start_device, message); + AddMessage(DebugLevel.info, message); + MyStatus = PacketStatus.finished_ok; return; } } diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index 6635b5b..8e39a83 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -1526,8 +1526,8 @@ NI_VLANInUntagged = Packet is expected to be untagged, but it is tagged. - Packed forbidden to go out this port - NI_VLANOut = Packed forbidden to go out this port + Packet forbidden to go out this port + NI_VLANOut = Packet forbidden to go out this port VLANs: