timy/EduNetworkBuilder
timy
/
EduNetworkBuilder
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More Changes

This commit is contained in:
Peter Wilson 2015-11-18 14:11:16 -06:00
parent 51f011c053
commit d566f5b28a
5 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EduNetworkBuilder/Network.cs
View File

@ -833,7 +833,7 @@ namespace EduNetworkBuilder
NB.SetProgress(Duration.TotalSeconds, NumberOfSecondsForTimeout); NB.SetProgress(Duration.TotalSeconds, NumberOfSecondsForTimeout);
if (Duration.TotalSeconds > NumberOfSecondsForTimeout) if (Duration.TotalSeconds > NumberOfSecondsForTimeout)
{ {
Console.WriteLine(string.Format("Total seconds = {0} Stopping.", Duration.TotalSeconds.ToString())); Console.WriteLine(string.Format(NB.Translate("N_ProssShouldContinSec"), Duration.TotalSeconds.ToString()));
foreach (Packet pkt in myPackets) foreach (Packet pkt in myPackets)
{ {
pkt.Tracking.AddMessage(DebugLevel.packet, NB.Translate("N_ProssShouldContinNet"), NB.Translate("N_ProssShouldContinTime")); pkt.Tracking.AddMessage(DebugLevel.packet, NB.Translate("N_ProssShouldContinNet"), NB.Translate("N_ProssShouldContinTime"));

2
EduNetworkBuilder/NetworkBuilder.cs
View File

@ -437,7 +437,7 @@ namespace EduNetworkBuilder
byte[] item = (byte[])myManager.GetObject(str); byte[] item = (byte[])myManager.GetObject(str);
if(item == null) if(item == null)
{ {
MessageBox.Show(String.Format("Skipping Invalid Puzzle: '{0}'",str)); MessageBox.Show(String.Format("NB_LoadPuzInfo", str));
continue; continue;
} }
myString = new StreamReader(new MemoryStream(item), true).ReadToEnd(); myString = new StreamReader(new MemoryStream(item), true).ReadToEnd();

6
EduNetworkBuilder/NetworkCard.cs
View File

@ -652,8 +652,8 @@ namespace EduNetworkBuilder
} }
else if(!HasIP(tPacket.destIP.GetIP)) else if(!HasIP(tPacket.destIP.GetIP))
{ {
tPacket.AddMessage(DebugLevel.routing, "The packet was rejected by the firewall."); tPacket.AddMessage(DebugLevel.routing, NB.Translate("NC_ProssInPackReject"));
tPacket.AddMessage(DebugLevel.debug, " The packet was not expected by the firewall, so it was rejected."); tPacket.AddMessage(DebugLevel.debug, NB.Translate("NC_ProssInPackExpect"));
mynet = NB.GetNetwork(); mynet = NB.GetNetwork();
nd = mynet.GetDeviceFromID(myID); nd = mynet.GetDeviceFromID(myID);
string hostname = NB.Translate("NC_NoHost"); string hostname = NB.Translate("NC_NoHost");
@ -702,7 +702,7 @@ namespace EduNetworkBuilder
{ {
if (!typeof(T).IsSerializable) if (!typeof(T).IsSerializable)
{ {
throw new ArgumentException("The type must be serializable.", "source"); throw new ArgumentException(NB.Translate("NC_CloneSerialzable"), NB.Translate("NC_source"));
} }
// Don't serialize a null object, simply return the default for that object // Don't serialize a null object, simply return the default for that object

2
EduNetworkBuilder/NetworkDevice.cs
View File

@ -1768,7 +1768,7 @@ namespace EduNetworkBuilder
} }
else if(!tPacket.isFresh && !ForwardsPackets()) else if(!tPacket.isFresh && !ForwardsPackets())
{ {
tPacket.AddMessage(DebugLevel.info, "ND_ProcessArrival_PackReturnErr1"); tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_PackReturnErr1"));
string sIP = "?.?.?.?"; string sIP = "?.?.?.?";
if (tPacket.sourceIP != null) if (tPacket.sourceIP != null)
sIP = tPacket.sourceIP.GetIP.ToIpString(); sIP = tPacket.sourceIP.GetIP.ToIpString();

24
EduNetworkBuilder/Resources/languages/edustrings.resx
View File

@ -1301,4 +1301,28 @@
<value>The packet timed out and was dropped.</value> <value>The packet timed out and was dropped.</value>
<comment>N_ProssShouldContinTimeout = The packet timed out and was dropped.</comment> <comment>N_ProssShouldContinTimeout = The packet timed out and was dropped.</comment>
</data> </data>
<data name="NB_LoadPuzInfo" xml:space="preserve">
<value>Skipping Invalid Puzzle: '{0}'</value>
<comment>NB_LoadPuzInfo = Skipping Invalid Puzzle: '{0}'</comment>
</data>
<data name="NC_CloneSerialzable" xml:space="preserve">
<value>The type must be serializable.</value>
<comment>NC_CloneSerialzable = The type must be serializable.</comment>
</data>
<data name="NC_ProssInPackExpect" xml:space="preserve">
<value>The packet was not expected by the firewall, so it was rejected.</value>
<comment>NC_ProssInPackExpect = The packet was not expected by the firewall, so it was rejected.</comment>
</data>
<data name="NC_ProssInPackReject" xml:space="preserve">
<value>The packet was rejected by the firewall.</value>
<comment>NC_ProssInPackReject = The packet was rejected by the firewall.</comment>
</data>
<data name="NC_source" xml:space="preserve">
<value>source</value>
<comment>NC_source = source</comment>
</data>
<data name="N_ProssShouldContinSec" xml:space="preserve">
<value>Total seconds = {0} Stopping.</value>
<comment>N_ProssShouldContinSec = Total seconds = {0} Stopping.</comment>
</data>
</root> </root>