diff --git a/model/leo-propagation-loss-model.cc b/model/leo-propagation-loss-model.cc index 2aded5c..59810f5 100644 --- a/model/leo-propagation-loss-model.cc +++ b/model/leo-propagation-loss-model.cc @@ -37,6 +37,7 @@ LeoPropagationLossModel::DoCalcRxPower (double txPowerDbm, //Vector bPos = b->GetPosition (); // TODO perform line-earth intersection (ray tracing) + // TODO check angle between satellite and ground-station double rxc = 0;//-m_variable->GetValue (); //NS_LOG_DEBUG ("attenuation coefficient="< p, const Address &dest) { m_phyTxDropTrace (p); } + else + { + NS_LOG_INFO ("[node " << m_node->GetId () << "] send packet on " << m_ifIndex << " to " << dest); + } return result; } @@ -416,6 +420,7 @@ MockNetDevice::Receive (Ptr packet, Ptr senderDevice) } if (packetType != PACKET_OTHERHOST) { + NS_LOG_INFO ("[node " << m_node->GetId () << "] received packet on " << m_ifIndex << " from " << remote << " for " << header.GetDestination ()); m_macRxTrace (originalPacket); m_rxCallback (this, packet, protocol, remote); } diff --git a/test/leo-test-suite.cc b/test/leo-test-suite.cc index ae11df7..4e42311 100644 --- a/test/leo-test-suite.cc +++ b/test/leo-test-suite.cc @@ -79,7 +79,7 @@ LeoTestCase1::DoRun (void) islCh.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel")); islCh.SetDeviceAttribute ("InterframeGap", TimeValue (Seconds (0.001))); //// TODO propagation loss from mobility model - islCh.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::RangePropagationLossModel")); + islCh.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel")); islNet = islCh.Install (satellites); LeoChannelHelper utCh; @@ -91,7 +91,7 @@ LeoTestCase1::DoRun (void) utCh.SetSatDeviceAttribute ("InterframeGap", TimeValue (Seconds (0.001))); utCh.SetGndDeviceAttribute ("InterframeGap", TimeValue (Seconds (0.001))); // TODO propagation loss from mobility model - utCh.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::RangePropagationLossModel")); + utCh.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::LeoPropagationLossModel")); utCh.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel")); utNet = utCh.Install (satellites, terminals); @@ -116,7 +116,7 @@ LeoTestCase1::DoRun (void) // we want to ping terminals UdpEchoServerHelper echoServer (9); - ApplicationContainer serverApps = echoServer.Install (terminals); + ApplicationContainer serverApps = echoServer.Install (terminals.Get (1)); // install a client on one of the terminals ApplicationContainer clientApps;