dsr: (fixes #884) Remove broken TxErrorCallback
This commit is contained in:
committed by
Tommaso Pecorella
parent
867d960e3c
commit
bbd24ccdaa
@@ -164,7 +164,6 @@ DsrRouteCache::DsrRouteCache()
|
||||
*/
|
||||
m_ntimer.SetDelay(m_delay);
|
||||
m_ntimer.SetFunction(&DsrRouteCache::PurgeMac, this);
|
||||
m_txErrorCallback = MakeCallback(&DsrRouteCache::ProcessTxError, this);
|
||||
}
|
||||
|
||||
DsrRouteCache::~DsrRouteCache()
|
||||
|
||||
@@ -766,16 +766,6 @@ class DsrRouteCache : public Object
|
||||
*/
|
||||
void DelArpCache(Ptr<ArpCache>);
|
||||
|
||||
/**
|
||||
* \brief Get callback to ProcessTxError, this callback is trying to use the wifi mac tx error
|
||||
* header to notify a link layer drop event, however, it is not fully supported yet
|
||||
* \return The callback to ProcessTxError
|
||||
*/
|
||||
Callback<void, const WifiMacHeader&> GetTxErrorCallback() const
|
||||
{
|
||||
return m_txErrorCallback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle link failure callback
|
||||
* \param cb the callback to be set
|
||||
@@ -912,8 +902,6 @@ class DsrRouteCache : public Object
|
||||
*/
|
||||
Callback<void, Ipv4Address, uint8_t> m_handleLinkFailure; ///< link failure callback
|
||||
|
||||
Callback<void, const WifiMacHeader&> m_txErrorCallback; ///< TX error callback
|
||||
|
||||
Timer m_ntimer; ///< Timer for neighbor's list. Schedule Purge().
|
||||
|
||||
std::vector<Neighbor> m_nb; ///< vector of entries
|
||||
|
||||
@@ -579,8 +579,6 @@ DsrRouting::DoDispose()
|
||||
Ptr<AdhocWifiMac> adhoc = mac->GetObject<AdhocWifiMac>();
|
||||
if (adhoc)
|
||||
{
|
||||
adhoc->TraceDisconnectWithoutContext("TxErrHeader",
|
||||
m_routeCache->GetTxErrorCallback());
|
||||
m_routeCache->DelArpCache(m_ipv4->GetInterface(i)->GetArpCache());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user