--- a/src/internet-node/udp-socket.cc	Tue Mar 11 11:35:26 2008 -0700
+++ b/src/internet-node/udp-socket.cc	Tue Mar 11 13:30:12 2008 -0700
@@ -34,10 +34,10 @@
 
 namespace ns3 {
 
-UdpSocket::UdpSocket (Ptr<Node> node, Ptr<UdpL4Protocol> udp)
+UdpSocket::UdpSocket ()
   : m_endPoint (0),
-    m_node (node),
-    m_udp (udp),
+    m_node (0),
+    m_udp (0),
     m_errno (ERROR_NOTERROR),
     m_shutdownSend (false),
     m_shutdownRecv (false),
@@ -69,6 +69,18 @@
   m_udp = 0;
 }
 
+void 
+UdpSocket::SetNode (Ptr<Node> node)
+{
+  m_node = node;
+}
+void 
+UdpSocket::SetUdp (Ptr<UdpL4Protocol> udp)
+{
+  m_udp = udp;
+}
+
+
 enum Socket::SocketErrno
 UdpSocket::GetErrno (void) const
 {
@@ -400,7 +412,7 @@
   Ptr<Node> rxNode = CreateObject<InternetNode> ();
   Ptr<PointToPointNetDevice> rxDev1, rxDev2;
   { // first interface
-    rxDev1 = CreateObjectWith<PointToPointNetDevice> ("Node", rxNode, "Address", Mac48Address::Allocate ());
+    rxDev1 = CreateObject<PointToPointNetDevice> ("Node", rxNode, "Address", Mac48Address::Allocate ());
     rxNode->AddDevice (rxDev1);
     rxDev1->AddQueue(CreateObject<DropTailQueue> ());
     Ptr<Ipv4> ipv4 = rxNode->GetObject<Ipv4> ();
@@ -411,7 +423,7 @@
   }
 
   { // second interface
-    rxDev2 = CreateObjectWith<PointToPointNetDevice> ("Node", rxNode, "Address", Mac48Address::Allocate ());
+    rxDev2 = CreateObject<PointToPointNetDevice> ("Node", rxNode, "Address", Mac48Address::Allocate ());
     rxNode->AddDevice (rxDev2);
     rxDev2->AddQueue(CreateObject<DropTailQueue> ());
     Ptr<Ipv4> ipv4 = rxNode->GetObject<Ipv4> ();
@@ -425,7 +437,7 @@
   Ptr<Node> txNode = CreateObject<InternetNode> ();
   Ptr<PointToPointNetDevice> txDev;
   {
-    txDev = CreateObjectWith<PointToPointNetDevice> ("Node", txNode, "Address", Mac48Address::Allocate ());
+    txDev = CreateObject<PointToPointNetDevice> ("Node", txNode, "Address", Mac48Address::Allocate ());
     txNode->AddDevice (txDev);
     txDev->AddQueue(CreateObject<DropTailQueue> ());
     Ptr<Ipv4> ipv4 = txNode->GetObject<Ipv4> ();