--- a/src/node/node.cc	Wed Mar 12 11:35:00 2008 -0700
+++ b/src/node/node.cc	Thu Mar 13 11:10:38 2008 -0700
@@ -96,6 +96,7 @@
 {
   uint32_t index = m_devices.size ();
   m_devices.push_back (device);
+  device->SetNode (this);
   device->SetIfIndex(index);
   device->SetReceiveCallback (MakeCallback (&Node::ReceiveFromDevice, this));
   NotifyDeviceAdded (device);
@@ -117,6 +118,7 @@
 {
   uint32_t index = m_applications.size ();
   m_applications.push_back (application);
+  application->SetNode (this);
   return index;
 }
 Ptr<Application>