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

Merge branch 'master' of https://tyounglightsys.visualstudio.com/defaultcollection/_git/EduNetworkBuilder

This commit is contained in:
Peter Wilson 2015-11-18 11:15:05 -06:00
parent ebc6b0d8b7 ba35de1f21
commit 95bb4dc2c1
3 changed files with 30 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EduNetworkBuilder/NetworkCard.cs
View File

@ -363,9 +363,9 @@ namespace EduNetworkBuilder
if (nIF.isLocal(theIP))
{
if(Tracker != null)
Tracker.AddMessage(DebugLevel.routing, myID.HostName, string.Format(NB.Translate("NC_FoundLocalIP"), nIF.myIP.GetIP.ToIpString(), nIF.myIP.GetMask.ToIpString()));
Tracker.AddMessage(DebugLevel.routing, myID.HostName, string.Format(NB.Translate("NC_FoundLocalIF"), nIF.myIP.GetIP.ToIpString(), nIF.myIP.GetMask.ToIpString()));
if (Tracker != null && theIP != null)
Tracker.AddMessage(DebugLevel.routing, myID.HostName, " " + string.Format(NB.Translate("NC_IpOfLocal"),theIP.GetIPString, theIP.GetGateway.ToIpString()));
Tracker.AddMessage(DebugLevel.routing, myID.HostName, " " + string.Format(NB.Translate("NC_IfOfLocal"),theIP.GetIPString, theIP.GetGateway.ToIpString()));
return nIF;
}
}

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

@ -1089,7 +1089,7 @@
<value>Found local interface: ip {0} gw {1}</value>
<comment>NC_FoundLocalIP = Found local interface: ip {0} gw {1}</comment>
</data>
<data name="NC_IpOfLocal" xml:space="preserve">
<data name="NC_IfOfLocal" xml:space="preserve">
<value>IP of local: {0} {1}</value>
<comment>NC_IpOfLocal = IP of local: {0} {1}</comment>
</data>

104
EduNetworkBuilder/toedit.txt
View File

