Fix address generation in tests

model/isl-mock-channel.cc

@@ -62,6 +62,11 @@ IslMockChannel::TransmitStart (
   NS_LOG_FUNCTION (this << p << srcId << destAddr << txTime);
   NS_LOG_LOGIC ("UID is " << p->GetUid () << ")");
 
+  if (srcId >= GetNDevices ())
+    {
+      NS_LOG_ERROR ("Source device unknown");
+      return false;
+    }
   Ptr<MockNetDevice> src = DynamicCast<MockNetDevice> (GetDevice (srcId));
   Ptr<MockNetDevice> dst = DynamicCast<MockNetDevice> (GetDevice (destAddr));
 

model/leo-mock-channel.cc

@@ -44,6 +44,12 @@ LeoMockChannel::TransmitStart (Ptr<const Packet> p,
   NS_LOG_FUNCTION (this << p << devId << dst << txTime);
 
   // Find devices joined to channel
+  if (devId >= GetNDevices ())
+    {
+      NS_LOG_ERROR ("Source device unknown");
+      return false;
+    }
+
   Ptr<MockNetDevice> srcDev = DynamicCast<MockNetDevice> (GetDevice (devId));
   if (srcDev == 0)
     {

model/mock-channel.cc

@@ -31,8 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("MockChannel");
 NS_OBJECT_ENSURE_REGISTERED (MockChannel);
 
 TypeId
-  MockChannel::GetTypeId (void)
-    {
+MockChannel::GetTypeId (void)
+{
   static TypeId tid = TypeId ("ns3::MockChannel")
     .SetParent<Channel> ()
     .SetGroupName ("Leo")
@@ -54,7 +54,7 @@ TypeId
                      "ns3::MockChannel::TxRxAnimationCallback")
     ;
   return tid;
-    }
+}
 
 //
 // By default, you get a channel that
@@ -65,12 +65,12 @@ MockChannel::MockChannel() : Channel (), m_link (0)
 }
 
 MockChannel::~MockChannel()
-  {
-  }
+{
+}
 
 bool
-  MockChannel::Detach (uint32_t deviceId)
-    {
+MockChannel::Detach (uint32_t deviceId)
+{
   NS_LOG_FUNCTION (this << deviceId);
   if (deviceId < m_link.size ())
     {
@@ -87,34 +87,34 @@ bool
       return false;
     }
   return true;
-    }
+}
 
 int32_t
-  MockChannel::Attach (Ptr<MockNetDevice> device)
-    {
+MockChannel::Attach (Ptr<MockNetDevice> device)
+{
   NS_LOG_FUNCTION (this << device);
   NS_ASSERT (device != 0);
   m_link.push_back(device);
   return  m_link.size() - 1;
-    }
+}
 
 std::size_t
-  MockChannel::GetNDevices (void) const
-    {
+MockChannel::GetNDevices (void) const
+{
   NS_LOG_FUNCTION_NOARGS ();
   return m_link.size ();
-    }
+}
 
 Ptr<NetDevice>
-  MockChannel::GetDevice (std::size_t i) const
-    {
+MockChannel::GetDevice (std::size_t i) const
+{
   NS_LOG_FUNCTION_NOARGS ();
   return m_link[i];
-    }
+}
 
 Time
-  MockChannel::GetPropagationDelay (Ptr<MobilityModel> srcMob, Ptr<MobilityModel> dstMob, Time txTime) const
-    {
+MockChannel::GetPropagationDelay (Ptr<MobilityModel> srcMob, Ptr<MobilityModel> dstMob, Time txTime) const
+{
   NS_LOG_FUNCTION (this << srcMob << dstMob << txTime);
 
   if (GetPropagationDelay ())
@@ -126,12 +126,12 @@ Time
     {
       return Time (0);
     }
-    }
+}
 
 // TODO optimize
 Ptr<MockNetDevice>
-  MockChannel::GetDevice (Address &addr) const
-    {
+MockChannel::GetDevice (Address &addr) const
+{
   for (Ptr<MockNetDevice> dev : m_link)
     {
       if (dev->GetAddress () == addr)
@@ -141,27 +141,27 @@ Ptr<MockNetDevice>
     }
 
   return 0;
-    }
+}
 
 Ptr<PropagationDelayModel>
-  MockChannel::GetPropagationDelay () const
-    {
+MockChannel::GetPropagationDelay () const
+{
   return m_propagationDelay;
-    }
+}
 
 Ptr<PropagationLossModel>
-  MockChannel::GetPropagationLoss () const
-    {
+MockChannel::GetPropagationLoss () const
+{
   return m_propagationLoss;
-    }
+}
 
 bool
-  MockChannel::Deliver (
+MockChannel::Deliver (
     		    Ptr<const Packet> p,
     		    Ptr<MockNetDevice> src,
     		    Ptr<MockNetDevice> dst,
     		    Time txTime)
-    {
+{
   NS_LOG_FUNCTION (this << p << src->GetAddress () << dst->GetAddress () << txTime);
   Time delay = txTime;
 
@@ -191,6 +191,6 @@ bool
   // Call the tx anim callback on the net device
   m_txrxMock (p, src, dst, txTime, delay);
   return true;
-    }
+}
 
 } // namespace ns3

test/isl-mock-channel-test-suite.cc

@@ -22,7 +22,7 @@ private:
 };
 
 IslMockChannelTransmitUnknownTestCase::IslMockChannelTransmitUnknownTestCase ()
-  : TestCase ("Test transmission to unkown destination")
+  : TestCase ("Test transmission to broadcast address")
 {
 }
 
@@ -37,14 +37,13 @@ IslMockChannelTransmitUnknownTestCase::DoRun (void)
   Packet *packet = new Packet ();
   Ptr<Packet> p = Ptr<Packet>(packet);
   Ptr<MockNetDevice> dev = CreateObject<MockNetDevice> ();
+  dev->SetAddress (Mac48Address::Allocate ());
   int32_t srcId = channel->Attach (dev);
-  Address destAddr;
+  Address destAddr = Mac48Address::GetBroadcast ();
   Time txTime;
-  channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
-  channel->SetAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel"));
   bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
 
-  NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown destination fails to deliver");
+  NS_TEST_ASSERT_MSG_EQ (result, true, "Broadcast address delivers to all");
 }
 
 class IslMockChannelTransmitKnownTestCase : public TestCase
@@ -81,6 +80,7 @@ IslMockChannelTransmitKnownTestCase::DoRun (void)
   srcNode->AggregateObject (loc);
   Ptr<MockNetDevice> srcDev = CreateObject<MockNetDevice> ();
   srcDev->SetNode (srcNode);
+  srcDev->SetAddress (Mac48Address::Allocate ());
   int32_t srcId = channel->Attach (srcDev);
 
   Ptr<Node> dstNode = CreateObject<Node> ();
@@ -88,6 +88,7 @@ IslMockChannelTransmitKnownTestCase::DoRun (void)
   dstNode->AggregateObject (loc);
   Ptr<MockNetDevice> dstDev = CreateObject<MockNetDevice> ();
   dstDev->SetNode (dstNode);
+  dstDev->SetAddress (Mac48Address::Allocate ());
   channel->Attach (dstDev);
 
   Address destAddr = dstDev->GetAddress ();

test/leo-mock-channel-test-suite.cc

@@ -36,16 +36,13 @@ LeoMockChannelTransmitUnknownTestCase::DoRun (void)
   Ptr<LeoMockChannel> channel = CreateObject<LeoMockChannel> ();
   Packet *packet = new Packet ();
   Ptr<Packet> p = Ptr<Packet>(packet);
-  Ptr<LeoMockNetDevice> dev = CreateObject<LeoMockNetDevice> ();
-  dev->SetDeviceType (LeoMockNetDevice::GND);
-  int32_t srcId = channel->Attach (dev);
   Address destAddr;
   Time txTime;
   channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
   channel->SetAttribute ("PropagationLoss", StringValue ("ns3::LeoPropagationLossModel"));
-  bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
+  bool result = channel->TransmitStart (p, 10000, destAddr, txTime);
 
-  NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown destination fails to deliver");
+  NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown source fails to deliver");
 }
 
 class LeoMockChannelTransmitKnownTestCase : public TestCase
@@ -78,28 +75,24 @@ LeoMockChannelTransmitKnownTestCase::DoRun (void)
   Ptr<Packet> p = Ptr<Packet>(packet);
 
   Ptr<Node> srcNode = CreateObject<Node> ();
-  Ptr<ConstantPositionMobilityModel> loc = CreateObject<ConstantPositionMobilityModel> ();
-  srcNode->AggregateObject (loc);
   Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
   srcDev->SetNode (srcNode);
-  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::ConstantPositionMobilityModel"));
   srcDev->SetDeviceType (LeoMockNetDevice::GND);
+  srcDev->SetAddress (Mac48Address::Allocate ());
   int32_t srcId = channel->Attach (srcDev);
 
   Ptr<Node> dstNode = CreateObject<Node> ();
-  loc = CreateObject<ConstantPositionMobilityModel> ();
-  dstNode->AggregateObject (loc);
   Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
   dstDev->SetNode (dstNode);
-  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   dstDev->SetDeviceType (LeoMockNetDevice::SAT);
+  dstDev->SetAddress (Mac48Address::Allocate ());
   channel->Attach (dstDev);
 
   Address destAddr = dstDev->GetAddress ();
   Time txTime;
   bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
 
-  NS_TEST_ASSERT_MSG_EQ (result, true, "Known destination delivers");
+  NS_TEST_ASSERT_MSG_EQ (result, true, "Known source delivers");
 }
 
 class LeoMockChannelTransmitSpaceGroundTestCase : public TestCase
@@ -134,15 +127,15 @@ LeoMockChannelTransmitSpaceGroundTestCase::DoRun (void)
   Ptr<Node> srcNode = CreateObject<Node> ();
   Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
   srcDev->SetNode (srcNode);
-  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   srcDev->SetDeviceType (LeoMockNetDevice::SAT);
+  srcDev->SetAddress (Mac48Address::Allocate ());
   int32_t srcId = channel->Attach (srcDev);
 
   Ptr<Node> dstNode = CreateObject<Node> ();
   Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
   dstDev->SetNode (dstNode);
-  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::ConstantPositionMobilityModel"));
   dstDev->SetDeviceType (LeoMockNetDevice::GND);
+  dstDev->SetAddress (Mac48Address::Allocate ());
   channel->Attach (dstDev);
 
   Address destAddr = dstDev->GetAddress ();
@@ -152,56 +145,6 @@ LeoMockChannelTransmitSpaceGroundTestCase::DoRun (void)
   NS_TEST_ASSERT_MSG_EQ (result, true, "Space to ground destination delivers");
 }
 
-class LeoMockChannelTransmitSpaceSpaceTestCase : public TestCase
-{
-public:
-  LeoMockChannelTransmitSpaceSpaceTestCase ();
-  virtual ~LeoMockChannelTransmitSpaceSpaceTestCase ();
-
-private:
-  virtual void DoRun (void);
-};
-
-LeoMockChannelTransmitSpaceSpaceTestCase::LeoMockChannelTransmitSpaceSpaceTestCase ()
-  : TestCase ("Test transmission to known destination")
-{
-}
-
-LeoMockChannelTransmitSpaceSpaceTestCase::~LeoMockChannelTransmitSpaceSpaceTestCase ()
-{
-}
-
-void
-LeoMockChannelTransmitSpaceSpaceTestCase::DoRun (void)
-{
-  Ptr<LeoMockChannel> channel = CreateObject<LeoMockChannel> ();
-  channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
-  channel->SetAttribute ("PropagationLoss", StringValue ("ns3::LeoPropagationLossModel"));
-
-  Packet *packet = new Packet ();
-  Ptr<Packet> p = Ptr<Packet>(packet);
-
-  Ptr<Node> srcNode = CreateObject<Node> ();
-  Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
-  srcDev->SetNode (srcNode);
-  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
-  srcDev->SetDeviceType (LeoMockNetDevice::SAT);
-  int32_t srcId = channel->Attach (srcDev);
-
-  Ptr<Node> dstNode = CreateObject<Node> ();
-  Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
-  dstDev->SetNode (dstNode);
-  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
-  dstDev->SetDeviceType (LeoMockNetDevice::SAT);
-  channel->Attach (dstDev);
-
-  Address destAddr = dstDev->GetAddress ();
-  Time txTime;
-  bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
-
-  NS_TEST_ASSERT_MSG_EQ (result, false, "Space to space gets dropped");
-}
-
 class LeoMockChannelTestSuite : public TestSuite
 {
 public:
@@ -215,7 +158,6 @@ LeoMockChannelTestSuite::LeoMockChannelTestSuite ()
   AddTestCase (new LeoMockChannelTransmitUnknownTestCase, TestCase::QUICK);
   AddTestCase (new LeoMockChannelTransmitKnownTestCase, TestCase::QUICK);
   AddTestCase (new LeoMockChannelTransmitSpaceGroundTestCase, TestCase::QUICK);
-  AddTestCase (new LeoMockChannelTransmitSpaceSpaceTestCase, TestCase::QUICK);
 }
 
 // Do not forget to allocate an instance of this TestSuite