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

Backed out changeset ae9f7d5e2d56

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2008-07-07 10:26:00 +01:00
parent ab714db3a9
commit 95be482f24
5 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/node/node.cc
View File

@@ -96,10 +96,7 @@ Node::AddDevice (Ptr<NetDevice> device)
device->SetNode (this);
device->SetIfIndex(index);
device->SetReceiveCallback (MakeCallback (&Node::ReceiveFromDevice, this));
if (device->SupportsPromiscuousReceiveCallback ())
{
device->SetPromiscuousReceiveCallback (MakeCallback (&Node::PromiscuousReceiveFromDevice, this));
}
device->SetPromiscuousReceiveCallback (MakeCallback (&Node::PromiscuousReceiveFromDevice, this));
NotifyDeviceAdded (device);
return index;
}
@@ -194,10 +191,6 @@ Node::RegisterPromiscuousProtocolHandler (PromiscuousProtocolHandler handler,
entry.handler = handler;
entry.protocol = protocolType;
entry.device = device;
if (device)
{
NS_ASSERT (device->SupportsPromiscuousReceiveCallback ());
}
m_promiscuousHandlers.push_back (entry);
}