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