diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs index e70c4f3..c7f9373 100644 --- a/EduNetworkBuilder/NB.cs +++ b/EduNetworkBuilder/NB.cs @@ -90,7 +90,7 @@ namespace EduNetworkBuilder packet_in=4, packet_out=8, packet_duplicate=16, all=63, dump=256, pause=512} public enum TraversalTechnology { gateway, static_route, vlan, ethernet, wireless, firewall, - vpn, vpn_encryption, vpn_decryption, ip_address, masquerade, forward} + vpn, vpn_encryption, vpn_decryption, ip_address, masquerade, forward, arrived} [Serializable] public struct HostNicID //This holds a unique identifier for a network card. Links use this to know what it is connected to diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index a3814e1..7e53498 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -1778,6 +1778,7 @@ namespace EduNetworkBuilder } } } + tPacket.TraversalInformation.AddPath(hostname, TraversalTechnology.arrived); nPacket = new Packet(this, tPacket.sourceIP, "", PacketType.ping_answer, tPacket.packetID); nPacket.OriginalDestIP = tPacket.destIP; nPacket.isFresh = true; //So it starts from here @@ -1846,6 +1847,7 @@ namespace EduNetworkBuilder } else { + tPacket.TraversalInformation.AddPath(hostname, TraversalTechnology.arrived); tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_ProcessArrival_PingReturn1")); tPacket.Tracking.Status = NB.LeftPad(hostname) + " " + string.Format(NB.Translate("ND_ProssArrSuccessStr"), tPacket.sourceIP.GetIP.ToIpString(), tPacket.destIP.GetIP.ToIpString()); tPacket.MyStatus = PacketStatus.finished_ok; @@ -1880,6 +1882,8 @@ namespace EduNetworkBuilder //Console.WriteLine("Tracert: " + tPacket.OrigTTL + " " + tPacket.sourceIP.GetIPString); //Console.WriteLine("Tracert: -- " + tPacket.sourceIP.GetIPString + " " + origStart.GetIPString); //If we had not landed on the actual dest... + tPacket.TraversalInformation.AddPath(hostname, TraversalTechnology.arrived); + tracertmessages.Add(NB.Translate("ND_ProcessArrival_TracertReply") + " " + tPacket.sourceIP.GetIPString); if (tPacket.sourceIP.GetIPString != origStart.GetIPString && ttl < 10)