Don't copy&change ns3::point-to-point-helper

I'm sure there was a better way to force RED queues for routers,
but I dont' care because I decided that there is no reason to force RED queues for routers.

So kill dat code, dude.

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index f3ee8d4..dd5eb18 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -538,7 +538,7 @@ void ns3_add_link(int src, int dst, char *bw, char *lat)
     LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
   }
 
-  ns3::MyPointToPointHelper pointToPoint;
+  ns3::PointToPointHelper pointToPoint;
 
   ns3::NetDeviceContainer netA;
   ns3::Ipv4AddressHelper address;

diff --git a/src/surf/ns3/my-point-to-point-helper.cc b/src/surf/ns3/my-point-to-point-helper.cc
index bfee854..1f92ccf 100644 (file)
--- a/src/surf/ns3/my-point-to-point-helper.cc
+++ b/src/surf/ns3/my-point-to-point-helper.cc
@@ -57,7 +57,6 @@ namespace ns3 {
 MyPointToPointHelper::MyPointToPointHelper ()
 {
   m_queueFactory.SetTypeId ("ns3::DropTailQueue");
-  m_queueFactory_red.SetTypeId ("ns3::RedQueue");
   m_deviceFactory.SetTypeId ("ns3::PointToPointNetDevice");
   m_channelFactory.SetTypeId ("ns3::PointToPointChannel");
   m_remoteChannelFactory.SetTypeId ("ns3::PointToPointRemoteChannel");

diff --git a/src/surf/ns3/my-point-to-point-helper.h b/src/surf/ns3/my-point-to-point-helper.h
index e199cee..9a2acf3 100644 (file)
--- a/src/surf/ns3/my-point-to-point-helper.h
+++ b/src/surf/ns3/my-point-to-point-helper.h
@@ -189,7 +189,6 @@ private:
     bool explicitFilename);
 
   ObjectFactory m_queueFactory;
-  ObjectFactory m_queueFactory_red;
   ObjectFactory m_channelFactory;
   ObjectFactory m_remoteChannelFactory;
   ObjectFactory m_deviceFactory;

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 0a030f9..89c10d2 100644 (file)
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -12,18 +12,17 @@
 #include <cstdint>
 
 #include "ns3_interface.h"
-#include "ns3/core-module.h"
-#include "my-point-to-point-helper.h"
-
-#include "ns3/node.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/csma-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/tcp-socket-factory.h"
+#include <ns3/core-module.h>
+
+#include <ns3/node.h>
+#include <ns3/global-route-manager.h>
+#include <ns3/csma-helper.h>
+#include <ns3/internet-stack-helper.h>
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/point-to-point-helper.h>
+#include <ns3/packet-sink-helper.h>
+#include <ns3/inet-socket-address.h>
+#include <ns3/tcp-socket-factory.h>
 
 class SgFlow {
 public: