fixup: multiple devices per channel

examples/isl-example.cc

@@ -21,11 +21,10 @@ main (int argc, char *argv[])
   Time::SetResolution (Time::NS);
   LogComponentEnable ("UdpEchoClientApplication", LOG_LEVEL_INFO);
   LogComponentEnable ("UdpEchoServerApplication", LOG_LEVEL_INFO);
-  LogComponentEnable ("UdpClient", LOG_LEVEL_DEBUG);
-  LogComponentEnable ("IslChannel", LOG_LEVEL_LOGIC);
+  LogComponentEnable ("UdpClient", LOG_LEVEL_INFO);
 
   NodeContainer nodes;
-  nodes.Create (2);
+  nodes.Create (300);
 
   IslHelper isl;
   isl.SetDeviceAttribute ("DataRate", StringValue ("5Gbps"));
@@ -45,19 +44,22 @@ main (int argc, char *argv[])
 
   UdpEchoServerHelper echoServer (9);
 
-  ApplicationContainer serverApps = echoServer.Install (nodes.Get (1));
-  serverApps.Start (Seconds (1.0));
-  serverApps.Stop (Seconds (10.0));
+  for (uint32_t i = 1; i < nodes.GetN (); i++)
+  {
+    ApplicationContainer serverApps = echoServer.Install (nodes.Get (i));
+    serverApps.Start (Seconds (1.0));
+    serverApps.Stop (Seconds (10.0));
 
-  Address destAddress = interfaces.GetAddress (1, 0);
-  UdpEchoClientHelper echoClient (destAddress, 9);
-  echoClient.SetAttribute ("MaxPackets", UintegerValue (10));
-  echoClient.SetAttribute ("Interval", TimeValue (Seconds (1.0)));
-  echoClient.SetAttribute ("PacketSize", UintegerValue (1024));
+    Address destAddress = interfaces.GetAddress (i, 0);
+    UdpEchoClientHelper echoClient (destAddress, 9);
+    echoClient.SetAttribute ("MaxPackets", UintegerValue (10));
+    echoClient.SetAttribute ("Interval", TimeValue (Seconds (1.0)));
+    echoClient.SetAttribute ("PacketSize", UintegerValue (1024));
 
-  ApplicationContainer clientApps = echoClient.Install (nodes.Get (0));
-  clientApps.Start (Seconds (2.0));
-  clientApps.Stop (Seconds (10.0));
+    ApplicationContainer clientApps = echoClient.Install (nodes.Get (0));
+    clientApps.Start (Seconds (2.0));
+    clientApps.Stop (Seconds (10.0));
+  }
 
   Simulator::Run ();
   Simulator::Destroy ();

helper/leo-helper.cc

@@ -8,4 +8,3 @@ namespace ns3 {
 
 
 }
-

helper/leo-helper.h

@@ -11,4 +11,3 @@ namespace ns3 {
 }
 
 #endif /* LEO_HELPER_H */
-

model/isl-channel.cc

@@ -127,7 +127,8 @@ bool IslChannel::Deliver (
         delay,
         &IslNetDevice::Receive,
         dst,
-        p->Copy ());
+        p->Copy (),
+        src);
 
     // Call the tx anim callback on the net device
     m_txrxIsl (p, src, dst, txTime, delay);

model/isl-net-device.cc

@@ -368,7 +368,7 @@ IslNetDevice::SetReceiveErrorModel (Ptr<ErrorModel> em)
 }
 
 void
-IslNetDevice::Receive (Ptr<Packet> packet)
+IslNetDevice::Receive (Ptr<Packet> packet, Ptr<IslNetDevice> senderDevice)
 {
   NS_LOG_FUNCTION (this << packet);
   uint16_t protocol = 0;
@@ -406,14 +406,15 @@ IslNetDevice::Receive (Ptr<Packet> packet)
       //
       ProcessHeader (packet, protocol);
 
+      Address remote = GetRemote (senderDevice);
       if (!m_promiscCallback.IsNull ())
         {
           m_macPromiscRxTrace (originalPacket);
-          m_promiscCallback (this, packet, protocol, GetRemote (), GetAddress (), NetDevice::PACKET_HOST);
+          m_promiscCallback (this, packet, protocol, remote, GetAddress (), NetDevice::PACKET_HOST);
         }
 
       m_macRxTrace (originalPacket);
-      m_rxCallback (this, packet, protocol, GetRemote ());
+      m_rxCallback (this, packet, protocol, remote);
     }
 }
 
@@ -653,28 +654,17 @@ IslNetDevice::SupportsSendFrom (void) const
 }
 
 void
-IslNetDevice::DoMpiReceive (Ptr<Packet> p)
+IslNetDevice::DoMpiReceive (Ptr<Packet> p, Ptr<IslNetDevice> senderDevice)
 {
   NS_LOG_FUNCTION (this << p);
-  Receive (p);
+  Receive (p, senderDevice);
 }
 
 Address
-IslNetDevice::GetRemote (void) const
+IslNetDevice::GetRemote (Ptr<IslNetDevice> senderDevice) const
 {
   NS_LOG_FUNCTION (this);
-  NS_ASSERT (m_channel->GetNDevices () == 2);
-  for (std::size_t i = 0; i < m_channel->GetNDevices (); ++i)
-    {
-      Ptr<NetDevice> tmp = m_channel->GetDevice (i);
-      if (tmp != this)
-        {
-          return tmp->GetAddress ();
-        }
-    }
-  NS_ASSERT (false);
-  // quiet compiler.
-  return Address ();
+  return senderDevice->GetAddress ();
 }
 
 bool

model/isl-net-device.h

@@ -150,7 +150,7 @@ public:
    *
    * \param p Ptr to the received packet.
    */
-  void Receive (Ptr<Packet> p);
+  void Receive (Ptr<Packet> p, Ptr<IslNetDevice> senderDevice);
 
   // The remaining methods are documented in ns3::NetDevice*
 
@@ -205,7 +205,7 @@ protected:
    *
    * \param p Packet received
    */
-  void DoMpiReceive (Ptr<Packet> p);
+  void DoMpiReceive (Ptr<Packet> p, Ptr<IslNetDevice> sender);
 
   virtual void DoInitialize (void);
   virtual void NotifyNewAggregate (void);
@@ -242,7 +242,7 @@ private:
    * \returns the address of the remote device connected to this device
    * through the point to point channel.
    */
-  Address GetRemote (void) const;
+  Address GetRemote (Ptr<IslNetDevice> senderDevice) const;
 
   /**
    * Adds the necessary headers and trailers to a packet of data in order to