From 7f263fe9930bf1cbf0c436f5f83d9126d11db3f8 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Wed, 18 Nov 2015 12:36:59 -0500 Subject: [PATCH 1/4] Minor changes to make translation work --- EduNetworkBuilder/DeviceConfig.cs | 7 +- EduNetworkBuilder/toedit.txt | 182 +----------------------------- 2 files changed, 8 insertions(+), 181 deletions(-) diff --git a/EduNetworkBuilder/DeviceConfig.cs b/EduNetworkBuilder/DeviceConfig.cs index b0cfae2..ef51623 100644 --- a/EduNetworkBuilder/DeviceConfig.cs +++ b/EduNetworkBuilder/DeviceConfig.cs @@ -28,8 +28,7 @@ namespace EduNetworkBuilder OriginalItem = Original_Item; ClonedItem = NetworkComponent.Clone(OriginalItem); UpdateForm(); - lblHelp.Text = "Select the network card or interface for that network card that you wish to edit. " + - "Then press the [edit] button to make changes to that. Press the [-] to remove it, and press [+] to add another."; + lblHelp.Text = "Select the network card or interface for that network card that you wish to edit. Then press the [edit] button to make changes to that. Press the [-] to remove it, and press [+] to add another."; } private void LoadFromOrig() @@ -103,7 +102,7 @@ namespace EduNetworkBuilder } btnGateway.Visible = true; - btnGateway.Text = "Gateway: " + ndCLonedItem.GetGateway().GetIP.ToIpString(); + btnGateway.Text = string.Format("Gateway: {0}", ndCLonedItem.GetGateway().GetIP.ToIpString()); tbHostname.Text = ndCLonedItem.hostname; //Network cards are changed with the [edit] button and do not need to be updated here //IPAddresses are changed with the [edit] button and do not need to be updated here @@ -210,7 +209,7 @@ namespace EduNetworkBuilder otext = tbHostname.Text; tbHostname.Text = OriginalItem.hostname; - MessageBox.Show("The name '" + otext + "' is being used as part of this puzzle and this machine cannot be named that."); + MessageBox.Show(string.Format("The name '{0}' is being used as part of this puzzle and this machine cannot be named that.", otext)); } } } diff --git a/EduNetworkBuilder/toedit.txt b/EduNetworkBuilder/toedit.txt index c283e89..2a2bca6 100644 --- a/EduNetworkBuilder/toedit.txt +++ b/EduNetworkBuilder/toedit.txt @@ -1,156 +1,65 @@ -DeviceConfig.cs:31: lblHelp.Text = "Select the network card or interface for that network card that you wish to edit. " + -DeviceConfig.cs:32: "Then press the [edit] button to make changes to that. Press the [-] to remove it, and press [+] to add another."; -DeviceConfig.cs:75: if (ClonedItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -DeviceConfig.cs:106: btnGateway.Text = "Gateway: " + ndCLonedItem.GetGateway().GetIP.ToIpString(); -DeviceConfig.cs:144: lbArpTable.Items.Add("Arp Table MAC\tIPAddress"); -DeviceConfig.cs:147: lbArpTable.Items.Add(ae.MACAddress + "\t" + ae.IPAddr); -DeviceConfig.cs:152: string selectedNicName = ""; -DeviceConfig.cs:154: selectedNicName = Regex.Replace(selectedNicName, " .*", ""); -DeviceConfig.cs:155: selectedNicName = Regex.Replace(selectedNicName, "\\*", ""); -DeviceConfig.cs:213: MessageBox.Show("The name '" + otext + "' is being used as part of this puzzle and this machine cannot be named that."); -DeviceConfig.cs:222: if (ClonedItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -DeviceConfig.cs:294: if (ClonedItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -DeviceConfig.cs:347: if (ClonedItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -DeviceConfig.cs:353: selectedNIC = Regex.Replace(selectedNIC, " .*", ""); -DeviceConfig.cs:354: selectedNIC = Regex.Replace(selectedNIC, "\\*", ""); -IPAddress.cs:99: public bool Edit(NetworkDevice FromWhat, string message="") -IPAddress.cs:102: if (message != "") -IPAddress.cs:122: _mask = "255.255.255.0".ParseIp(); -IPAddress.cs:127: if(mySplitVal[0] == "10") -IPAddress.cs:129: _mask = "255.0.0.0".ParseIp(); -IPAddress.cs:131: if (mySplitVal[0] == "172") -IPAddress.cs:133: _mask = "255.255.0.0".ParseIp(); -IPAddress.cs:135: if (mySplitVal[0] == "192") -IPAddress.cs:137: _mask = "255.255.255.0".ParseIp(); +DeviceConfig.cs:31: lblHelp.Text = "Select the network card or interface for that network card that you wish to edit. Then press the [edit] button to make changes to that. Press the [-] to remove it, and press [+] to add another."; +DeviceConfig.cs:105: btnGateway.Text = string.Format("Gateway: {0}", ndCLonedItem.GetGateway().GetIP.ToIpString()); +DeviceConfig.cs:143: lbArpTable.Items.Add("Arp Table MAC\tIPAddress"); +DeviceConfig.cs:146: lbArpTable.Items.Add(ae.MACAddress + "\t" + ae.IPAddr); +DeviceConfig.cs:212: MessageBox.Show(string.Format("The name '{0}' is being used as part of this puzzle and this machine cannot be named that.", otext)); IPAddress.cs:226: string tstring = "IP:" +PadIt(_ip.ToIpString())+ IPAddress.cs:227: " Mask:" + PadIt(_mask.ToIpString())+ IPAddress.cs:228: " GW:" + PadIt(gw); -IPAddress.cs:245: return String.Join(".", parts); -IPAddressEntry.cs:32: string hostname = ""; -IPAddressEntry.cs:48: if (!lNM.Contains("255")) -IPAddressEntry.cs:49: lNM = "255.255.255.0"; -LanguageString.cs:14: public string text=""; LanguageString.cs:15: public string language="en"; LanguageString.cs:30: if(Regex.IsMatch(theNode.Name.ToLower(),"^[a-z][a-z]_" + tag)) -LanguageString.cs:34: language = Regex.Replace(theNode.Name.ToLower(), "_" + tag, ""); LanguageString.cs:39: language = "en"; -LanguageString.cs:55: string tag = ""; LanguageString.cs:113: if(language != "en") LanguageString.cs:115: return GetText("en"); -LanguageString.cs:123: return ""; -LinkEditor.cs:72: string SrcHost=""; -LinkEditor.cs:75: string DstHost=""; -LinkEditor.cs:78: string SrcNic = ""; -LinkEditor.cs:88: string DstNic = ""; -LinkEditor.cs:154: if (SrcNic != "") -LinkEditor.cs:160: if (DstNic != "") LinkEditor.cs:175: if (Regex.IsMatch(SrcNic, "^wport") || Regex.IsMatch(SrcNic, "^wlan")) ListBoxWindow.cs:47: if (str == SelectedTag || (SelectedTag == "ALL" && Regex.IsMatch(str,"Level"))) ListBoxWindow.cs:78: lbWindowData.Font = new System.Drawing.Font("Courier New", 8); ListBoxWindow.cs:86: lbWindowData.Font = new System.Drawing.Font("Courier New", 8); ListBoxWindow.cs:139: newCB.Name = "checkBox" + count.ToString(); ListBoxWindow.cs:159: return "Level_" + PI.Level; -ListBoxWindow.cs:168: string selected = ""; ListBoxWindow.cs:220: shown_name = "* " + shown_name; -ListBoxWindow.cs:230: if(selected != null && selected != "") -ListBoxWindow.cs:251: TheName = Regex.Replace(TheName, @"^\* ", ""); -NB.cs:95: HostName = ""; -NB.cs:96: NicName = ""; NB.cs:131: get { return HostID.ToString()+"-"+NicID.ToString(); } NB.cs:213: PuzzleTags.Add("Level_" + Individual.InnerText); NB.cs:228: public static string BroadcastMACString = "FF:FF:FF:FF:FF:FF"; //The broadcast MAC address -NB.cs:229: public static string BroadcastIPString = "255.255.255.255"; //the generic broadcast IP address -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:287: myresource = new ResourceManager("EduNetworkBuilder.Resources.languages.edustrings", MyAssembly); -NB.cs:326: string answer=""; -NB.cs:328: if (answer == null) return ""; 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:513: if(What.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -NB.cs:515: if (What.GetType().ToString() == "EduNetworkBuilder.NetworkLink") 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:130:// toreturn = "Cannot ping"; NetTest.cs:190:// toreturn = "Cannot ping host:"; -NetTest.cs:244: toreturn = ""; -NetTest.cs:252: string toreturn = ""; NetTest.cs:255: return TestDescription(amount) + " " + sHost; NetTest.cs:260: toreturn = sHost + " " + TestDescription(amount); NetTest.cs:263: toreturn = sHost + " " + TestDescription(amount); NetTest.cs:266: toreturn = sHost + " " + TestDescription(amount) + " " + dHost; -NetTest.cs:269: toreturn = ""; NetTest.cs:359: //The IP address chosen is "local" to the source host. So it should ping between them NetTest.cs:405: //dHost is either "true" or "false" NetTestEditor.cs:108: cbDest.Items.Add("?Button"); NetTestEditor.cs:116: theNames.Remove("None"); -Network.cs:20: public string PuzzleName=""; Network.cs:37: private IPAddress lastAddress = new IPAddress("0.0.0.0/24"); -Network.cs:38: public string NetworkFilename = ""; Network.cs:54: NetMessage = new LanguageStrings("message"); Network.cs:55: NetTitle = new LanguageStrings("title"); Network.cs:87: Load(@"C:\Users\tyoung\Desktop\Test.enbx"); Network.cs:157: //Tags.Add("Level_" + Individual.InnerText); Network.cs:167: if(Regex.IsMatch(Individual.Name.ToLower(),"message")) Network.cs:172: if (Regex.IsMatch(Individual.Name.ToLower(), "title")) -Network.cs:183: if (NetMessage.GetText() != "" && !AlreadyDisplayedMessage) Network.cs:207: Save(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "Test.enbx")); -Network.cs:221: writer.WriteComment("This is a network file for EduNetworkBuilder."); -Network.cs:327: if (tItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -Network.cs:342: if (tItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -Network.cs:357: if(tItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -Network.cs:396: if(NetComponents[looper].GetType().ToString() == "EduNetworkBuilder.NetworkLink") -Network.cs:421: if (NC.GetType().ToString() == "EduNetworkBuilder.NetworkLink") -Network.cs:461: if(tString != "") Network.cs:503: if (nt.ColorItemsIfNeeded(HintsToDisplay != NetTestVerbosity.none)) //only change the color if we are not "none" -Network.cs:524: if (NC.GetType().ToString() == "EduNetworkBuilder.NetworkLink") -Network.cs:530: if (NC.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") -Network.cs:667: if (PuzzleName != "" && PuzzleName != null) -Network.cs:730: if (nt.TheTest == NetTestType.HelpRequest && sHost == "" && dHost == nt.dHost && dHost == "?Button") -Network.cs:748: if (nc.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") Network.cs:836: Console.WriteLine(string.Format("Total seconds = {0} Stopping.", Duration.TotalSeconds.ToString())); -Network.cs:927: if (nc.GetType().ToString() == "EduNetworkBuilder.NetworkLink") -Network.cs:935: if (nc.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") Network.cs:1089: //Console.WriteLine("position=" + HowFar.ToString()); Network.cs:1099: //Console.WriteLine("position=" + HowFar.ToString()); -NetworkBuilder.cs:24: public Network myNetwork = new Network(""); -NetworkBuilder.cs:26: private string selectedButton = ""; NetworkBuilder.cs:37: public string ChosenLanguage = "en"; //The language to try to load -NetworkBuilder.cs:64: lblStatus.Text = ""; -NetworkBuilder.cs:128: LanguageResources = new ResourceManager("EduNetworkBuilder.Resources.languages.edustrings", MyAssembly); -NetworkBuilder.cs:155: if (answer == null) return ""; -NetworkBuilder.cs:338: if (myNetwork.NetworkFilename != "") -NetworkBuilder.cs:368: if (myNetwork.NetTitle.GetText() != "") NetworkBuilder.cs:369: Text += ": " + myNetwork.NetTitle.GetText(); -NetworkBuilder.cs:370: if (myNetwork.NetMessage.GetText() != "") -NetworkBuilder.cs:432: System.Resources.ResourceManager("EduNetworkBuilder.Properties.Resources", NetworkBuilder.cs:440: MessageBox.Show(String.Format("Skipping Invalid Puzzle: '{0}'",str)); NetworkBuilder.cs:449: //Console.WriteLine("Puzzle: " + str + " " + newPuzzle.PuzzleTitle); -NetworkBuilder.cs:519: lblStatus.Text = ""; -NetworkBuilder.cs:520: selectedButton = ""; NetworkBuilder.cs:547: pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Ping {0}",tStr)); NetworkBuilder.cs:552: pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Arp {0}", tStr)); NetworkBuilder.cs:589: pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Remove Link To {0}", host)); -NetworkBuilder.cs:608: released = Regex.Replace(released, ".* ", ""); -NetworkBuilder.cs:713: IPAddress destination = new IPAddress(NB.ZeroIPString, "255.255.255.255", IPAddressType.ip_only); -NetworkBuilder.cs:731: lblStatus.Text = ""; NetworkBuilder.cs:754: if (selectedButton == "btnLink") -NetworkBuilder.cs:861: string newtooltip = ""; -NetworkBuilder.cs:875: myNetwork = new Network(""); NetworkBuilder.cs:896: mydialog.Filter = "EduNet File (*.enbx)|*.enbx"; -NetworkBuilder.cs:899: if (LastPath != null && LastPath != "") mydialog.FileName = LastPath; NetworkBuilder.cs:902: if(!Regex.IsMatch(mydialog.FileName,@"^.*.enbx$")) -NetworkBuilder.cs:919: if (oldfile != null && oldfile != "" && File.Exists(oldfile)) NetworkBuilder.cs:940: mydialog.Filter = "EduNet File (*.enbx)|*.enbx"; -NetworkBuilder.cs:943: if (myNetwork.NetworkFilename != "") -NetworkBuilder.cs:1068: System.Resources.ResourceManager("EduNetworkBuilder.Properties.Resources", NetworkBuilder.cs:1085: LoadNetworkFromResource("OneNet"); NetworkBuilder.cs:1091: LoadNetworkFromResource("TwoNets"); NetworkBuilder.cs:1097: LoadNetworkFromResource("DHCP"); @@ -162,60 +71,37 @@ NetworkBuilder.cs:1130: LoadNetworkFromResource("ThreeNets"); NetworkBuilder.cs:1166: //MessageBox.Show("Trying Localpath: " + uri.LocalPath); NetworkBuilder.cs:1167: //MessageBox.Show("isUNC: " + uri.IsUnc.ToString()); NetworkBuilder.cs:1168: //MessageBox.Show("isFile: " + uri.IsFile.ToString()); -NetworkBuilder.cs:1191: bool didsomething = myNetwork.NoteActionDone(NetTestType.HelpRequest, "", "?Button"); NetworkBuilder.cs:1204: rtwin = new RTFWindow("Help: " + myNetwork.NetTitle.GetText(), myNetwork.NetMessage.GetText(), myNetwork.NetTests); NetworkBuilder.cs:1247: LoadNetworkFromResource("firewalls"); NetworkBuilder.cs:1253: LoadNetworkFromResource("firewalls"); -NetworkCard.cs:26: private string _nic_name=""; -NetworkCard.cs:42: nInterface = new NetworkInterface(NicName(), "127.0.0.1", "255.0.0.0", myID); NetworkCard.cs:116: myID.Save(writer, "myid"); -NetworkCard.cs:120: if(EncryptionKey != "") -NetworkCard.cs:122: if (SSID != "") NetworkCard.cs:126: TunnelEndpoint.Save(writer, "tunnelendpoint"); NetworkCard.cs:171: string connected = " "; 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: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:"; NetworkCardEditor.cs:81: lblVPNEnd.Text = "SSID:"; NetworkCardEditor.cs:91: lblVPNEncrypt.Text = "Wireless Key:"; -NetworkCardEditor.cs:145: string btnval = "0.0.0.0"; NetworkCardEditor.cs:166: lblLinkStatus.Text = "Connected"; NetworkCardEditor.cs:168: lblLinkStatus.Text = "Disconnected"; -NetworkCardEditor.cs:192: MyNicToEdit.TunnelEndpoint = new IPAddress(NB.ZeroIPString, "255.255.255.0", IPAddressType.ip_only); NetworkCardEditor.cs:194: MyNicToEdit.TunnelEndpoint.Edit(nd,"Endpoint"); NetworkComponent.cs:18: public bool IsDirty = true; //If something has changed and it needs to be re-drawn. It starts as "true" -NetworkComponent.cs:20: public string hostname = ""; NetworkComponent.cs:88: throw new ArgumentException("The type must be serializable.", "source"); NetworkDevice.cs:295: DefaultGW.Edit(this,"Default Gateway"); NetworkDevice.cs:390: DefaultGW.Save(writer, "gateway"); @@ -224,19 +110,11 @@ NetworkDevice.cs:401: dhcp.Save(writer, "dhcprange"); NetworkDevice.cs:439: answer += "\n" + addr; NetworkDevice.cs:449: answer += "\n" + tString; NetworkDevice.cs:707: MessageBox.Show("The network card," + NICs[index].NicName() + " is locked as part of the puzzle.", "Locked NIC"); -NetworkDevice.cs:720: if (nic.SSID == "") continue; -NetworkDevice.cs:844: tstr = Regex.Replace(name, " .*", ""); NetworkDevice.cs:871: Font stringFont = new Font("Consolas", 17); -NetworkDevice.cs:919: string title = ""; NetworkDevice.cs:921: title += "if: "; NetworkDevice.cs:923: title += nic.NicName() + ": "; -NetworkDevice.cs:961: return new HostNicID(-1, -1, hostname, ""); -NetworkDevice.cs:995: if (dest.GetMask != 0 && dest.GetMask.ToIpString() != "255.255.255.0") -NetworkDevice.cs:1130: Packet DHCPPacket = new Packet(this, "", NB.BroadcastMACString, "DHCP Request", PacketType.dhcp_request); NetworkDevice.cs:1140: Packet PingPacket = new Packet(this,Destination,"Ping",PacketType.ping_request); NetworkDevice.cs:1148: Packet ArpPacket = new Packet(this, Destination, "Arp Request", PacketType.arp_request); -NetworkDevice.cs:1155: public void TunnelPacketFromHere(IPAddress Destination, Packet Payload, string Encryption = "") -NetworkDevice.cs:1164: if (Encryption != "") NetworkDevice.cs:1166: Packet TunnelPacket = new Packet(this, Destination, "Tunnel", TunType); NetworkDevice.cs:1201: //Console.WriteLine(hostname + ": packet=" + tPacket.MyType.ToString()); NetworkDevice.cs:1202: //Console.WriteLine(" " + hostname + ": d:" + ipc.destIP.GetIPString + " s:" + tPacket.sourceIP.GetIPString); @@ -247,47 +125,27 @@ NetworkDevice.cs:1286: Console.WriteLine("Debug"); NetworkDevice.cs:1289: //if we are supposed to route (do-not-route flag not set) or if the packet is "fresh" NetworkDevice.cs:1300: tPacket.AddMessage(DebugLevel.info, hostname + " No route to host: " + tPacket.destIP.GetIPString); NetworkDevice.cs:1301: tPacket.Tracking.Status = hostname + " No route to host: " + tPacket.destIP.GetIPString; -NetworkDevice.cs:1437: if (tPacket.destMAC == "") -NetworkDevice.cs:1441: //The packet was not successfully sent anywhere. DMac = "". This means no host with the specified IP NetworkDevice.cs:1442: tPacket.AddMessage(DebugLevel.info, hostname + " Failed: No such IP on the local network - Arp only searches the local network."); NetworkDevice.cs:1443: tPacket.Tracking.Status = hostname + " Failed: No such IP on the local network."; -NetworkDevice.cs:1448: //The packet was not successfully sent anywhere. DMac = "". This means no host with the specified IP NetworkDevice.cs:1449: tPacket.AddMessage(DebugLevel.info, hostname + " Failed: No such IP."); NetworkDevice.cs:1450: tPacket.Tracking.Status = hostname + " Failed: No such IP."; NetworkDevice.cs:1457: tPacket.AddMessage(DebugLevel.info, hostname + " No local interface to send packet out."); NetworkDevice.cs:1458: tPacket.Tracking.Status = hostname + " No local interface to send packet out"; -NetworkDevice.cs:1534: nPacket = new Packet(this, tPacket.sourceIP, "", PacketType.ping_answer); NetworkDevice.cs:1540: tPacket.Tracking.Status = hostname + ":\tPing success: The ping reached the destination." + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); -NetworkDevice.cs:1573: nPacket.destMAC = ""; -NetworkDevice.cs:1574: nPacket.sourceMAC = ""; NetworkDevice.cs:1581: tPacket.AddMessage(DebugLevel.info, "The broadcast ping reached a destination that was not on the same network"); NetworkDevice.cs:1582: tPacket.Tracking.Status = hostname + ":\t" + "The broadcast ping reached a destination that was not on the same network" + tPacket.sourceIP.GetIP.ToIpString() + " -> " + hostname; NetworkDevice.cs:1594: tPacket.AddMessage(DebugLevel.info, "Success! The ping returned from its destination." + " But some was lost: health=" + tPacket.health.ToString() ); NetworkDevice.cs:1596: tPacket.Tracking.Status = hostname + string.Format(":\tPing partial success: {0}% packet loss. {1} -> {2}", left , tPacket.sourceIP.GetIP.ToIpString(),tPacket.destIP.GetIP.ToIpString()); NetworkDevice.cs:1602: tPacket.Tracking.Status = hostname + ":\tPing success: The ping returned from its destination" + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); NetworkDevice.cs:1617: 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(); -NetworkDevice.cs:1653: if (tstrings.Count > 0 && !Regex.IsMatch(tstrings[0], "127.0.0.1")) -NetworkDevice.cs:1662: nPacket.destMAC = ""; -NetworkDevice.cs:1663: tPacket.sourceMAC = ""; NetworkDevice.cs:1669: tPacket.Tracking.Status = hostname + ":\tArp Request found IP: " + tPacket.sourceIP.GetIPString + " on MAC: "+ nPacket.sourceMAC; NetworkDevice.cs:1687: tPacket.Tracking.Status = hostname + ":\tArp request success: Who Has " + tPacket.sourceIP.GetIP.ToIpString() + " tell " + tPacket.sourceIP.GetIP.ToIpString() + " = " + tPacket.sourceMAC; NetworkDevice.cs:1694: 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(); -NetworkDevice.cs:1732: nPacket.OutboundMAC = ""; -NetworkDevice.cs:1737: string IP = ""; -NetworkDevice.cs:1739: if(IP == "" && nPacket.WhereAmI != null) { NetworkDevice.cs:1743: tPacket.Tracking.Status = hostname + ":\tDHCP Request found Server: " + IP; NetworkDevice.cs:1763: tPacket.Tracking.Status = hostname + ":\tDHCP request/answer. " + tPacket.payloadIP.GetIP.ToIpString(); NetworkDevice.cs:1771: tPacket.AddMessage(DebugLevel.info, "ND_ProcessArrival_PackReturnErr1"); NetworkDevice.cs:1772: string sIP = "?.?.?.?"; NetworkDevice.cs:1775: tPacket.Tracking.Status = hostname + ":\tDHCP Request failed: Arrived at a machine that was not expecting it and was rejected." + sIP + " -> " + tPacket.destIP.GetIP.ToIpString(); -NetworkDevice.cs:1890: string DHCPGW = ""; -NetworkDevice.cs:1899: if(nic.UsesDHCP && nic.CanUseDHCP && DHCPGW == "") -NetworkDevice.cs:1918: if (DHCPGW != "") -NetworkDevice.cs:1926: if((tPacket.OutboundMAC == null || tPacket.OutboundMAC == "") && -NetworkDevice.cs:1928: (tPacket.sourceMAC == "" || tPacket.sourceMAC == null)) -NetworkDevice.cs:1952: if ((tPacket.OutboundMAC == null || tPacket.OutboundMAC == "") && -NetworkDevice.cs:1954: (tPacket.sourceMAC == "" || tPacket.sourceMAC == null)) -NetworkDevice.cs:1960: if (!nic.HasIP(new IPAddress("127.0.0.1").GetIP)) //don't bother pinging on the loopback NetworkDevice.cs:1984: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: DHCP Server does not have gateway set. DHCP server failing" + tPacket.OutboundIP.GetIP.ToIpString()); NetworkDevice.cs:1985: tPacket.Tracking.Status = hostname + " ERROR: DHCP Server does not have gateway set. DHCP server failing"; NetworkDevice.cs:1991: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: No route or local interface for packet. " + tPacket.OutboundIP.GetIP.ToIpString()); @@ -296,8 +154,6 @@ NetworkDevice.cs:2005: tPacket.AddMessage(DebugLevel.info, ho NetworkDevice.cs:2006: tPacket.Tracking.Status = hostname + " No route or local network card for packet."; NetworkDevice.cs:2017: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: No local interface for packet. :" + tPacket.OutboundIP.GetIP.ToIpString()); NetworkDevice.cs:2018: tPacket.Tracking.Status = hostname + " No route or local interface for packet."; -NetworkDevice.cs:2025: if (tPacket.destMAC == "" || tPacket.destMAC == null) //was != broadcast-mac -NetworkDevice.cs:2033: if (tPacket.OutboundMAC == "") NetworkDevice.cs:2195: tPacket.Tracking.Status = hostname + " Failed: no card available to use."; NetworkDevice.cs:2234: tPacket.AddMessage(DebugLevel.debug, hostname + " Packet request fell on deaf ears. This is not a DHCP server."); NetworkDevice.cs:2235: tPacket.Tracking.Status = hostname + " Failed: Not a DHCP Server. Packet Dropped."; @@ -305,22 +161,11 @@ NetworkDevice.cs:2242: tPacket.AddMessage(DebugLevel.debug, h NetworkDevice.cs:2243: tPacket.Tracking.Status = hostname + " This device is not a router. Packet dropped."; NetworkDevice.cs:2252: tPacket.AddMessage(DebugLevel.debug, hostname + " The device had no local IPs. Quietly dropped."); NetworkDevice.cs:2253: tPacket.Tracking.Status = hostname + " Failed: no IPs local to the packet."; -NetworkDevice.cs:2313: return ""; -NetworkDevice.cs:2323: return ""; -NetworkDevice.cs:2333: return new HostNicID(-1,-1,"",""); -NetworkDevice.cs:2342: return new HostNicID(-1, -1, "", ""); -NetworkDevice.cs:2349: if (arp == "") -NetworkDevice.cs:2374: if (found == "") -NetworkDevice.cs:2460: if (ip.GetIP.ToIpString() != "127.0.0.1") NetworkDevice.cs:2464: theStrings.Add("IF:" + ip.GetIP.ToIpString().PadLeft(15) + " Range: " + NetworkDevice.cs:2465: ip.GetMask.ToIpString() + " - " + ip.GetGateway.ToIpString()); -NetworkDevice.cs:2481: if (ip.GetIP.ToIpString() != "127.0.0.1" && InterfaceIP.IsLocal(ip)) NetworkInterface.cs:50: myIP.Save(writer, "myip"); NetworkInterface.cs:59: tstring += " - " + myIP.GetMask.ToIpString(); -NetworkInterface.cs:64: mask = Regex.Replace(mask, "0", ""); NetworkInterface.cs:66: tstring += "/" + count.ToString(); -NetworkInterface.cs:107: tPacket.sourceIP = new IPAddress(myIP.GetIP.ToIpString(), "", IPAddressType.ip_only); //We only want the IP address -NetworkLink.cs:50: if(IsWireless && AccessPoint != null && Client != null && AccessPoint.SSID != null && AccessPoint.SSID != "") NetworkLink.cs:65: MessageBox.Show("The SSID and Key have been updated on the client."); NetworkLink.cs:120: SrcNic.Save(writer, "SrcNic"); NetworkLink.cs:121: DstNic.Save(writer, "DstNic"); @@ -348,9 +193,6 @@ OptionsWindow.cs:44: myToolTip.SetToolTip(lblLevel, "The Level that t OptionsWindow.cs:45: myToolTip.SetToolTip(tbLevel, "The Level that this puzzle is stored in."); OptionsWindow.cs:46: myToolTip.SetToolTip(lblSortOrder, "How this is sorted within the list of puzzles."); OptionsWindow.cs:47: myToolTip.SetToolTip(tbSortOrder, "How this is sorted within the list of puzzles."); -OptionsWindow.cs:78: tbSortOrder.Text = myNet.SortOrder.ToString("00.000"); -OptionsWindow.cs:85: if (what != "") -OptionsWindow.cs:141: NT = new NetTest("", "", NetTestType.NeedsDefaultGW); OptionsWindow.cs:183: lbTests.ContextMenuStrip.Items.Add("Add"); OptionsWindow.cs:185: lbTests.ContextMenuStrip.Items.Add("Edit"); OptionsWindow.cs:187: lbTests.ContextMenuStrip.Items.Add("Delete"); @@ -362,19 +204,10 @@ OptionsWindow.cs:260: lbTags.ContextMenuStrip.Items.Add("Edit OptionsWindow.cs:262: lbTags.ContextMenuStrip.Items.Add("Read"); OptionsWindow.cs:264: lbTags.ContextMenuStrip.Items.Add("Delete"); OptionsWindow.cs:286: tlist.Remove("None"); -OptionsWindow.cs:293: if(value != "" && Choice.Items.Contains(value)) OptionsWindow.cs:302: Done.Text = "Done"; OptionsWindow.cs:311: QuestionForm.Height = Done.Location.Y + Done.Height + 5; //This is too small for the form, it autosizes to "big enough" OptionsWindow.cs:334: newstring = QuickPrompt("Edit Tag", "Tag:", myNet.SuggestedReadings[lbTags.SelectedIndex].ToString()); -OptionsWindow.cs:335: if (newstring != "") -OptionsWindow.cs:349: newstring = QuickPrompt("Edit Tag", "Tag:", ""); -OptionsWindow.cs:350: if (newstring != "") -OptionsWindow.cs:365: tbSortOrder.Text = value.ToString("00.000"); Packet.cs:32: PacketDump(" " + status, DebugPausePoint.packet_kill); -Packet.cs:48: public string payloadData = ""; //Contains the mac-address, or ip-address string, or something else -Packet.cs:49: public string EncryptionString = ""; -Packet.cs:62: public string OutboundMAC = ""; -Packet.cs:63: public string OutboundDestMAC = ""; Packet.cs:109: Tracking.AddMessage(DebugLevel.debug, WhereAmI, "Packet duplicated"); Packet.cs:124: Tracking.AddMessage(DebugLevel.info, start, theType.ToString() + "Packet Created"); Packet.cs:125: Tracking.AddMessage(DebugLevel.routing, start, " MAC:" + source + " -> " + dest); @@ -386,7 +219,6 @@ Packet.cs:164: Tracking.AddMessage(DebugLevel.info, start, "Packe Packet.cs:165: //Tracking.AddMessage(DebugLevel.routing, start, " IP:" + sourceIP.GetIP.ToIpString() + " -> " + dest.GetIP.ToIpString()); Packet.cs:226: //The packet is "inside" the device. Packet.cs:229: // Here the packet is just about to exit. Maybe we need to set the "source IP" -Packet.cs:254: if (dMAC != "" || destMAC == NB.BroadcastMACString) Packet.cs:264: Tracking.AddMessage(DebugLevel.info, WhereAmI, "Unable to find a mac address for the IP address: " + dest.GetIP.ToIpString()); Packet.cs:265: Tracking.Status = WhereAmI.hostname + " Failed: Unable to find a MAC address for the specified IP."; Packet.cs:280: AddMessage(DebugLevel.debug, "The packet was dropped because we lost where it was. WhereAmI == null!"); @@ -397,12 +229,10 @@ Packet.cs:300: AddMessage(DebugLevel.debug, "The packet was dropp Packet.cs:301: Tracking.Status = "NO_Host" + " Lost location of packet.."; Packet.cs:312: AddMessage(DebugLevel.debug, "The packet was dropped because we lost where it was. WhereAmI == null!"); Packet.cs:313: Tracking.Status = "NO_Host" + " Lost location of packet.."; -Packet.cs:337: OutboundMAC = ""; Packet.cs:343: Console.WriteLine("Starting on link. SMAC: " + sourceMAC + " DMAC: " + destMAC); Packet.cs:344: AddMessage(DebugLevel.debug, " Starting on link"); Packet.cs:369: Tracking.AddMessage(DebugLevel.info, "Packet", "Packet failed to reach any IP. No such IP on network: " + destIP.GetIPString); Packet.cs:370: Tracking.Status = "Packet failed to reach IP: " + destIP.GetIPString; -Packet.cs:429: position = Regex.Replace(position, "packet_", ""); Packet.cs:434: Console.WriteLine("Pausing"); Packet.cs:438: Console.WriteLine(hostname + ": " + MyType.ToString()); Packet.cs:439: Console.Write(hostname + ": " + position + " PACKET: dstIP:" + dIP); @@ -413,10 +243,8 @@ Packet.cs:443: Console.WriteLine("---"); Packet.cs:445: AddMessage(DebugLevel.packet, hostname + ": " + position + " PACKET: dstIP:" + dIP + " dstMAC:" + destMAC); Packet.cs:446: AddMessage(DebugLevel.packet, hostname + ": " + position + " PACKET: srcIP:" + sIP + " srcMAC:" + sourceMAC); Packet.cs:453: throw new ArgumentException("The type must be serializable.", "source"); -PacketMessage.cs:34: public string _Status = ""; //Usually "success" or "failed" PacketMessage.cs:47: throw new ArgumentException("The type must be serializable.", "source"); PacketMessage.cs:76: string host = "unknown"; PacketMessage.cs:91: tString = tmessage.HostName + " \t" + tmessage.WhatLevel.ToString() + "\t" + tmessage.Message; PacketMessage.cs:103: tString = time.ToString() + " ms " + Status; -RTFWindow.cs:131: if (tbFind.Text == "") return; //We do nothing if nothing to find. RTFWindow.cs:153: MessageBox.Show("Not found."); From eaf3a46376d24e7cabe57b9ccbd8310ca79ca6f8 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Wed, 18 Nov 2015 14:46:11 -0500 Subject: [PATCH 2/4] Change to string to make translation better --- EduNetworkBuilder/IPAddress.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/EduNetworkBuilder/IPAddress.cs b/EduNetworkBuilder/IPAddress.cs index bd6f87a..6824260 100644 --- a/EduNetworkBuilder/IPAddress.cs +++ b/EduNetworkBuilder/IPAddress.cs @@ -223,9 +223,8 @@ namespace EduNetworkBuilder } public string IPFormat(string gw) { - string tstring = "IP:" +PadIt(_ip.ToIpString())+ - " Mask:" + PadIt(_mask.ToIpString())+ - " GW:" + PadIt(gw); + string tstring = string.Format("IP:{0} Mask:{1} GW:{2}", + PadIt(_ip.ToIpString()), PadIt(_mask.ToIpString()), PadIt(gw)); return tstring; } } From b0fc5d323b06ba97e518eec552af9c409600f641 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Wed, 18 Nov 2015 15:00:05 -0500 Subject: [PATCH 3/4] Translation strings in Packet --- EduNetworkBuilder/Packet.cs | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/EduNetworkBuilder/Packet.cs b/EduNetworkBuilder/Packet.cs index 8b415f7..2adf66e 100644 --- a/EduNetworkBuilder/Packet.cs +++ b/EduNetworkBuilder/Packet.cs @@ -122,7 +122,7 @@ namespace EduNetworkBuilder destMAC = dest; OutboundDestMAC = dest; Tracking.AddMessage(DebugLevel.info, start, theType.ToString() + "Packet Created"); - Tracking.AddMessage(DebugLevel.routing, start, " MAC:" + source + " -> " + dest); + Tracking.AddMessage(DebugLevel.routing, start, string.Format(" MAC: {0} -> {1}", source, dest)); } else { @@ -135,8 +135,8 @@ namespace EduNetworkBuilder OutboundDestMAC = destMAC; } Tracking.AddMessage(DebugLevel.info, start, "Packet Created"); - Tracking.AddMessage(DebugLevel.routing, start, " IP:" + source + " -> " + dest); - Tracking.AddMessage(DebugLevel.debug, start, " IPs Translated to" + sourceIP.GetIP.ToIpString() + " -> " + destIP.GetIP.ToIpString()); + Tracking.AddMessage(DebugLevel.routing, start, string.Format(" IP: {0} -> {1}", source, dest)); + Tracking.AddMessage(DebugLevel.debug, start, string.Format(" IPs Translated {0} -> {1}",sourceIP.GetIP.ToIpString(), destIP.GetIP.ToIpString())); } isFresh = true; } @@ -154,7 +154,7 @@ namespace EduNetworkBuilder if (destIP != null && destIP.BroadcastAddress == destIP.GetIP) destMAC = NB.BroadcastMACString; Tracking.AddMessage(DebugLevel.info, start, "Packet Created"); - Tracking.AddMessage(DebugLevel.routing, start, " IP:" + sourceIP.GetIP.ToIpString() + " -> " + dest.GetIP.ToIpString()); + Tracking.AddMessage(DebugLevel.routing, start, string.Format(" IP:{0} -> {1}", sourceIP.GetIP.ToIpString(), dest.GetIP.ToIpString())); } else { @@ -261,8 +261,8 @@ namespace EduNetworkBuilder if(MyNet.CountPackets(PacketType.arp_answer) + MyNet.CountPackets(PacketType.arp_request) == 0) { //No more arps going. We do not have an answer! - Tracking.AddMessage(DebugLevel.info, WhereAmI, "Unable to find a mac address for the IP address: " + dest.GetIP.ToIpString()); - Tracking.Status = WhereAmI.hostname + " Failed: Unable to find a MAC address for the specified IP."; + Tracking.AddMessage(DebugLevel.info, WhereAmI, string.Format("Unable to find a mac address for the IP address: {0}", dest.GetIP.ToIpString())); + Tracking.Status = string.Format("{0} Failed: Unable to find a MAC address for the specified IP.", WhereAmI.hostname ); MyStatus = PacketStatus.finished_failed; } return; @@ -278,7 +278,7 @@ namespace EduNetworkBuilder if (WhereAmI == null) { AddMessage(DebugLevel.debug, "The packet was dropped because we lost where it was. WhereAmI == null!"); - Tracking.Status = "NO_Host" + " Lost location of packet.."; + Tracking.Status = "NO_Host Lost location of packet.."; MyStatus = PacketStatus.finished_failed; return; //We cannot process the packet } @@ -298,7 +298,7 @@ namespace EduNetworkBuilder if (WhereAmI == null) { AddMessage(DebugLevel.debug, "The packet was dropped because we lost where it was. WhereAmI == null!"); - Tracking.Status = "NO_Host" + " Lost location of packet.."; + Tracking.Status = "NO_Host Lost location of packet.."; MyStatus = PacketStatus.finished_failed; return; //We cannot process the packet } @@ -310,7 +310,7 @@ namespace EduNetworkBuilder if (WhereAmI == null) { AddMessage(DebugLevel.debug, "The packet was dropped because we lost where it was. WhereAmI == null!"); - Tracking.Status = "NO_Host" + " Lost location of packet.."; + Tracking.Status = "NO_Host Lost location of packet.."; MyStatus = PacketStatus.finished_failed; return; //We cannot process the packet } @@ -340,7 +340,7 @@ namespace EduNetworkBuilder myDirection = nb_direction.to_dst; else myDirection = nb_direction.to_src; - Console.WriteLine("Starting on link. SMAC: " + sourceMAC + " DMAC: " + destMAC); + Console.WriteLine(string.Format("Starting on link. SMAC: {0} DMAC: {1}",sourceMAC,destMAC)); AddMessage(DebugLevel.debug, " Starting on link"); } @@ -366,8 +366,9 @@ namespace EduNetworkBuilder } if(MyType == PacketType.arp_request && MyStatus == PacketStatus.finished_failed) { - Tracking.AddMessage(DebugLevel.info, "Packet", "Packet failed to reach any IP. No such IP on network: " + destIP.GetIPString); - Tracking.Status = "Packet failed to reach IP: " + destIP.GetIPString; + Tracking.AddMessage(DebugLevel.info, "Packet", + string.Format("Packet failed to reach any IP. No such IP on network: {0}", destIP.GetIPString)); + Tracking.Status = string.Format("Packet failed to reach IP: {0}",destIP.GetIPString); MyStatus = PacketStatus.finished_failed; } if (MyStatus != PacketStatus.finished) @@ -435,15 +436,12 @@ namespace EduNetworkBuilder } if ((WhatIsSet & DebugPausePoint.dump) == DebugPausePoint.dump) { - Console.WriteLine(hostname + ": " + MyType.ToString()); - Console.Write(hostname + ": " + position + " PACKET: dstIP:" + dIP); - Console.WriteLine(" dstMAC:" + destMAC); - Console.Write(hostname + ": " + position + " PACKET: srcIP:" + sIP); - Console.WriteLine(" srcMAC:" + sourceMAC); + Console.WriteLine(string.Format("{0}: {1} PACKET: dstIP: {2} destMAC: {3}", hostname, position, dIP, destMAC)); + Console.WriteLine(string.Format("{0}: {1} PACKET: srcIP: {2} srcMAC: {3}", hostname, position, sIP, sourceMAC)); Console.WriteLine("---"); } - AddMessage(DebugLevel.packet, hostname + ": " + position + " PACKET: dstIP:" + dIP + " dstMAC:" + destMAC); - AddMessage(DebugLevel.packet, hostname + ": " + position + " PACKET: srcIP:" + sIP + " srcMAC:" + sourceMAC); + AddMessage(DebugLevel.packet, string.Format("{0}: {1} PACKET: dstIP: {2} destMAC: {3}", hostname, position, dIP, destMAC)); + AddMessage(DebugLevel.packet, string.Format("{0}: {1} PACKET: srcIP: {2} srcMAC: {3}", hostname,position,sIP,sourceMAC)); } public static T Clone(T source) From 36b68ede782f11910080929715be701a90b563ec Mon Sep 17 00:00:00 2001 From: Tim Young Date: Wed, 18 Nov 2015 15:10:53 -0500 Subject: [PATCH 4/4] Changes to ND to make translation easier --- EduNetworkBuilder/NetworkDevice.cs | 21 +-- EduNetworkBuilder/toedit.txt | 215 +++++++++++++++++++++++++---- 2 files changed, 202 insertions(+), 34 deletions(-) diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index fffa711..1797d6d 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -704,7 +704,7 @@ namespace EduNetworkBuilder } else { - MessageBox.Show("The network card," + NICs[index].NicName() + " is locked as part of the puzzle.", "Locked NIC"); + MessageBox.Show(string.Format("The network card, {0} is locked as part of the puzzle.", NICs[index].NicName()), "Locked NIC"); } } public bool AutoJoinWireless() @@ -1297,8 +1297,9 @@ namespace EduNetworkBuilder if(dest.GetIPString == NB.ZeroIPString && tPacket.destIP.GetIPString != NB.BroadcastIPString) { //No gateway set and no route... - tPacket.AddMessage(DebugLevel.info, hostname + " No route to host: " + tPacket.destIP.GetIPString); - tPacket.Tracking.Status = hostname + " No route to host: " + tPacket.destIP.GetIPString; + string errString = string.Format("{0} No route to host: {1}", hostname, tPacket.destIP.GetIPString); + tPacket.AddMessage(DebugLevel.info, errString); + tPacket.Tracking.Status = errString; tPacket.MyStatus = PacketStatus.finished_failed; return; } @@ -1439,23 +1440,23 @@ namespace EduNetworkBuilder if (tPacket.MyType == PacketType.arp_request) { //The packet was not successfully sent anywhere. DMac = "". This means no host with the specified IP - tPacket.AddMessage(DebugLevel.info, hostname + " Failed: No such IP on the local network - Arp only searches the local network."); - tPacket.Tracking.Status = hostname + " Failed: No such IP on the local network."; + tPacket.AddMessage(DebugLevel.info, string.Format("{0} Failed: No such IP on the local network - Arp only searches the local network.", hostname)); + tPacket.Tracking.Status = string.Format("{0} Failed: No such IP on the local network.", hostname); tPacket.MyStatus = PacketStatus.finished_failed; } else { //The packet was not successfully sent anywhere. DMac = "". This means no host with the specified IP - tPacket.AddMessage(DebugLevel.info, hostname + " Failed: No such IP."); - tPacket.Tracking.Status = hostname + " Failed: No such IP."; + tPacket.AddMessage(DebugLevel.info, string.Format("{0} Failed: No such IP.",hostname)); + tPacket.Tracking.Status = string.Format("{0} Failed: No such IP.", hostname); tPacket.MyStatus = PacketStatus.finished_failed; } } else { //The packet was not successfully sent anywhere. No interface to send out the packet - tPacket.AddMessage(DebugLevel.info, hostname + " No local interface to send packet out."); - tPacket.Tracking.Status = hostname + " No local interface to send packet out"; + tPacket.AddMessage(DebugLevel.info, string.Format("{0} No local interface to send packet out.", hostname)); + tPacket.Tracking.Status = string.Format("{0} No local interface to send packet out", hostname); tPacket.MyStatus = PacketStatus.finished_failed; } } @@ -1537,7 +1538,7 @@ namespace EduNetworkBuilder nPacket.Tracking = new PacketMessage(); myNet.addPacket(nPacket); 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.Tracking.Status = hostname + ":\tPing" + NB.Translate("ND_ProcessArrival_PingReached1") + tPacket.sourceIP.GetIP.ToIpString() + "-> " + tPacket.destIP.GetIP.ToIpString(); tPacket.MyStatus = PacketStatus.finished_ok; IPAddress tip = nPacket.sourceIP; if (!HasBroadcastAddress(tPacket.destIP)) diff --git a/EduNetworkBuilder/toedit.txt b/EduNetworkBuilder/toedit.txt index 2a2bca6..e43e5a0 100644 --- a/EduNetworkBuilder/toedit.txt +++ b/EduNetworkBuilder/toedit.txt @@ -1,65 +1,153 @@ DeviceConfig.cs:31: lblHelp.Text = "Select the network card or interface for that network card that you wish to edit. Then press the [edit] button to make changes to that. Press the [-] to remove it, and press [+] to add another."; +DeviceConfig.cs:74: if (ClonedItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") DeviceConfig.cs:105: btnGateway.Text = string.Format("Gateway: {0}", ndCLonedItem.GetGateway().GetIP.ToIpString()); DeviceConfig.cs:143: lbArpTable.Items.Add("Arp Table MAC\tIPAddress"); DeviceConfig.cs:146: lbArpTable.Items.Add(ae.MACAddress + "\t" + ae.IPAddr); +DeviceConfig.cs:151: string selectedNicName = ""; +DeviceConfig.cs:153: selectedNicName = Regex.Replace(selectedNicName, " .*", ""); +DeviceConfig.cs:154: selectedNicName = Regex.Replace(selectedNicName, "\\*", ""); DeviceConfig.cs:212: MessageBox.Show(string.Format("The name '{0}' is being used as part of this puzzle and this machine cannot be named that.", otext)); -IPAddress.cs:226: string tstring = "IP:" +PadIt(_ip.ToIpString())+ -IPAddress.cs:227: " Mask:" + PadIt(_mask.ToIpString())+ -IPAddress.cs:228: " GW:" + PadIt(gw); +DeviceConfig.cs:221: if (ClonedItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") +DeviceConfig.cs:293: if (ClonedItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") +DeviceConfig.cs:346: if (ClonedItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") +DeviceConfig.cs:352: selectedNIC = Regex.Replace(selectedNIC, " .*", ""); +DeviceConfig.cs:353: selectedNIC = Regex.Replace(selectedNIC, "\\*", ""); +IPAddress.cs:99: public bool Edit(NetworkDevice FromWhat, string message="") +IPAddress.cs:102: if (message != "") +IPAddress.cs:122: _mask = "255.255.255.0".ParseIp(); +IPAddress.cs:127: if(mySplitVal[0] == "10") +IPAddress.cs:129: _mask = "255.0.0.0".ParseIp(); +IPAddress.cs:131: if (mySplitVal[0] == "172") +IPAddress.cs:133: _mask = "255.255.0.0".ParseIp(); +IPAddress.cs:135: if (mySplitVal[0] == "192") +IPAddress.cs:137: _mask = "255.255.255.0".ParseIp(); +IPAddress.cs:226: string tstring = string.Format("IP:{0} Mask:{1} GW:{2}", +IPAddress.cs:244: return String.Join(".", parts); +IPAddressEntry.cs:32: string hostname = ""; +IPAddressEntry.cs:48: if (!lNM.Contains("255")) +IPAddressEntry.cs:49: lNM = "255.255.255.0"; +LanguageString.cs:14: public string text=""; LanguageString.cs:15: public string language="en"; LanguageString.cs:30: if(Regex.IsMatch(theNode.Name.ToLower(),"^[a-z][a-z]_" + tag)) +LanguageString.cs:34: language = Regex.Replace(theNode.Name.ToLower(), "_" + tag, ""); LanguageString.cs:39: language = "en"; +LanguageString.cs:55: string tag = ""; LanguageString.cs:113: if(language != "en") LanguageString.cs:115: return GetText("en"); +LanguageString.cs:123: return ""; +LinkEditor.cs:72: string SrcHost=""; +LinkEditor.cs:75: string DstHost=""; +LinkEditor.cs:78: string SrcNic = ""; +LinkEditor.cs:88: string DstNic = ""; +LinkEditor.cs:154: if (SrcNic != "") +LinkEditor.cs:160: if (DstNic != "") LinkEditor.cs:175: if (Regex.IsMatch(SrcNic, "^wport") || Regex.IsMatch(SrcNic, "^wlan")) ListBoxWindow.cs:47: if (str == SelectedTag || (SelectedTag == "ALL" && Regex.IsMatch(str,"Level"))) ListBoxWindow.cs:78: lbWindowData.Font = new System.Drawing.Font("Courier New", 8); ListBoxWindow.cs:86: lbWindowData.Font = new System.Drawing.Font("Courier New", 8); ListBoxWindow.cs:139: newCB.Name = "checkBox" + count.ToString(); ListBoxWindow.cs:159: return "Level_" + PI.Level; +ListBoxWindow.cs:168: string selected = ""; ListBoxWindow.cs:220: shown_name = "* " + shown_name; +ListBoxWindow.cs:230: if(selected != null && selected != "") +ListBoxWindow.cs:251: TheName = Regex.Replace(TheName, @"^\* ", ""); +NB.cs:95: HostName = ""; +NB.cs:96: NicName = ""; NB.cs:131: get { return HostID.ToString()+"-"+NicID.ToString(); } NB.cs:213: PuzzleTags.Add("Level_" + Individual.InnerText); NB.cs:228: public static string BroadcastMACString = "FF:FF:FF:FF:FF:FF"; //The broadcast MAC address +NB.cs:229: public static string BroadcastIPString = "255.255.255.255"; //the generic broadcast IP address +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:287: myresource = new ResourceManager("EduNetworkBuilder.Resources.languages.edustrings", MyAssembly); +NB.cs:326: string answer=""; +NB.cs:328: if (answer == null) return ""; 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:513: if(What.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") +NB.cs:515: if (What.GetType().ToString() == "EduNetworkBuilder.NetworkLink") 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:130:// toreturn = "Cannot ping"; NetTest.cs:190:// toreturn = "Cannot ping host:"; +NetTest.cs:244: toreturn = ""; +NetTest.cs:252: string toreturn = ""; NetTest.cs:255: return TestDescription(amount) + " " + sHost; NetTest.cs:260: toreturn = sHost + " " + TestDescription(amount); NetTest.cs:263: toreturn = sHost + " " + TestDescription(amount); NetTest.cs:266: toreturn = sHost + " " + TestDescription(amount) + " " + dHost; +NetTest.cs:269: toreturn = ""; NetTest.cs:359: //The IP address chosen is "local" to the source host. So it should ping between them NetTest.cs:405: //dHost is either "true" or "false" NetTestEditor.cs:108: cbDest.Items.Add("?Button"); NetTestEditor.cs:116: theNames.Remove("None"); +Network.cs:20: public string PuzzleName=""; Network.cs:37: private IPAddress lastAddress = new IPAddress("0.0.0.0/24"); +Network.cs:38: public string NetworkFilename = ""; Network.cs:54: NetMessage = new LanguageStrings("message"); Network.cs:55: NetTitle = new LanguageStrings("title"); Network.cs:87: Load(@"C:\Users\tyoung\Desktop\Test.enbx"); Network.cs:157: //Tags.Add("Level_" + Individual.InnerText); Network.cs:167: if(Regex.IsMatch(Individual.Name.ToLower(),"message")) Network.cs:172: if (Regex.IsMatch(Individual.Name.ToLower(), "title")) +Network.cs:183: if (NetMessage.GetText() != "" && !AlreadyDisplayedMessage) Network.cs:207: Save(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "Test.enbx")); +Network.cs:221: writer.WriteComment("This is a network file for EduNetworkBuilder."); +Network.cs:327: if (tItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") +Network.cs:342: if (tItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") +Network.cs:357: if(tItem.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") +Network.cs:396: if(NetComponents[looper].GetType().ToString() == "EduNetworkBuilder.NetworkLink") +Network.cs:421: if (NC.GetType().ToString() == "EduNetworkBuilder.NetworkLink") +Network.cs:461: if(tString != "") Network.cs:503: if (nt.ColorItemsIfNeeded(HintsToDisplay != NetTestVerbosity.none)) //only change the color if we are not "none" +Network.cs:524: if (NC.GetType().ToString() == "EduNetworkBuilder.NetworkLink") +Network.cs:530: if (NC.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") +Network.cs:667: if (PuzzleName != "" && PuzzleName != null) +Network.cs:730: if (nt.TheTest == NetTestType.HelpRequest && sHost == "" && dHost == nt.dHost && dHost == "?Button") +Network.cs:748: if (nc.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") Network.cs:836: Console.WriteLine(string.Format("Total seconds = {0} Stopping.", Duration.TotalSeconds.ToString())); +Network.cs:927: if (nc.GetType().ToString() == "EduNetworkBuilder.NetworkLink") +Network.cs:935: if (nc.GetType().ToString() == "EduNetworkBuilder.NetworkDevice") Network.cs:1089: //Console.WriteLine("position=" + HowFar.ToString()); Network.cs:1099: //Console.WriteLine("position=" + HowFar.ToString()); +NetworkBuilder.cs:24: public Network myNetwork = new Network(""); +NetworkBuilder.cs:26: private string selectedButton = ""; NetworkBuilder.cs:37: public string ChosenLanguage = "en"; //The language to try to load +NetworkBuilder.cs:64: lblStatus.Text = ""; +NetworkBuilder.cs:128: LanguageResources = new ResourceManager("EduNetworkBuilder.Resources.languages.edustrings", MyAssembly); +NetworkBuilder.cs:155: if (answer == null) return ""; +NetworkBuilder.cs:338: if (myNetwork.NetworkFilename != "") +NetworkBuilder.cs:368: if (myNetwork.NetTitle.GetText() != "") NetworkBuilder.cs:369: Text += ": " + myNetwork.NetTitle.GetText(); +NetworkBuilder.cs:370: if (myNetwork.NetMessage.GetText() != "") +NetworkBuilder.cs:432: System.Resources.ResourceManager("EduNetworkBuilder.Properties.Resources", NetworkBuilder.cs:440: MessageBox.Show(String.Format("Skipping Invalid Puzzle: '{0}'",str)); NetworkBuilder.cs:449: //Console.WriteLine("Puzzle: " + str + " " + newPuzzle.PuzzleTitle); +NetworkBuilder.cs:519: lblStatus.Text = ""; +NetworkBuilder.cs:520: selectedButton = ""; NetworkBuilder.cs:547: pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Ping {0}",tStr)); NetworkBuilder.cs:552: pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Arp {0}", tStr)); NetworkBuilder.cs:589: pbNetworkView.ContextMenuStrip.Items.Add(string.Format("Remove Link To {0}", host)); +NetworkBuilder.cs:608: released = Regex.Replace(released, ".* ", ""); +NetworkBuilder.cs:713: IPAddress destination = new IPAddress(NB.ZeroIPString, "255.255.255.255", IPAddressType.ip_only); +NetworkBuilder.cs:731: lblStatus.Text = ""; NetworkBuilder.cs:754: if (selectedButton == "btnLink") +NetworkBuilder.cs:861: string newtooltip = ""; +NetworkBuilder.cs:875: myNetwork = new Network(""); NetworkBuilder.cs:896: mydialog.Filter = "EduNet File (*.enbx)|*.enbx"; +NetworkBuilder.cs:899: if (LastPath != null && LastPath != "") mydialog.FileName = LastPath; NetworkBuilder.cs:902: if(!Regex.IsMatch(mydialog.FileName,@"^.*.enbx$")) +NetworkBuilder.cs:919: if (oldfile != null && oldfile != "" && File.Exists(oldfile)) NetworkBuilder.cs:940: mydialog.Filter = "EduNet File (*.enbx)|*.enbx"; +NetworkBuilder.cs:943: if (myNetwork.NetworkFilename != "") +NetworkBuilder.cs:1068: System.Resources.ResourceManager("EduNetworkBuilder.Properties.Resources", NetworkBuilder.cs:1085: LoadNetworkFromResource("OneNet"); NetworkBuilder.cs:1091: LoadNetworkFromResource("TwoNets"); NetworkBuilder.cs:1097: LoadNetworkFromResource("DHCP"); @@ -71,37 +159,60 @@ NetworkBuilder.cs:1130: LoadNetworkFromResource("ThreeNets"); NetworkBuilder.cs:1166: //MessageBox.Show("Trying Localpath: " + uri.LocalPath); NetworkBuilder.cs:1167: //MessageBox.Show("isUNC: " + uri.IsUnc.ToString()); NetworkBuilder.cs:1168: //MessageBox.Show("isFile: " + uri.IsFile.ToString()); +NetworkBuilder.cs:1191: bool didsomething = myNetwork.NoteActionDone(NetTestType.HelpRequest, "", "?Button"); NetworkBuilder.cs:1204: rtwin = new RTFWindow("Help: " + myNetwork.NetTitle.GetText(), myNetwork.NetMessage.GetText(), myNetwork.NetTests); NetworkBuilder.cs:1247: LoadNetworkFromResource("firewalls"); NetworkBuilder.cs:1253: LoadNetworkFromResource("firewalls"); +NetworkCard.cs:26: private string _nic_name=""; +NetworkCard.cs:42: nInterface = new NetworkInterface(NicName(), "127.0.0.1", "255.0.0.0", myID); NetworkCard.cs:116: myID.Save(writer, "myid"); +NetworkCard.cs:120: if(EncryptionKey != "") +NetworkCard.cs:122: if (SSID != "") NetworkCard.cs:126: TunnelEndpoint.Save(writer, "tunnelendpoint"); NetworkCard.cs:171: string connected = " "; 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: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:"; NetworkCardEditor.cs:81: lblVPNEnd.Text = "SSID:"; NetworkCardEditor.cs:91: lblVPNEncrypt.Text = "Wireless Key:"; +NetworkCardEditor.cs:145: string btnval = "0.0.0.0"; NetworkCardEditor.cs:166: lblLinkStatus.Text = "Connected"; NetworkCardEditor.cs:168: lblLinkStatus.Text = "Disconnected"; +NetworkCardEditor.cs:192: MyNicToEdit.TunnelEndpoint = new IPAddress(NB.ZeroIPString, "255.255.255.0", IPAddressType.ip_only); NetworkCardEditor.cs:194: MyNicToEdit.TunnelEndpoint.Edit(nd,"Endpoint"); NetworkComponent.cs:18: public bool IsDirty = true; //If something has changed and it needs to be re-drawn. It starts as "true" +NetworkComponent.cs:20: public string hostname = ""; NetworkComponent.cs:88: throw new ArgumentException("The type must be serializable.", "source"); NetworkDevice.cs:295: DefaultGW.Edit(this,"Default Gateway"); NetworkDevice.cs:390: DefaultGW.Save(writer, "gateway"); @@ -110,11 +221,19 @@ NetworkDevice.cs:401: dhcp.Save(writer, "dhcprange"); NetworkDevice.cs:439: answer += "\n" + addr; NetworkDevice.cs:449: answer += "\n" + tString; NetworkDevice.cs:707: MessageBox.Show("The network card," + NICs[index].NicName() + " is locked as part of the puzzle.", "Locked NIC"); +NetworkDevice.cs:720: if (nic.SSID == "") continue; +NetworkDevice.cs:844: tstr = Regex.Replace(name, " .*", ""); NetworkDevice.cs:871: Font stringFont = new Font("Consolas", 17); +NetworkDevice.cs:919: string title = ""; NetworkDevice.cs:921: title += "if: "; NetworkDevice.cs:923: title += nic.NicName() + ": "; +NetworkDevice.cs:961: return new HostNicID(-1, -1, hostname, ""); +NetworkDevice.cs:995: if (dest.GetMask != 0 && dest.GetMask.ToIpString() != "255.255.255.0") +NetworkDevice.cs:1130: Packet DHCPPacket = new Packet(this, "", NB.BroadcastMACString, "DHCP Request", PacketType.dhcp_request); NetworkDevice.cs:1140: Packet PingPacket = new Packet(this,Destination,"Ping",PacketType.ping_request); NetworkDevice.cs:1148: Packet ArpPacket = new Packet(this, Destination, "Arp Request", PacketType.arp_request); +NetworkDevice.cs:1155: public void TunnelPacketFromHere(IPAddress Destination, Packet Payload, string Encryption = "") +NetworkDevice.cs:1164: if (Encryption != "") NetworkDevice.cs:1166: Packet TunnelPacket = new Packet(this, Destination, "Tunnel", TunType); NetworkDevice.cs:1201: //Console.WriteLine(hostname + ": packet=" + tPacket.MyType.ToString()); NetworkDevice.cs:1202: //Console.WriteLine(" " + hostname + ": d:" + ipc.destIP.GetIPString + " s:" + tPacket.sourceIP.GetIPString); @@ -125,27 +244,47 @@ NetworkDevice.cs:1286: Console.WriteLine("Debug"); NetworkDevice.cs:1289: //if we are supposed to route (do-not-route flag not set) or if the packet is "fresh" NetworkDevice.cs:1300: tPacket.AddMessage(DebugLevel.info, hostname + " No route to host: " + tPacket.destIP.GetIPString); NetworkDevice.cs:1301: tPacket.Tracking.Status = hostname + " No route to host: " + tPacket.destIP.GetIPString; +NetworkDevice.cs:1437: if (tPacket.destMAC == "") +NetworkDevice.cs:1441: //The packet was not successfully sent anywhere. DMac = "". This means no host with the specified IP NetworkDevice.cs:1442: tPacket.AddMessage(DebugLevel.info, hostname + " Failed: No such IP on the local network - Arp only searches the local network."); NetworkDevice.cs:1443: tPacket.Tracking.Status = hostname + " Failed: No such IP on the local network."; +NetworkDevice.cs:1448: //The packet was not successfully sent anywhere. DMac = "". This means no host with the specified IP NetworkDevice.cs:1449: tPacket.AddMessage(DebugLevel.info, hostname + " Failed: No such IP."); NetworkDevice.cs:1450: tPacket.Tracking.Status = hostname + " Failed: No such IP."; NetworkDevice.cs:1457: tPacket.AddMessage(DebugLevel.info, hostname + " No local interface to send packet out."); NetworkDevice.cs:1458: tPacket.Tracking.Status = hostname + " No local interface to send packet out"; +NetworkDevice.cs:1534: nPacket = new Packet(this, tPacket.sourceIP, "", PacketType.ping_answer); NetworkDevice.cs:1540: tPacket.Tracking.Status = hostname + ":\tPing success: The ping reached the destination." + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); +NetworkDevice.cs:1573: nPacket.destMAC = ""; +NetworkDevice.cs:1574: nPacket.sourceMAC = ""; NetworkDevice.cs:1581: tPacket.AddMessage(DebugLevel.info, "The broadcast ping reached a destination that was not on the same network"); NetworkDevice.cs:1582: tPacket.Tracking.Status = hostname + ":\t" + "The broadcast ping reached a destination that was not on the same network" + tPacket.sourceIP.GetIP.ToIpString() + " -> " + hostname; NetworkDevice.cs:1594: tPacket.AddMessage(DebugLevel.info, "Success! The ping returned from its destination." + " But some was lost: health=" + tPacket.health.ToString() ); NetworkDevice.cs:1596: tPacket.Tracking.Status = hostname + string.Format(":\tPing partial success: {0}% packet loss. {1} -> {2}", left , tPacket.sourceIP.GetIP.ToIpString(),tPacket.destIP.GetIP.ToIpString()); NetworkDevice.cs:1602: tPacket.Tracking.Status = hostname + ":\tPing success: The ping returned from its destination" + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); NetworkDevice.cs:1617: 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(); +NetworkDevice.cs:1653: if (tstrings.Count > 0 && !Regex.IsMatch(tstrings[0], "127.0.0.1")) +NetworkDevice.cs:1662: nPacket.destMAC = ""; +NetworkDevice.cs:1663: tPacket.sourceMAC = ""; NetworkDevice.cs:1669: tPacket.Tracking.Status = hostname + ":\tArp Request found IP: " + tPacket.sourceIP.GetIPString + " on MAC: "+ nPacket.sourceMAC; NetworkDevice.cs:1687: tPacket.Tracking.Status = hostname + ":\tArp request success: Who Has " + tPacket.sourceIP.GetIP.ToIpString() + " tell " + tPacket.sourceIP.GetIP.ToIpString() + " = " + tPacket.sourceMAC; NetworkDevice.cs:1694: 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(); +NetworkDevice.cs:1732: nPacket.OutboundMAC = ""; +NetworkDevice.cs:1737: string IP = ""; +NetworkDevice.cs:1739: if(IP == "" && nPacket.WhereAmI != null) { NetworkDevice.cs:1743: tPacket.Tracking.Status = hostname + ":\tDHCP Request found Server: " + IP; NetworkDevice.cs:1763: tPacket.Tracking.Status = hostname + ":\tDHCP request/answer. " + tPacket.payloadIP.GetIP.ToIpString(); NetworkDevice.cs:1771: tPacket.AddMessage(DebugLevel.info, "ND_ProcessArrival_PackReturnErr1"); NetworkDevice.cs:1772: string sIP = "?.?.?.?"; NetworkDevice.cs:1775: tPacket.Tracking.Status = hostname + ":\tDHCP Request failed: Arrived at a machine that was not expecting it and was rejected." + sIP + " -> " + tPacket.destIP.GetIP.ToIpString(); +NetworkDevice.cs:1890: string DHCPGW = ""; +NetworkDevice.cs:1899: if(nic.UsesDHCP && nic.CanUseDHCP && DHCPGW == "") +NetworkDevice.cs:1918: if (DHCPGW != "") +NetworkDevice.cs:1926: if((tPacket.OutboundMAC == null || tPacket.OutboundMAC == "") && +NetworkDevice.cs:1928: (tPacket.sourceMAC == "" || tPacket.sourceMAC == null)) +NetworkDevice.cs:1952: if ((tPacket.OutboundMAC == null || tPacket.OutboundMAC == "") && +NetworkDevice.cs:1954: (tPacket.sourceMAC == "" || tPacket.sourceMAC == null)) +NetworkDevice.cs:1960: if (!nic.HasIP(new IPAddress("127.0.0.1").GetIP)) //don't bother pinging on the loopback NetworkDevice.cs:1984: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: DHCP Server does not have gateway set. DHCP server failing" + tPacket.OutboundIP.GetIP.ToIpString()); NetworkDevice.cs:1985: tPacket.Tracking.Status = hostname + " ERROR: DHCP Server does not have gateway set. DHCP server failing"; NetworkDevice.cs:1991: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: No route or local interface for packet. " + tPacket.OutboundIP.GetIP.ToIpString()); @@ -154,6 +293,8 @@ NetworkDevice.cs:2005: tPacket.AddMessage(DebugLevel.info, ho NetworkDevice.cs:2006: tPacket.Tracking.Status = hostname + " No route or local network card for packet."; NetworkDevice.cs:2017: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: No local interface for packet. :" + tPacket.OutboundIP.GetIP.ToIpString()); NetworkDevice.cs:2018: tPacket.Tracking.Status = hostname + " No route or local interface for packet."; +NetworkDevice.cs:2025: if (tPacket.destMAC == "" || tPacket.destMAC == null) //was != broadcast-mac +NetworkDevice.cs:2033: if (tPacket.OutboundMAC == "") NetworkDevice.cs:2195: tPacket.Tracking.Status = hostname + " Failed: no card available to use."; NetworkDevice.cs:2234: tPacket.AddMessage(DebugLevel.debug, hostname + " Packet request fell on deaf ears. This is not a DHCP server."); NetworkDevice.cs:2235: tPacket.Tracking.Status = hostname + " Failed: Not a DHCP Server. Packet Dropped."; @@ -161,11 +302,22 @@ NetworkDevice.cs:2242: tPacket.AddMessage(DebugLevel.debug, h NetworkDevice.cs:2243: tPacket.Tracking.Status = hostname + " This device is not a router. Packet dropped."; NetworkDevice.cs:2252: tPacket.AddMessage(DebugLevel.debug, hostname + " The device had no local IPs. Quietly dropped."); NetworkDevice.cs:2253: tPacket.Tracking.Status = hostname + " Failed: no IPs local to the packet."; +NetworkDevice.cs:2313: return ""; +NetworkDevice.cs:2323: return ""; +NetworkDevice.cs:2333: return new HostNicID(-1,-1,"",""); +NetworkDevice.cs:2342: return new HostNicID(-1, -1, "", ""); +NetworkDevice.cs:2349: if (arp == "") +NetworkDevice.cs:2374: if (found == "") +NetworkDevice.cs:2460: if (ip.GetIP.ToIpString() != "127.0.0.1") NetworkDevice.cs:2464: theStrings.Add("IF:" + ip.GetIP.ToIpString().PadLeft(15) + " Range: " + NetworkDevice.cs:2465: ip.GetMask.ToIpString() + " - " + ip.GetGateway.ToIpString()); +NetworkDevice.cs:2481: if (ip.GetIP.ToIpString() != "127.0.0.1" && InterfaceIP.IsLocal(ip)) NetworkInterface.cs:50: myIP.Save(writer, "myip"); NetworkInterface.cs:59: tstring += " - " + myIP.GetMask.ToIpString(); +NetworkInterface.cs:64: mask = Regex.Replace(mask, "0", ""); NetworkInterface.cs:66: tstring += "/" + count.ToString(); +NetworkInterface.cs:107: tPacket.sourceIP = new IPAddress(myIP.GetIP.ToIpString(), "", IPAddressType.ip_only); //We only want the IP address +NetworkLink.cs:50: if(IsWireless && AccessPoint != null && Client != null && AccessPoint.SSID != null && AccessPoint.SSID != "") NetworkLink.cs:65: MessageBox.Show("The SSID and Key have been updated on the client."); NetworkLink.cs:120: SrcNic.Save(writer, "SrcNic"); NetworkLink.cs:121: DstNic.Save(writer, "DstNic"); @@ -193,6 +345,9 @@ OptionsWindow.cs:44: myToolTip.SetToolTip(lblLevel, "The Level that t OptionsWindow.cs:45: myToolTip.SetToolTip(tbLevel, "The Level that this puzzle is stored in."); OptionsWindow.cs:46: myToolTip.SetToolTip(lblSortOrder, "How this is sorted within the list of puzzles."); OptionsWindow.cs:47: myToolTip.SetToolTip(tbSortOrder, "How this is sorted within the list of puzzles."); +OptionsWindow.cs:78: tbSortOrder.Text = myNet.SortOrder.ToString("00.000"); +OptionsWindow.cs:85: if (what != "") +OptionsWindow.cs:141: NT = new NetTest("", "", NetTestType.NeedsDefaultGW); OptionsWindow.cs:183: lbTests.ContextMenuStrip.Items.Add("Add"); OptionsWindow.cs:185: lbTests.ContextMenuStrip.Items.Add("Edit"); OptionsWindow.cs:187: lbTests.ContextMenuStrip.Items.Add("Delete"); @@ -204,47 +359,59 @@ OptionsWindow.cs:260: lbTags.ContextMenuStrip.Items.Add("Edit OptionsWindow.cs:262: lbTags.ContextMenuStrip.Items.Add("Read"); OptionsWindow.cs:264: lbTags.ContextMenuStrip.Items.Add("Delete"); OptionsWindow.cs:286: tlist.Remove("None"); +OptionsWindow.cs:293: if(value != "" && Choice.Items.Contains(value)) OptionsWindow.cs:302: Done.Text = "Done"; OptionsWindow.cs:311: QuestionForm.Height = Done.Location.Y + Done.Height + 5; //This is too small for the form, it autosizes to "big enough" OptionsWindow.cs:334: newstring = QuickPrompt("Edit Tag", "Tag:", myNet.SuggestedReadings[lbTags.SelectedIndex].ToString()); +OptionsWindow.cs:335: if (newstring != "") +OptionsWindow.cs:349: newstring = QuickPrompt("Edit Tag", "Tag:", ""); +OptionsWindow.cs:350: if (newstring != "") +OptionsWindow.cs:365: tbSortOrder.Text = value.ToString("00.000"); Packet.cs:32: PacketDump(" " + status, DebugPausePoint.packet_kill); +Packet.cs:48: public string payloadData = ""; //Contains the mac-address, or ip-address string, or something else +Packet.cs:49: public string EncryptionString = ""; +Packet.cs:62: public string OutboundMAC = ""; +Packet.cs:63: public string OutboundDestMAC = ""; Packet.cs:109: Tracking.AddMessage(DebugLevel.debug, WhereAmI, "Packet duplicated"); Packet.cs:124: Tracking.AddMessage(DebugLevel.info, start, theType.ToString() + "Packet Created"); -Packet.cs:125: Tracking.AddMessage(DebugLevel.routing, start, " MAC:" + source + " -> " + dest); +Packet.cs:125: Tracking.AddMessage(DebugLevel.routing, start, string.Format(" MAC: {0} -> {1}", source, dest)); Packet.cs:137: Tracking.AddMessage(DebugLevel.info, start, "Packet Created"); -Packet.cs:138: Tracking.AddMessage(DebugLevel.routing, start, " IP:" + source + " -> " + dest); +Packet.cs:138: Tracking.AddMessage(DebugLevel.routing, start, string.Format(" IP: {0} -> {1}", source, dest)); Packet.cs:156: Tracking.AddMessage(DebugLevel.info, start, "Packet Created"); -Packet.cs:157: Tracking.AddMessage(DebugLevel.routing, start, " IP:" + sourceIP.GetIP.ToIpString() + " -> " + dest.GetIP.ToIpString()); +Packet.cs:157: Tracking.AddMessage(DebugLevel.routing, start, string.Format(" IP:{0} -> {1}", sourceIP.GetIP.ToIpString(), dest.GetIP.ToIpString())); Packet.cs:164: Tracking.AddMessage(DebugLevel.info, start, "Packet Created"); Packet.cs:165: //Tracking.AddMessage(DebugLevel.routing, start, " IP:" + sourceIP.GetIP.ToIpString() + " -> " + dest.GetIP.ToIpString()); Packet.cs:226: //The packet is "inside" the device. Packet.cs:229: // Here the packet is just about to exit. Maybe we need to set the "source IP" -Packet.cs:264: Tracking.AddMessage(DebugLevel.info, WhereAmI, "Unable to find a mac address for the IP address: " + dest.GetIP.ToIpString()); -Packet.cs:265: Tracking.Status = WhereAmI.hostname + " Failed: Unable to find a MAC address for the specified IP."; +Packet.cs:254: if (dMAC != "" || destMAC == NB.BroadcastMACString) +Packet.cs:264: Tracking.AddMessage(DebugLevel.info, WhereAmI, string.Format("Unable to find a mac address for the IP address: {0}", dest.GetIP.ToIpString())); +Packet.cs:265: Tracking.Status = string.Format("{0} Failed: Unable to find a MAC address for the specified IP.", WhereAmI.hostname ); Packet.cs:280: AddMessage(DebugLevel.debug, "The packet was dropped because we lost where it was. WhereAmI == null!"); -Packet.cs:281: Tracking.Status = "NO_Host" + " Lost location of packet.."; +Packet.cs:281: Tracking.Status = "NO_Host Lost location of packet.."; Packet.cs:290: //The packet is "inside" the device. Packet.cs:293: // Here the packet is just about to exit. Maybe we need to set the "source IP" Packet.cs:300: AddMessage(DebugLevel.debug, "The packet was dropped because we lost where it was. WhereAmI == null!"); -Packet.cs:301: Tracking.Status = "NO_Host" + " Lost location of packet.."; +Packet.cs:301: Tracking.Status = "NO_Host Lost location of packet.."; Packet.cs:312: AddMessage(DebugLevel.debug, "The packet was dropped because we lost where it was. WhereAmI == null!"); -Packet.cs:313: Tracking.Status = "NO_Host" + " Lost location of packet.."; -Packet.cs:343: Console.WriteLine("Starting on link. SMAC: " + sourceMAC + " DMAC: " + destMAC); +Packet.cs:313: Tracking.Status = "NO_Host Lost location of packet.."; +Packet.cs:337: OutboundMAC = ""; +Packet.cs:343: Console.WriteLine(string.Format("Starting on link. SMAC: {0} DMAC: {1}",sourceMAC,destMAC)); Packet.cs:344: AddMessage(DebugLevel.debug, " Starting on link"); -Packet.cs:369: Tracking.AddMessage(DebugLevel.info, "Packet", "Packet failed to reach any IP. No such IP on network: " + destIP.GetIPString); -Packet.cs:370: Tracking.Status = "Packet failed to reach IP: " + destIP.GetIPString; -Packet.cs:434: Console.WriteLine("Pausing"); -Packet.cs:438: Console.WriteLine(hostname + ": " + MyType.ToString()); -Packet.cs:439: Console.Write(hostname + ": " + position + " PACKET: dstIP:" + dIP); -Packet.cs:440: Console.WriteLine(" dstMAC:" + destMAC); -Packet.cs:441: Console.Write(hostname + ": " + position + " PACKET: srcIP:" + sIP); -Packet.cs:442: Console.WriteLine(" srcMAC:" + sourceMAC); -Packet.cs:443: Console.WriteLine("---"); -Packet.cs:445: AddMessage(DebugLevel.packet, hostname + ": " + position + " PACKET: dstIP:" + dIP + " dstMAC:" + destMAC); -Packet.cs:446: AddMessage(DebugLevel.packet, hostname + ": " + position + " PACKET: srcIP:" + sIP + " srcMAC:" + sourceMAC); -Packet.cs:453: throw new ArgumentException("The type must be serializable.", "source"); +Packet.cs:369: Tracking.AddMessage(DebugLevel.info, "Packet", +Packet.cs:370: string.Format("Packet failed to reach any IP. No such IP on network: {0}", destIP.GetIPString)); +Packet.cs:371: Tracking.Status = string.Format("Packet failed to reach IP: {0}",destIP.GetIPString); +Packet.cs:430: position = Regex.Replace(position, "packet_", ""); +Packet.cs:435: Console.WriteLine("Pausing"); +Packet.cs:439: Console.WriteLine(string.Format("{0}: {1} PACKET: dstIP: {2} destMAC: {3}", hostname, position, dIP, destMAC)); +Packet.cs:440: Console.WriteLine(string.Format("{0}: {1} PACKET: srcIP: {2} srcMAC: {3}", hostname, position, sIP, sourceMAC)); +Packet.cs:441: Console.WriteLine("---"); +Packet.cs:443: AddMessage(DebugLevel.packet, string.Format("{0}: {1} PACKET: dstIP: {2} destMAC: {3}", hostname, position, dIP, destMAC)); +Packet.cs:444: AddMessage(DebugLevel.packet, string.Format("{0}: {1} PACKET: srcIP: {2} srcMAC: {3}", hostname,position,sIP,sourceMAC)); +Packet.cs:451: throw new ArgumentException("The type must be serializable.", "source"); +PacketMessage.cs:34: public string _Status = ""; //Usually "success" or "failed" PacketMessage.cs:47: throw new ArgumentException("The type must be serializable.", "source"); PacketMessage.cs:76: string host = "unknown"; PacketMessage.cs:91: tString = tmessage.HostName + " \t" + tmessage.WhatLevel.ToString() + "\t" + tmessage.Message; PacketMessage.cs:103: tString = time.ToString() + " ms " + Status; +RTFWindow.cs:131: if (tbFind.Text == "") return; //We do nothing if nothing to find. RTFWindow.cs:153: MessageBox.Show("Not found.");