From 822542a381a84b9a34e7dbefe43aec9148cb539a Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Mon, 16 Nov 2015 12:03:44 -0600 Subject: [PATCH 1/3] Translation Changes --- EduNetworkBuilder/NetworkDevice.cs | 10 +++++----- .../Resources/languages/edustrings.resx | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index 4bceb76..d3d5bf1 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -1472,8 +1472,8 @@ namespace EduNetworkBuilder Network myNet = NB.GetNetwork(); if (tPacket.MyType == PacketType.tun_packet || tPacket.MyType == PacketType.vpn_packet) { - tPacket.Tracking.AddMessage(DebugLevel.info,this,"Arrived at the tunnel endpoint."); - tPacket.Tracking.Status = "Arrived at the tunnel endpoint."; + tPacket.Tracking.AddMessage(DebugLevel.info,this,NB.Translate("ND_ProcessArrival_Arrived")); + tPacket.Tracking.Status = NB.Translate("ND_ProcessArrival_Arrived"); //We If the encryption matches, we succeed. Otherwise, we fail tPacket.MyStatus = PacketStatus.finished_ok; //It stops here @@ -1485,10 +1485,10 @@ namespace EduNetworkBuilder { if(nPacket.destMAC != nc.MAC) { - nPacket.Tracking.Status = "No VPN nic to recieve packet. Check VPN IP"; - nPacket.Tracking.AddMessage(DebugLevel.info, this, "No corresponding IP on vpn. Packet dropped."); + nPacket.Tracking.Status = NB.Translate("ND_ProcessArrival_IPError1"); + nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProcessArrival_IPError2")); nPacket.MyStatus = PacketStatus.finished_failed; - myNet.addPacket(nPacket); //so it gets pulled out apropriately + myNet.addPacket(nPacket); //so it gets pulled out apropriatelya tPacket.payloadPacket = null; return; } diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index 9d8b01e..fe0a793 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -777,6 +777,18 @@ Wireless SSID + + Arrived at the tunnel endpoint. + ND_ProcessArrival_Arrived = Arrived at the tunnel endpoint. + + + No VPN nic to recieve packet. Check VPN IP + ND_ProcessArrival_IPError1 = No VPN nic to recieve packet. Check VPN IP + + + No corresponding IP on vpn. Packet dropped. + ND_ProcessArrival_IPError2 = No corresponding IP on vpn. Packet dropped. + Packet sent out tunnel but no endpoint set. Dropping ND_TunnelPacketFromHere_Error = Packet sent out tunnel but no endpoint set. Dropping From 6186dfeab256185dd38dbcd18cfaa109041dd5ff Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Mon, 16 Nov 2015 13:37:09 -0600 Subject: [PATCH 2/3] Translation Edits --- EduNetworkBuilder/NetworkDevice.cs | 30 ++++++------- .../Resources/languages/edustrings.resx | 44 +++++++++++++++++++ 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index d3d5bf1..54f2e1e 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -1474,7 +1474,7 @@ namespace EduNetworkBuilder { tPacket.Tracking.AddMessage(DebugLevel.info,this,NB.Translate("ND_ProcessArrival_Arrived")); tPacket.Tracking.Status = NB.Translate("ND_ProcessArrival_Arrived"); - //We If the encryption matches, we succeed. Otherwise, we fail + //If the encryption matches, we succeed. Otherwise, we fail tPacket.MyStatus = PacketStatus.finished_ok; //It stops here nPacket = tPacket.payloadPacket; @@ -1488,7 +1488,7 @@ namespace EduNetworkBuilder nPacket.Tracking.Status = NB.Translate("ND_ProcessArrival_IPError1"); nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProcessArrival_IPError2")); nPacket.MyStatus = PacketStatus.finished_failed; - myNet.addPacket(nPacket); //so it gets pulled out apropriatelya + myNet.addPacket(nPacket); //so it gets pulled out apropriately tPacket.payloadPacket = null; return; } @@ -1499,15 +1499,15 @@ namespace EduNetworkBuilder nPacket.MyStatus = PacketStatus.processing; nPacket.WhereAmI = this; - nPacket.Tracking.AddMessage(DebugLevel.info, this, "Packet coming out from tunnel."); + nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProcessArrival_CommingOut")); myNet.addPacket(nPacket); tPacket.payloadPacket = null; return; } else { - nPacket.Tracking.Status = "Encryption failed. Unable to decrypt. Packet dropped."; - nPacket.Tracking.AddMessage(DebugLevel.info, this, "Encryption key mismatch. Packet dropped."); + nPacket.Tracking.Status = NB.Translate("ND_ProcessArrival_EncryptErr1"); + nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProcessArrival_EncryptErr2")); nPacket.MyStatus = PacketStatus.finished_failed; myNet.addPacket(nPacket); //so it gets pulled out apropriately tPacket.payloadPacket = null; @@ -1517,8 +1517,8 @@ namespace EduNetworkBuilder else { //There is no nic that matches the incoming IP - nPacket.Tracking.Status = "No VPN nic to recieve packet. Check VPN IP"; - nPacket.Tracking.AddMessage(DebugLevel.info, this, "No corresponding IP on vpn. Packet dropped."); + nPacket.Tracking.Status = NB.Translate("ND_ProcessArrival_VPNNicErr1"); + nPacket.Tracking.AddMessage(DebugLevel.info, this, NB.Translate("ND_ProcessArrival_VPNNicErr2")); nPacket.MyStatus = PacketStatus.finished_failed; myNet.addPacket(nPacket); //so it gets pulled out apropriately return; @@ -1536,7 +1536,7 @@ namespace EduNetworkBuilder nPacket.isFresh = true; //So it starts from here nPacket.Tracking = new PacketMessage(); myNet.addPacket(nPacket); - tPacket.AddMessage(DebugLevel.info, "Success! The ping reached the destination."); + tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_PingReached1")); tPacket.Tracking.Status = hostname + ":\tPing success: The ping reached the destination." + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); tPacket.MyStatus = PacketStatus.finished_ok; IPAddress tip = nPacket.sourceIP; @@ -1579,7 +1579,7 @@ namespace EduNetworkBuilder else { tPacket.AddMessage(DebugLevel.info, "The broadcast ping reached a destination that was not on the same network"); - tPacket.Tracking.Status = hostname + ":\tThe broadcast ping reached a destination that was not on the same network" + tPacket.sourceIP.GetIP.ToIpString() + " -> " + hostname; + tPacket.Tracking.Status = hostname + ":\t" + "The broadcast ping reached a destination that was not on the same network" + tPacket.sourceIP.GetIP.ToIpString() + " -> " + hostname; tPacket.MyStatus = PacketStatus.finished_ok; } return; @@ -1598,7 +1598,7 @@ namespace EduNetworkBuilder } else { - tPacket.AddMessage(DebugLevel.info, "Success! The ping returned from its destination."); + tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_PingReturn1")); tPacket.Tracking.Status = hostname + ":\tPing success: The ping returned from its destination" + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); tPacket.MyStatus = PacketStatus.finished_ok; if (tPacket.sourceIP.GetIP != 0) @@ -1613,7 +1613,7 @@ namespace EduNetworkBuilder } else { - tPacket.AddMessage(DebugLevel.info, "ERROR! A packet returned to a machine that we were not expecting it from."); + tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_PackReturnErr1")); tPacket.Tracking.Status = hostname + ":\tPing failed: Arrived at a machine that was not expecting it and was rejected." + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); tPacket.MyStatus = PacketStatus.finished_failed; } @@ -1665,7 +1665,7 @@ namespace EduNetworkBuilder nPacket.MyType = PacketType.arp_answer; nPacket.MyStatus = PacketStatus.processing; - tPacket.AddMessage(DebugLevel.info, "Success! The arp request reached the destination."); + tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_ArpReached1")); tPacket.Tracking.Status = hostname + ":\tArp Request found IP: " + tPacket.sourceIP.GetIPString + " on MAC: "+ nPacket.sourceMAC; tPacket.MyStatus = PacketStatus.finished_ok; } @@ -1690,7 +1690,7 @@ namespace EduNetworkBuilder } else { - tPacket.AddMessage(DebugLevel.info, "ERROR! A packet returned to a machine that we were not expecting it from."); + tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_PackReturnErr1")); tPacket.Tracking.Status = hostname + ":\tARP failed: Arrived at a machine that was not expecting it and was rejected." + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); tPacket.MyStatus = PacketStatus.finished_failed; } @@ -1733,7 +1733,7 @@ namespace EduNetworkBuilder nPacket.OutboundIP = null; nPacket.MyStatus = PacketStatus.processing; - tPacket.AddMessage(DebugLevel.info, "Success! The DHCP request reached a DHCP Server."); + tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_DHCPReach1")); string IP = ""; if (nPacket.sourceIP != null) IP = nPacket.sourceIP.GetIPString; if(IP == "" && nPacket.WhereAmI != null) { @@ -1768,7 +1768,7 @@ namespace EduNetworkBuilder } else if(!tPacket.isFresh && !ForwardsPackets()) { - tPacket.AddMessage(DebugLevel.info, "ERROR! A packet returned to a machine that we were not expecting it from."); + tPacket.AddMessage(DebugLevel.info, "ND_ProcessArrival_PackReturnErr1"); string sIP = "?.?.?.?"; if (tPacket.sourceIP != null) sIP = tPacket.sourceIP.GetIP.ToIpString(); diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index fe0a793..d5d66a8 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -777,10 +777,30 @@ Wireless SSID + + Success! The arp request reached the destination. + ND_ProcessArrival_ArpReached1 = Success! The arp request reached the destination. + Arrived at the tunnel endpoint. ND_ProcessArrival_Arrived = Arrived at the tunnel endpoint. + + Packet coming out from tunnel. + ND_ProcessArrival_CommingOut = Packet coming out from tunnel. + + + Success! The DHCP request reached a DHCP Server. + ND_ProcessArrival_DHCPReach1 = Success! The DHCP request reached a DHCP Server. + + + Encryption failed. Unable to decrypt. Packet dropped. + ND_ProcessArrival_EncryptErr1 = Encryption failed. Unable to decrypt. Packet dropped. + + + Encryption key mismatch. Packet dropped. + ND_ProcessArrival_EncryptErr2 = Encryption key mismatch. Packet dropped. + No VPN nic to recieve packet. Check VPN IP ND_ProcessArrival_IPError1 = No VPN nic to recieve packet. Check VPN IP @@ -789,6 +809,30 @@ No corresponding IP on vpn. Packet dropped. ND_ProcessArrival_IPError2 = No corresponding IP on vpn. Packet dropped. + + ERROR! A packet returned to a machine that we were not expecting it from. + ND_ProcessArrival_PackReturnErr1 = ERROR! A packet returned to a machine that we were not expecting it from. + + + The broadcast ping reached a destination that was not on the same network + ND_ProcessArrival_PingErr1 = The broadcast ping reached a destination that was not on the same network + + + Success! The ping reached the destination. + ND_ProcessArrival_Success1 = Success! The ping reached the destination. + + + Success! The ping returned from its destination. + ND_ProcessArrival_PingReturn1 = Success! The ping returned from its destination. + + + No VPN nic to recieve packet. Check VPN IP + ND_ProcessArrival_VPNNicErr1 = No VPN nic to recieve packet. Check VPN IP + + + No corresponding IP on vpn. Packet dropped. + ND_ProcessArrival_VPNNicErr2 = No corresponding IP on vpn. Packet dropped. + Packet sent out tunnel but no endpoint set. Dropping ND_TunnelPacketFromHere_Error = Packet sent out tunnel but no endpoint set. Dropping From efb731dd3f33a2a792d247b1cbadf2435047c4f7 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Mon, 16 Nov 2015 13:43:40 -0600 Subject: [PATCH 3/3] Translation Edits ND Done --- EduNetworkBuilder/NetworkDevice.cs | 2 +- EduNetworkBuilder/Resources/languages/edustrings.resx | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index 54f2e1e..fffa711 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -2191,7 +2191,7 @@ namespace EduNetworkBuilder tPacket.PacketDump(hostname, DebugPausePoint.packet_in); if(nc == null) { - tPacket.AddMessage(DebugLevel.info, "The packet failed to hit a Card. We should not be here!"); + tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_DoInputFromLink_CardFail1")); tPacket.Tracking.Status = hostname + " Failed: no card available to use."; tPacket.MyStatus = PacketStatus.finished_failed; return; diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index d5d66a8..45458c8 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -777,6 +777,10 @@ Wireless SSID + + The packet failed to hit a Card. We should not be here! + ND_DoInputFromLink_CardFail1 = The packet failed to hit a Card. We should not be here! + Success! The arp request reached the destination. ND_ProcessArrival_ArpReached1 = Success! The arp request reached the destination.