From 1cecfe5548e71d4b6ab158f183976a9929e73b25 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 14 May 2008 18:15:26 +0100 Subject: [PATCH] Missing Packet::Copy in Node::ReceiveFromDevice for the multiple protocol handlers scenario. --- src/node/node.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/node/node.cc b/src/node/node.cc index 456e13a95..ef56ec6db 100644 --- a/src/node/node.cc +++ b/src/node/node.cc @@ -186,6 +186,11 @@ Node::ReceiveFromDevice (Ptr device, Ptr packet, uint16_t protocol, const Address &from) { bool found = false; + // if there are (potentially) multiple handlers, we need to copy the + // packet before passing it to each handler, because handlers may + // modify it. + bool copyNeeded = (m_handlers.size () > 1); + for (ProtocolHandlerList::iterator i = m_handlers.begin (); i != m_handlers.end (); i++) { @@ -195,7 +200,7 @@ Node::ReceiveFromDevice (Ptr device, Ptr packet, if (i->protocol == 0 || i->protocol == protocol) { - i->handler (device, packet, protocol, from); + i->handler (device, (copyNeeded ? packet->Copy () : packet), protocol, from); found = true; } }