diff --git a/src/dsr/model/dsr-routing.cc b/src/dsr/model/dsr-routing.cc --- a/src/dsr/model/dsr-routing.cc +++ b/src/dsr/model/dsr-routing.cc @@ -283,6 +283,8 @@ TypeId DsrRouting::GetTypeId () MakeTraceSourceAccessor (&DsrRouting::m_txPacketTrace)) .AddTraceSource ("Drop", "Drop DSR packet", MakeTraceSourceAccessor (&DsrRouting::m_dropTrace)) + .AddTraceSource ("TxDsr", "Send DSR control packet.", + MakeTraceSourceAccessor (&DsrRouting::m_txDsr)) ; return tid; } @@ -1093,6 +1095,8 @@ void DsrRouting::CheckSendBuffer () Ptr dsrNetworkQueue = i->second; NS_LOG_LOGIC ("Will be inserting into priority queue number: " << priority); + m_txDsr(newPacket); + m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route); /// \todo New DsrNetworkQueueEntry @@ -1474,6 +1478,8 @@ DsrRouting::SendUnreachError (Ipv4Addres Ptr dsrNetworkQueue = i->second; NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority); + m_txDsr(newPacket); + m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route); /// \todo New DsrNetworkQueueEntry @@ -1519,6 +1525,8 @@ DsrRouting::ForwardErrPacket (DsrOptionR Ptr dsrNetworkQueue = i->second; NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority); + m_txDsr(packet); + m_downTarget (packet, m_mainAddress, nextHop, GetProtocolNumber (), route); /// \todo New DsrNetworkQueueEntry @@ -2037,6 +2045,8 @@ DsrRouting::SendPacketFromBuffer (DsrOpt Ptr dsrNetworkQueue = i->second; NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority); + m_txDsr(newPacket); + m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route); /// \todo New DsrNetworkQueueEntry @@ -2389,6 +2399,8 @@ DsrRouting::SalvagePacket (Ptr dsrNetworkQueue = i->second; NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority); + m_txPacketTrace (sourceRoute); + m_downTarget (p, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route); /// \todo New DsrNetworkQueueEntry @@ -3226,6 +3238,8 @@ DsrRouting::SendRequest (Ptr pac Ptr dsrNetworkQueue = i->second; NS_LOG_LOGIC ("Inserting into priority queue number: " << priority); + m_txDsr(packet); + m_downTarget (packet, source, m_broadcast, GetProtocolNumber (), 0); /// \todo New DsrNetworkQueueEntry @@ -3332,6 +3346,8 @@ DsrRouting::SendReply (Ptr packe Ptr dsrNetworkQueue = i->second; NS_LOG_INFO ("Inserting into priority queue number: " << priority); + m_txDsr(packet); + m_downTarget (packet, source, nextHop, GetProtocolNumber (), route); /// \todo New DsrNetworkQueueEntry @@ -3409,6 +3425,8 @@ DsrRouting::SendAck (uint16_t ackId, NS_LOG_LOGIC ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority); + m_txDsr(packet); + m_downTarget (packet, m_mainAddress, destination, GetProtocolNumber (), route); /// \todo New DsrNetworkQueueEntry diff --git a/src/dsr/model/dsr-routing.h b/src/dsr/model/dsr-routing.h --- a/src/dsr/model/dsr-routing.h +++ b/src/dsr/model/dsr-routing.h @@ -574,6 +574,7 @@ protected: */ TracedCallback > m_dropTrace; TracedCallback m_txPacketTrace; + TracedCallback > m_txDsr; private: