Merge with ns-3-dev.

2009-11-18 08:57:32 +01:00
parent 4eef9e4fb8 613d7322d4
commit e913a4be32
57 changed files with 5867 additions and 46 deletions
--- a/src/node/socket.cc
+++ b/src/node/socket.cc
@@ -45,7 +45,9 @@ Ptr<Socket>
 Socket::CreateSocket (Ptr<Node> node, TypeId tid)
 {
  Ptr<Socket> s;
+  NS_ASSERT (node != 0);
  Ptr<SocketFactory> socketFactory = node->GetObject<SocketFactory> (tid);
+  NS_ASSERT (socketFactory != 0);
  s = socketFactory->CreateSocket ();
  NS_ASSERT (s != 0);
  return s;