F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fd-net-device: Move setting of m_nodeId to FdNetDevice::SetNode

Browse Source 
m_nodeId was set in FdNetDevice::StartDevice. This commit moves it to
FdNetDevice::SetNode so that is it set whenever node is set.
This commit is contained in:
Hrishikesh Hiraskar
2020-09-26 19:19:03 +00:00
committed by Tom Henderson
parent 18b68ee456
commit fc9f640628
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fd-net-device/model/fd-net-device.cc
View File

@@ -239,13 +239,6 @@ FdNetDevice::StartDevice (void)
NS_LOG_DEBUG ("FdNetDevice::Start(): Failure, invalid file descriptor.");
return;
}
//
// A similar story exists for the node ID. We can't just naively do a
// GetNode ()->GetId () since GetNode is going to give us a Ptr<Node> which
// is reference counted. We need to stash away the node ID for use in the
// read thread.
//
m_nodeId = GetNode ()->GetId ();
m_fdReader = DoCreateFdReader ();
m_fdReader->Start (m_fd, MakeCallback (&FdNetDevice::ReceiveCallback, this));
@@ -786,6 +779,11 @@ void
FdNetDevice::SetNode (Ptr<Node> node)
{
m_node = node;
// Save the node ID for use in the read thread, to avoid having
// to make a call to GetNode ()->GetId () that increments
// Ptr<Node>'s reference count.
m_nodeId = node->GetId ();
}
bool