From 5bd695834012fec4cc8015970be682190883840f Mon Sep 17 00:00:00 2001 From: Tim Young Date: Wed, 18 Nov 2015 15:52:29 -0500 Subject: [PATCH] Add Peter Wilson to the "About" Page --- EduNetworkBuilder/Resources/about.rtf | Bin 953 -> 986 bytes EduNetworkBuilder/toedit.txt | 145 ++++++++++++-------------- 2 files changed, 69 insertions(+), 76 deletions(-) diff --git a/EduNetworkBuilder/Resources/about.rtf b/EduNetworkBuilder/Resources/about.rtf index 40b9993b5f46c6f95b32de232770d5cc8f8a9860..2fbdb581ab35a4fb1a7f67be2d8694f39d602712 100644 GIT binary patch delta 50 zcmdnVev5s=3{FD>Jp(;M10$1(^NS?IGfOfQGE#F26p|_x0#Zv-ixk2$bBgoxHghws GV*&uD`Vh?k delta 22 ecmcb`zLR~z40ba;V?9eVgNX}^HXAXnU;+SG=?7^5 diff --git a/EduNetworkBuilder/toedit.txt b/EduNetworkBuilder/toedit.txt index e43e5a0..e08d325 100644 --- a/EduNetworkBuilder/toedit.txt +++ b/EduNetworkBuilder/toedit.txt @@ -112,7 +112,6 @@ Network.cs:530: if (NC.GetType().ToString() == "EduNetworkBui 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()); @@ -128,7 +127,7 @@ 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:440: MessageBox.Show(String.Format("NB_LoadPuzInfo", str)); NetworkBuilder.cs:449: //Console.WriteLine("Puzzle: " + str + " " + newPuzzle.PuzzleTitle); NetworkBuilder.cs:519: lblStatus.Text = ""; NetworkBuilder.cs:520: selectedButton = ""; @@ -197,10 +196,7 @@ NetworkCard.cs:560: nPacket.Tracking.Status = hostnam 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:"; @@ -220,7 +216,7 @@ NetworkDevice.cs:397: ip.Save(writer, "route"); 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:707: MessageBox.Show(string.Format("The network card, {0} is locked as part of the puzzle.", NICs[index].NicName()), "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); @@ -242,76 +238,73 @@ NetworkDevice.cs:1212: //Console.WriteLine(" " + hostnam NetworkDevice.cs:1268: // Set the "we have processed it" flag 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()); -NetworkDevice.cs:1992: tPacket.Tracking.Status = hostname + " No route or local interface for packet."; -NetworkDevice.cs:2005: tPacket.AddMessage(DebugLevel.info, hostname + " ERROR: No local Network Card for packet. :" + tPacket.OutboundIP.GetIP.ToIpString()); -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."; -NetworkDevice.cs:2242: tPacket.AddMessage(DebugLevel.debug, hostname + " Not a router"); -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)) +NetworkDevice.cs:1300: string errString = string.Format("{0} No route to host: {1}", hostname, tPacket.destIP.GetIPString); +NetworkDevice.cs:1438: if (tPacket.destMAC == "") +NetworkDevice.cs:1442: //The packet was not successfully sent anywhere. DMac = "". This means no host with the specified IP +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:1449: //The packet was not successfully sent anywhere. DMac = "". This means no host with the specified IP +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:1535: nPacket = new Packet(this, tPacket.sourceIP, "", PacketType.ping_answer); +NetworkDevice.cs:1574: nPacket.destMAC = ""; +NetworkDevice.cs:1575: nPacket.sourceMAC = ""; +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:1654: if (tstrings.Count > 0 && !Regex.IsMatch(tstrings[0], "127.0.0.1")) +NetworkDevice.cs:1663: nPacket.destMAC = ""; +NetworkDevice.cs:1664: tPacket.sourceMAC = ""; +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:1733: nPacket.OutboundMAC = ""; +NetworkDevice.cs:1738: string IP = ""; +NetworkDevice.cs:1740: if(IP == "" && nPacket.WhereAmI != null) { +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:1891: string DHCPGW = ""; +NetworkDevice.cs:1900: if(nic.UsesDHCP && nic.CanUseDHCP && DHCPGW == "") +NetworkDevice.cs:1919: if (DHCPGW != "") +NetworkDevice.cs:1927: if((tPacket.OutboundMAC == null || tPacket.OutboundMAC == "") && +NetworkDevice.cs:1929: (tPacket.sourceMAC == "" || tPacket.sourceMAC == null)) +NetworkDevice.cs:1953: if ((tPacket.OutboundMAC == null || tPacket.OutboundMAC == "") && +NetworkDevice.cs:1955: (tPacket.sourceMAC == "" || tPacket.sourceMAC == null)) +NetworkDevice.cs:1961: if (!nic.HasIP(new IPAddress("127.0.0.1").GetIP)) //don't bother pinging on the loopback +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:2026: if (tPacket.destMAC == "" || tPacket.destMAC == null) //was != broadcast-mac +NetworkDevice.cs:2034: if (tPacket.OutboundMAC == "") +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:2314: return ""; +NetworkDevice.cs:2324: return ""; +NetworkDevice.cs:2334: return new HostNicID(-1,-1,"",""); +NetworkDevice.cs:2343: return new HostNicID(-1, -1, "", ""); +NetworkDevice.cs:2350: if (arp == "") +NetworkDevice.cs:2375: if (found == "") +NetworkDevice.cs:2461: if (ip.GetIP.ToIpString() != "127.0.0.1") +NetworkDevice.cs:2465: theStrings.Add("IF:" + ip.GetIP.ToIpString().PadLeft(15) + " Range: " + +NetworkDevice.cs:2466: ip.GetMask.ToIpString() + " - " + ip.GetGateway.ToIpString()); +NetworkDevice.cs:2482: 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", "");