Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove Packet Info Tag test dependence on CsmaNetDevice
authorTom Henderson <tomh@tomh.org>
Fri, 28 Jan 2011 12:09:55 -0800
changeset 6791 dc188333c244
parent 6790 351ac1db0e15
child 6792 8a12cd35f198
remove Packet Info Tag test dependence on CsmaNetDevice
src/node/ipv4-packet-info-tag.cc file | annotate | diff | comparison | revisions
src/node/ipv6-packet-info-tag.cc file | annotate | diff | comparison | revisions 
--- a/src/node/ipv4-packet-info-tag.cc	Thu Jan 27 10:58:44 2011 -0800
+++ b/src/node/ipv4-packet-info-tag.cc	Fri Jan 28 12:09:55 2011 -0800
@@ -146,8 +146,7 @@
 #include "ns3/log.h"
 #include "ns3/abort.h"
 #include "ns3/attribute.h"
-#include "ns3/object-factory.h"
-#include "ns3/csma-net-device.h"
+#include "ns3/simple-net-device.h"
 #include "ns3/object-factory.h"
 #include "ns3/socket-factory.h"
 #include "ns3/udp-socket-factory.h"
@@ -163,6 +162,7 @@
 #include "ns3/udp-l4-protocol.h"
 #include "ns3/tcp-l4-protocol.h"
 #include "ns3/simulator.h"
+#include "ns3/node.h"
 
 namespace ns3 {
 
@@ -241,8 +241,8 @@
   Ptr<Node> node0 = CreateObject<Node> ();
   Ptr<Node> node1 = CreateObject<Node> ();
 
-  Ptr<CsmaNetDevice> device = CreateObject<CsmaNetDevice> ();
-  Ptr<CsmaNetDevice> device2 = CreateObject<CsmaNetDevice> ();
+  Ptr<SimpleNetDevice> device = CreateObject<SimpleNetDevice> ();
+  Ptr<SimpleNetDevice> device2 = CreateObject<SimpleNetDevice> ();
 
   // For Node 0
   node0->AddDevice (device);
@@ -281,7 +281,6 @@
                                   &Ipv4PacketInfoTagTest::DoSendData, this, socket, "127.0.0.1");
   Simulator::Run ();
 
-  // send from node1 and recved via csma
   Ptr<SocketFactory> factory2 = node1->GetObject<SocketFactory> (UdpSocketFactory::GetTypeId ());
   Ptr<Socket> socket2 = factory2->CreateSocket ();
   Simulator::ScheduleWithContext (socket2->GetNode ()->GetId (), Seconds (0),
@@ -301,7 +300,6 @@
                                   &Ipv4PacketInfoTagTest::DoSendData, this, socket, "127.0.0.1");
   Simulator::Run ();
 
-  // send from node1 and recved via csma
   factory2 = node1->GetObject<SocketFactory> (Ipv4RawSocketFactory::GetTypeId ());
   socket2 = factory2->CreateSocket ();
   Simulator::ScheduleWithContext (socket2->GetNode ()->GetId (), Seconds (0),
--- a/src/node/ipv6-packet-info-tag.cc	Thu Jan 27 10:58:44 2011 -0800
+++ b/src/node/ipv6-packet-info-tag.cc	Fri Jan 28 12:09:55 2011 -0800
@@ -144,7 +144,7 @@
 #include "ns3/log.h"
 #include "ns3/abort.h"
 #include "ns3/attribute.h"
-#include "ns3/csma-net-device.h"
+#include "ns3/simple-net-device.h"
 #include "ns3/object-factory.h"
 #include "ns3/socket-factory.h"
 #include "ns3/udp-socket-factory.h"
@@ -159,6 +159,7 @@
 #include "ns3/simulator.h"
 #include "ns3/uinteger.h"
 #include "ns3/boolean.h"
+#include "ns3/node.h"
 
 namespace ns3 {
 
@@ -237,8 +238,8 @@
   Ptr<Node> node0 = CreateObject<Node> ();
   Ptr<Node> node1 = CreateObject<Node> ();
 
-  Ptr<CsmaNetDevice> device = CreateObject<CsmaNetDevice> ();
-  Ptr<CsmaNetDevice> device2 = CreateObject<CsmaNetDevice> ();
+  Ptr<SimpleNetDevice> device = CreateObject<SimpleNetDevice> ();
+  Ptr<SimpleNetDevice> device2 = CreateObject<SimpleNetDevice> ();
 
   // For Node 0
   node0->AddDevice (device);
@@ -278,7 +279,6 @@
                                   &Ipv6PacketInfoTagTest::DoSendData, this, socket, "::1");
   Simulator::Run ();
 
-  // send from node1 and recved via csma
   Ptr<SocketFactory> factory2 = node1->GetObject<SocketFactory> (Ipv6RawSocketFactory::GetTypeId ());
   Ptr<Socket> socket2 = factory2->CreateSocket ();
   std::stringstream dst;
@@ -302,7 +302,6 @@
                                   &Ipv6PacketInfoTagTest::DoSendData, this, socket, "::1");
   Simulator::Run ();
 
-  // send from node1 and recved via csma
   factory2 = node1->GetObject<SocketFactory> (UdpSocketFactory::GetTypeId ());
   socket2 = factory2->CreateSocket ();
   Simulator::ScheduleWithContext (socket2->GetNode ()->GetId (), Seconds (0),
ns-3.24