From 1a7258a84ebc3c500230e1129c5f76b9bff75494 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Thu, 19 Nov 2015 11:36:46 -0500 Subject: [PATCH] Fix networkCard strings for translation --- EduNetworkBuilder/NetworkCard.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/EduNetworkBuilder/NetworkCard.cs b/EduNetworkBuilder/NetworkCard.cs index 42be461..020473d 100644 --- a/EduNetworkBuilder/NetworkCard.cs +++ b/EduNetworkBuilder/NetworkCard.cs @@ -431,12 +431,12 @@ namespace EduNetworkBuilder if(nPacket.destMAC == "") { - nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString); + nPacket.AddMessage(DebugLevel.debug, string.Format(" No Machine matching that IP address on this subnet. {0}", nPacket.destIP.GetIPString)); Network mynet = NB.GetNetwork(); NetworkDevice nd = mynet.GetDeviceFromID(myID); string hostname = NB.Translate("NC_NoHost"); if (nd != null) hostname = nd.hostname; - nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString; + nPacket.Tracking.Status = string.Format("{0} No Machine matching that IP address on this subnet. ", hostname, nPacket.destIP.GetIPString); nPacket.MyStatus = PacketStatus.finished_failed; return false; } @@ -476,7 +476,7 @@ namespace EduNetworkBuilder //When we leave the WAN port, we are masqueraded. Track that. WhereFrom.StoreOutgoingPacketInfo(nPacket, ResponseToPacket.masq); //Now, we masquerade the packet so it looks like it comes fromhere - nPacket.Tracking.AddMessage(DebugLevel.natting, WhereFrom.hostname, "MASQ: Changing outbound IP to: " + nf.myIP.GetIPString); + nPacket.Tracking.AddMessage(DebugLevel.natting, WhereFrom.hostname, string.Format("MASQ: Changing outbound IP to: {0}", nf.myIP.GetIPString)); nPacket.sourceIP = nf.myIP; } nPacket.TsourceIP = nf.myIP; @@ -486,12 +486,12 @@ namespace EduNetworkBuilder if (nPacket.destMAC == "") { - nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString); + nPacket.AddMessage(DebugLevel.debug, string.Format(" No Machine matching that IP address on this subnet. {0}", nPacket.destIP.GetIPString)); Network mynet = NB.GetNetwork(); NetworkDevice nd = mynet.GetDeviceFromID(myID); string hostname = NB.Translate("NC_NoHost"); if (nd != null) hostname = nd.hostname; - nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString; + nPacket.Tracking.Status = hostname + string.Format(" No Machine matching that IP address on this subnet. {0}", nPacket.destIP.GetIPString); nPacket.MyStatus = PacketStatus.finished_failed; return false; } @@ -552,12 +552,12 @@ namespace EduNetworkBuilder if (nPacket.destMAC == "") { - nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString); + nPacket.AddMessage(DebugLevel.debug, String.Format(" No Machine matching that IP address on this subnet. {0}", nPacket.destIP.GetIPString)); Network mynet = NB.GetNetwork(); NetworkDevice nd = mynet.GetDeviceFromID(myID); string hostname = NB.Translate("NC_NoHost"); if (nd != null) hostname = nd.hostname; - nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString; + nPacket.Tracking.Status = hostname + String.Format(" No Machine matching that IP address on this subnet. {0}", nPacket.destIP.GetIPString); nPacket.MyStatus = PacketStatus.finished_failed; return false; } @@ -646,7 +646,7 @@ namespace EduNetworkBuilder IPAddress oAddress = nd.PacketMasqueradeSource(tPacket); if(oAddress != null) { - tPacket.Tracking.AddMessage(DebugLevel.natting, nd.hostname, "MASQ: Changing source IP back to: " + oAddress.GetIPString); + tPacket.Tracking.AddMessage(DebugLevel.natting, nd.hostname, string.Format("MASQ: Changing source IP back to: {0}", oAddress.GetIPString)); tPacket.destIP = oAddress; } } @@ -658,7 +658,7 @@ namespace EduNetworkBuilder nd = mynet.GetDeviceFromID(myID); string hostname = NB.Translate("NC_NoHost"); if (nd != null) hostname = nd.hostname; - tPacket.Tracking.Status = hostname + " The packet was rejected by the firewall.. Dropped."; + tPacket.Tracking.Status = string.Format("{0} The packet was rejected by the firewall.. Dropped.", hostname) ; tPacket.MyStatus = PacketStatus.finished_failed; } }