@ -63,7 +63,6 @@ NB.cs:229: public static string BroadcastIPString = "255.255.255.255"; //
NB.cs:230: public static string ZeroIPString = "0.0.0.0";
NB.cs:231: public static string LoopbackIPString = "127.0.0.1";
NB.cs:232: public static int LinkStep = 8;//The percentage of the link we move at each "tick"
NB.cs:236: public static string[,] LanguageChoices = { { "English", "en" }, { "French", "fr" } };
NB.cs:287: myresource = new ResourceManager("EduNetworkBuilder.Resources.languages.edustrings", MyAssembly);
NB.cs:326: string answer="";
NB.cs:328: if (answer == null) return "";
@ -71,54 +70,16 @@ NB.cs:336: return "H_" + What.ToString() + "_Key";
NB.cs:340: return "H_" + What.ToString() + "_Title";
NB.cs:362: if (lang == "") lang = "en";
NB.cs:364: string StartingItem = "";
NB.cs:376: LanguageForm.Text = "Choose Language";
NB.cs:380: lblText.Text = "Choose a Language:";
NB.cs:403: btnAccept.Text = "OK";
NB.cs:513: if(What.GetType().ToString() == "EduNetworkBuilder.NetworkDevice")
NB.cs:515: if (What.GetType().ToString() == "EduNetworkBuilder.NetworkLink")
NB.cs:526: if(myfrm.Name == "Context")
NB.cs:537: tForm.Name = "Context";
NB.cs:563: sBuilder.Append(number.ToString("X2"));
NB.cs:595: "Invalid Bit " + BitNumber.ToString() + "! (Should be from 0 to 7)");
NB.cs:608: "Invalid Bit" + BitNumber.ToString() + "! (Should be from 0 to 7)");
NetTest.cs:14: public string sHost = "";
NetTest.cs:15: public string dHost = "";
NetTest.cs:114: string toreturn = "";
NetTest.cs:119: toreturn = "Has a problem";
NetTest.cs:127: toreturn = "Needs the gateway set";
NetTest.cs:130:// toreturn = "Cannot ping";
NetTest.cs:133: toreturn = "Needs a route set";
NetTest.cs:136: toreturn = "Needs a local IP";
NetTest.cs:139: toreturn = "Needs to be connected to the network.";
NetTest.cs:142: toreturn = "Needs to find ARP from some device";
NetTest.cs:145: toreturn = "Needs a DHCP IP address";
NetTest.cs:148: toreturn = "Must ping a host.";
NetTest.cs:151: toreturn = "Get mouse-over help";
NetTest.cs:154: toreturn = "Should fail to ping a specific host";
NetTest.cs:157: toreturn = "Needs change to DHCP server:";
NetTest.cs:160: toreturn = "Is Locked";
NetTest.cs:163: toreturn = "Has Locked DHCP";
NetTest.cs:166: toreturn = "Has Locked IP";
NetTest.cs:169: toreturn = "Has Locked NIC";
NetTest.cs:172: toreturn = "Has Locked Route";
NetTest.cs:175: toreturn = "Has Locked Gateway";
NetTest.cs:187: toreturn = "Needs the gateway set to:";
NetTest.cs:190:// toreturn = "Cannot ping host:";
NetTest.cs:193: toreturn = "Needs a route to network:";
NetTest.cs:196: toreturn = "Needs an IP local to host:";
NetTest.cs:199: toreturn = "Needs a link to host:";
NetTest.cs:202: toreturn = "Needs to find ARP from:";
NetTest.cs:205: toreturn = "Needs a DHCP IP address from server:";
NetTest.cs:208: toreturn = "Must ping:";
NetTest.cs:211: toreturn = "Get mouse-over help of level:";
NetTest.cs:214: toreturn = "Needs to try to ping (and fail):";
NetTest.cs:217: toreturn = "DHCP Server enabled = ";
NetTest.cs:221: toreturn = "Is Locked:";
NetTest.cs:224: toreturn = "Has Locked DHCP:";
NetTest.cs:227: toreturn = "Has Locked IP:";
NetTest.cs:230: toreturn = "Has Locked NIC:";
NetTest.cs:233: toreturn = "Has Locked Route:";
NetTest.cs:236: toreturn = "Has Locked Gateway:";
NetTest.cs:244: toreturn = "";
NetTest.cs:252: string toreturn = "";
NetTest.cs:255: return TestDescription(amount) + " " + sHost;
@ -266,44 +227,33 @@ NetworkCard.cs:172: if (isConnected(true)) connected = "*";
NetworkCard.cs:175: return NicName() + connected + " " + MAC;
NetworkCard.cs:196: string DHCPString = "";
NetworkCard.cs:197: if (UsesDHCP && CanUseDHCP) DHCPString = "DHCP: ";
NetworkCard.cs:366: Tracker.AddMessage(DebugLevel.routing, myID.HostName, "Found local interface: ip" + nIF.myIP.GetIP.ToIpString() +
NetworkCard.cs:367: " gw:" + nIF.myIP.GetMask.ToIpString());
NetworkCard.cs:369: Tracker.AddMessage(DebugLevel.routing, myID.HostName, " IP of local: " + theIP.GetIPString + " " + theIP.GetGateway.ToIpString());
NetworkCard.cs:419: //if(nPacket.sourceMAC == null || nPacket.sourceMAC == "" || nPacket.isFresh)
NetworkCard.cs:425: if (nPacket.destMAC == null || nPacket.destMAC == "")
NetworkCard.cs:433: if(nPacket.destMAC == "")
NetworkCard.cs:435: nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString);
NetworkCard.cs:438: string hostname = "No Host";
NetworkCard.cs:440: nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString;
NetworkCard.cs:450: nPacket.PacketDump(myID.HostName + "-" + _nic_name, DebugPausePoint.packet_out);
NetworkCard.cs:480: nPacket.Tracking.AddMessage(DebugLevel.natting, WhereFrom.hostname, "MASQ: Changing outbound IP to: " + nf.myIP.GetIPString);
NetworkCard.cs:484: if (nPacket.destMAC == null || nPacket.destMAC == "")
NetworkCard.cs:488: if (nPacket.destMAC == "")
NetworkCard.cs:490: nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString);
NetworkCard.cs:493: string hostname = "No Host";
NetworkCard.cs:495: nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString;
NetworkCard.cs:505: nPacket.PacketDump(myID.HostName + "-" + _nic_name, DebugPausePoint.packet_out);
NetworkCard.cs:524: EncryptionKey = "";
NetworkCard.cs:537: if((tPacket.InboundNic != null && tPacket.InboundNic.GetNicType == NicType.wan) || tPacket.InboundNic == null || tPacket.destMAC == "")
NetworkCard.cs:540: if(nPacket.sourceMAC == null || nPacket.sourceMAC == "" || nPacket.isFresh)
NetworkCard.cs:543: string getMAC="";
NetworkCard.cs:548: if (getMAC != "") nPacket.destMAC = getMAC;
NetworkCard.cs:554: if (nPacket.destMAC == "")
NetworkCard.cs:556: nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString);
NetworkCard.cs:559: string hostname = "No Host";
NetworkCard.cs:561: nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString;
NetworkCard.cs:571: if (nPacket.sourceMAC == null || nPacket.sourceMAC == "")
NetworkCard.cs:582: if (nPacket.destMAC == null || nPacket.destMAC == "" && tPacket.OutboundIP != null)
NetworkCard.cs:650: tPacket.Tracking.AddMessage(DebugLevel.natting, nd.hostname, "MASQ: Changing source IP back to: " + oAddress.GetIPString);
NetworkCard.cs:656: tPacket.AddMessage(DebugLevel.routing, "The packet was rejected by the firewall.");
NetworkCard.cs:657: tPacket.AddMessage(DebugLevel.debug, " The packet was not expected by the firewall, so it was rejected.");
NetworkCard.cs:660: string hostname = "No Host";
NetworkCard.cs:662: tPacket.Tracking.Status = hostname + " The packet was rejected by the firewall.. Dropped.";
NetworkCard.cs:673: tPacket.AddMessage(DebugLevel.routing,"The Packet was destined for a different machine (MAC Address): Rejected");
NetworkCard.cs:674: tPacket.AddMessage(DebugLevel.debug, string.Format(" Device MAC: {0} did not match packet: {1}", MAC, tPacket.destMAC));
NetworkCard.cs:677: string hostname = "No Host";
NetworkCard.cs:679: tPacket.Tracking.Status = hostname + " Packet destined for another machine. Dropped.";
NetworkCard.cs:706: throw new ArgumentException("The type must be serializable.", "source");
NetworkCard.cs:418: //if(nPacket.sourceMAC == null || nPacket.sourceMAC == "" || nPacket.isFresh)
NetworkCard.cs:424: if (nPacket.destMAC == null || nPacket.destMAC == "")
NetworkCard.cs:432: if(nPacket.destMAC == "")
NetworkCard.cs:434: nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString);
NetworkCard.cs:439: nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString;
NetworkCard.cs:449: nPacket.PacketDump(myID.HostName + "-" + _nic_name, DebugPausePoint.packet_out);
NetworkCard.cs:479: nPacket.Tracking.AddMessage(DebugLevel.natting, WhereFrom.hostname, "MASQ: Changing outbound IP to: " + nf.myIP.GetIPString);
NetworkCard.cs:483: if (nPacket.destMAC == null || nPacket.destMAC == "")
NetworkCard.cs:487: if (nPacket.destMAC == "")
NetworkCard.cs:489: nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString);
NetworkCard.cs:494: nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString;
NetworkCard.cs:504: nPacket.PacketDump(myID.HostName + "-" + _nic_name, DebugPausePoint.packet_out);
NetworkCard.cs:523: EncryptionKey = "";
NetworkCard.cs:536: if((tPacket.InboundNic != null && tPacket.InboundNic.GetNicType == NicType.wan) || tPacket.InboundNic == null || tPacket.destMAC == "")
NetworkCard.cs:539: if(nPacket.sourceMAC == null || nPacket.sourceMAC == "" || nPacket.isFresh)
NetworkCard.cs:542: string getMAC="";
NetworkCard.cs:547: if (getMAC != "") nPacket.destMAC = getMAC;
NetworkCard.cs:553: if (nPacket.destMAC == "")
NetworkCard.cs:555: nPacket.AddMessage(DebugLevel.debug, " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString);
NetworkCard.cs:560: nPacket.Tracking.Status = hostname + " No Machine matching that IP address on this subnet. " + nPacket.destIP.GetIPString;
NetworkCard.cs:570: if (nPacket.sourceMAC == null || nPacket.sourceMAC == "")
NetworkCard.cs:581: if (nPacket.destMAC == null || nPacket.destMAC == "" && tPacket.OutboundIP != null)
NetworkCard.cs:649: tPacket.Tracking.AddMessage(DebugLevel.natting, nd.hostname, "MASQ: Changing source IP back to: " + oAddress.GetIPString);
NetworkCard.cs:655: tPacket.AddMessage(DebugLevel.routing, "The packet was rejected by the firewall.");
NetworkCard.cs:656: tPacket.AddMessage(DebugLevel.debug, " The packet was not expected by the firewall, so it was rejected.");
NetworkCard.cs:661: tPacket.Tracking.Status = hostname + " The packet was rejected by the firewall.. Dropped.";
NetworkCard.cs:705: throw new ArgumentException("The type must be serializable.", "source");
NetworkCardEditor.cs:42: string btnval = "0.0.0.0";
NetworkCardEditor.cs:50: lblVPNEnd.Text = "VPN Endpoint:";
NetworkCardEditor.cs:62: lblVPNEncrypt.Text = "Encryption Key:";