From 1b8b0d0949314ec18c4b374c0a6cfb475c57f9b0 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Thu, 19 Nov 2015 13:33:57 -0500 Subject: [PATCH] Changes to toedit --- EduNetworkBuilder/toedit.txt | 52 +++--------------------------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/EduNetworkBuilder/toedit.txt b/EduNetworkBuilder/toedit.txt index 458fd93..075fc37 100644 --- a/EduNetworkBuilder/toedit.txt +++ b/EduNetworkBuilder/toedit.txt @@ -47,19 +47,11 @@ NetworkCard.cs:171: string connected = " "; NetworkCard.cs:172: if (isConnected(true)) connected = "*"; NetworkCard.cs:175: return NicName() + connected + " " + MAC; NetworkCard.cs:197: if (UsesDHCP && CanUseDHCP) DHCPString = "DHCP: "; -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: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:479: nPacket.Tracking.AddMessage(DebugLevel.natting, WhereFrom.hostname, string.Format("NC_ChangeIPStr", nf.myIP.GetIPString)); NetworkCard.cs:504: nPacket.PacketDump(myID.HostName + "-" + _nic_name, DebugPausePoint.packet_out); -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:649: tPacket.Tracking.AddMessage(DebugLevel.natting, nd.hostname, "MASQ: Changing source IP back to: " + oAddress.GetIPString); -NetworkCard.cs:661: tPacket.Tracking.Status = hostname + " The packet was rejected by the firewall.. Dropped."; NetworkCardEditor.cs:81: lblVPNEnd.Text = "SSID:"; -NetworkCardEditor.cs:194: MyNicToEdit.TunnelEndpoint.Edit(nd,"Endpoint"); +NetworkCardEditor.cs:194: MyNicToEdit.TunnelEndpoint.Edit(nd, "NCE_VPNEnd"); NetworkDevice.cs:390: DefaultGW.Save(writer, "gateway"); NetworkDevice.cs:397: ip.Save(writer, "route"); NetworkDevice.cs:401: dhcp.Save(writer, "dhcprange"); @@ -68,43 +60,7 @@ NetworkDevice.cs:449: answer += "\n" + tString; NetworkDevice.cs:921: title += "if: "; NetworkDevice.cs:923: title += nic.NicName() + ": "; NetworkDevice.cs:1286: Console.WriteLine("Debug"); -NetworkDevice.cs:1300: string errString = string.Format("{0} No route to host: {1}", hostname, tPacket.destIP.GetIPString); -NetworkDevice.cs:1443: tPacket.AddMessage(DebugLevel.info, string.Format("{0} Failed: No such IP on the local network - Arp only searches the local network.", hostname)); -NetworkDevice.cs:1444: tPacket.Tracking.Status = string.Format("{0} Failed: No such IP on the local network.", hostname); -NetworkDevice.cs:1450: tPacket.AddMessage(DebugLevel.info, string.Format("{0} Failed: No such IP.",hostname)); -NetworkDevice.cs:1451: tPacket.Tracking.Status = string.Format("{0} Failed: No such IP.", hostname); -NetworkDevice.cs:1458: tPacket.AddMessage(DebugLevel.info, string.Format("{0} No local interface to send packet out.", hostname)); -NetworkDevice.cs:1459: tPacket.Tracking.Status = string.Format("{0} No local interface to send packet out", hostname); -NetworkDevice.cs:1582: tPacket.AddMessage(DebugLevel.info, "The broadcast ping reached a destination that was not on the same network"); -NetworkDevice.cs:1583: 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:1595: tPacket.AddMessage(DebugLevel.info, "Success! The ping returned from its destination." + " But some was lost: health=" + tPacket.health.ToString() ); -NetworkDevice.cs:1597: 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:1603: tPacket.Tracking.Status = hostname + ":\tPing success: The ping returned from its destination" + tPacket.sourceIP.GetIP.ToIpString() + " -> " + tPacket.destIP.GetIP.ToIpString(); -NetworkDevice.cs:1618: 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:1670: tPacket.Tracking.Status = hostname + ":\tArp Request found IP: " + tPacket.sourceIP.GetIPString + " on MAC: "+ nPacket.sourceMAC; -NetworkDevice.cs:1688: tPacket.Tracking.Status = hostname + ":\tArp request success: Who Has " + tPacket.sourceIP.GetIP.ToIpString() + " tell " + tPacket.sourceIP.GetIP.ToIpString() + " = " + tPacket.sourceMAC; -NetworkDevice.cs:1695: 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:1744: tPacket.Tracking.Status = hostname + ":\tDHCP Request found Server: " + IP; -NetworkDevice.cs:1764: tPacket.Tracking.Status = hostname + ":\tDHCP request/answer. " + tPacket.payloadIP.GetIP.ToIpString(); NetworkDevice.cs:1773: string sIP = "?.?.?.?"; -NetworkDevice.cs:1776: 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:1985: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: DHCP Server does not have gateway set. DHCP server failing" + tPacket.OutboundIP.GetIP.ToIpString()); -NetworkDevice.cs:1986: tPacket.Tracking.Status = hostname + " ERROR: DHCP Server does not have gateway set. DHCP server failing"; -NetworkDevice.cs:1992: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: No route or local interface for packet. " + tPacket.OutboundIP.GetIP.ToIpString()); -NetworkDevice.cs:1993: tPacket.Tracking.Status = hostname + " No route or local interface for packet."; -NetworkDevice.cs:2006: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: No local Network Card for packet. :" + tPacket.OutboundIP.GetIP.ToIpString()); -NetworkDevice.cs:2007: tPacket.Tracking.Status = hostname + " No route or local network card for packet."; -NetworkDevice.cs:2018: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: No local interface for packet. :" + tPacket.OutboundIP.GetIP.ToIpString()); -NetworkDevice.cs:2019: tPacket.Tracking.Status = hostname + " No route or local interface for packet."; -NetworkDevice.cs:2196: tPacket.Tracking.Status = hostname + " Failed: no card available to use."; -NetworkDevice.cs:2235: tPacket.AddMessage(DebugLevel.debug, hostname + " Packet request fell on deaf ears. This is not a DHCP server."); -NetworkDevice.cs:2236: tPacket.Tracking.Status = hostname + " Failed: Not a DHCP Server. Packet Dropped."; -NetworkDevice.cs:2243: tPacket.AddMessage(DebugLevel.debug, hostname + " Not a router"); -NetworkDevice.cs:2244: tPacket.Tracking.Status = hostname + " This device is not a router. Packet dropped."; -NetworkDevice.cs:2253: tPacket.AddMessage(DebugLevel.debug, hostname + " The device had no local IPs. Quietly dropped."); -NetworkDevice.cs:2254: tPacket.Tracking.Status = hostname + " Failed: no IPs local to the packet."; -NetworkDevice.cs:2465: theStrings.Add("IF:" + ip.GetIP.ToIpString().PadLeft(15) + " Range: " + -NetworkDevice.cs:2466: ip.GetMask.ToIpString() + " - " + ip.GetGateway.ToIpString()); NetworkInterface.cs:50: myIP.Save(writer, "myip"); NetworkInterface.cs:59: tstring += " - " + myIP.GetMask.ToIpString(); NetworkLink.cs:65: MessageBox.Show("The SSID and Key have been updated on the client."); @@ -115,7 +71,7 @@ NetworkLink.cs:307: tPacket.Tracking.Status = "The packet got cor NetworkLink.cs:314: tPacket.Tracking.AddMessage(DebugLevel.info, this, "The packet tried to use a broken network wire and was corrupted."); NetworkLink.cs:315: tPacket.Tracking.Status = "The packet got corrupted and was dropped."; NetworkLink.cs:333: tPacket.AddMessage(DebugLevel.info, "Oops! We do not have anything at the end of the network wire. This should not happen!"); -NetworkLink.cs:334: tPacket.Tracking.Status = hostname + " Nothing at far end of the wire. This should never happen.."; +NetworkLink.cs:334: tPacket.Tracking.Status = hostname + string.Format(" Nothing at far end of the wire. This should never happen.."); OptionsWindow.cs:31: myToolTip.SetToolTip(tbItemSize, "The size of an item (switch, PC, etc). Default is 100."); OptionsWindow.cs:32: myToolTip.SetToolTip(lblItemSize, "The size of an item (switch, PC, etc). Default is 100."); OptionsWindow.cs:33: myToolTip.SetToolTip(tbMessage, "The message given when the network is loaded. Instructions."); @@ -148,7 +104,7 @@ OptionsWindow.cs:302: Done.Text = "Done"; OptionsWindow.cs:334: newstring = QuickPrompt("Edit Tag", "Tag:", myNet.SuggestedReadings[lbTags.SelectedIndex].ToString()); Packet.cs:32: PacketDump(" " + status, DebugPausePoint.packet_kill); Packet.cs:109: Tracking.AddMessage(DebugLevel.debug, WhereAmI, "Packet duplicated"); -Packet.cs:124: Tracking.AddMessage(DebugLevel.info, start, theType.ToString() + "Packet Created"); +Packet.cs:124: Tracking.AddMessage(DebugLevel.info, start, theType.ToString() + string.Format("Packet Created")); 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, string.Format(" IP: {0} -> {1}", source, dest));