From a33e7ce7a6c69e110b91dba790b22419d5ac486c Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Fri, 2 Oct 2020 13:27:41 -0700
Subject: [PATCH] point-to-point: (fixes #266, merges !433) Use one channel
 object factory

---
 src/point-to-point/helper/point-to-point-helper.cc | 10 +++-------
 src/point-to-point/helper/point-to-point-helper.h  |  3 ---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/point-to-point/helper/point-to-point-helper.cc b/src/point-to-point/helper/point-to-point-helper.cc
index 9e8f7fc53..9b5c3df8a 100644
--- a/src/point-to-point/helper/point-to-point-helper.cc
+++ b/src/point-to-point/helper/point-to-point-helper.cc
@@ -47,9 +47,6 @@ PointToPointHelper::PointToPointHelper ()
   m_queueFactory.SetTypeId ("ns3::DropTailQueue<Packet>");
   m_deviceFactory.SetTypeId ("ns3::PointToPointNetDevice");
   m_channelFactory.SetTypeId ("ns3::PointToPointChannel");
-#ifdef NS3_MPI
-  m_remoteChannelFactory.SetTypeId ("ns3::PointToPointRemoteChannel");
-#endif
 }
 
 void 
@@ -78,9 +75,6 @@ void
 PointToPointHelper::SetChannelAttribute (std::string n1, const AttributeValue &v1)
 {
   m_channelFactory.Set (n1, v1);
-#ifdef NS3_MPI
-  m_remoteChannelFactory.Set (n1, v1);
-#endif
 }
 
 void 
@@ -273,11 +267,13 @@ PointToPointHelper::Install (Ptr<Node> a, Ptr<Node> b)
     }
   if (useNormalChannel)
     {
+      m_channelFactory.SetTypeId ("ns3::PointToPointChannel");
       channel = m_channelFactory.Create<PointToPointChannel> ();
     }
   else
     {
-      channel = m_remoteChannelFactory.Create<PointToPointRemoteChannel> ();
+      m_channelFactory.SetTypeId ("ns3::PointToPointRemoteChannel");
+      channel = m_channelFactory.Create<PointToPointRemoteChannel> ();
       Ptr<MpiReceiver> mpiRecA = CreateObject<MpiReceiver> ();
       Ptr<MpiReceiver> mpiRecB = CreateObject<MpiReceiver> ();
       mpiRecA->SetReceiveCallback (MakeCallback (&PointToPointNetDevice::Receive, devA));
diff --git a/src/point-to-point/helper/point-to-point-helper.h b/src/point-to-point/helper/point-to-point-helper.h
index a401f665c..052081327 100644
--- a/src/point-to-point/helper/point-to-point-helper.h
+++ b/src/point-to-point/helper/point-to-point-helper.h
@@ -184,9 +184,6 @@ private:
   ObjectFactory m_queueFactory;         //!< Queue Factory
   ObjectFactory m_channelFactory;       //!< Channel Factory
   ObjectFactory m_deviceFactory;        //!< Device Factory
-#ifdef NS3_MPI
-  ObjectFactory m_remoteChannelFactory; //!< Remote Channel Factory
-#endif
 };
 
 } // namespace ns3