From 9f3318a96ef31415fccbf3e0b914d7367bbafb58 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 11 Aug 2020 11:43:44 +0200 Subject: [PATCH] fixup --- helper/leo-channel-helper.cc | 3 ++- model/mock-net-device.cc | 4 ++-- model/mock-net-device.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/helper/leo-channel-helper.cc b/helper/leo-channel-helper.cc index 78dab68..1f58508 100644 --- a/helper/leo-channel-helper.cc +++ b/helper/leo-channel-helper.cc @@ -13,6 +13,7 @@ #include "../model/leo-mock-net-device.h" #include "../model/leo-starlink-constants.h" #include "../model/leo-telesat-constants.h" +#include "../model/leo-propagation-loss-model.h" namespace ns3 { @@ -330,7 +331,7 @@ LeoChannelHelper::Install (std::vector > &satellites, std::vector channel = m_channelFactory.Create (); - channel->SetPropagationLoss (m_propagationLossFactory.Create ()); + channel->SetPropagationLoss (m_propagationLossFactory.Create ()); NetDeviceContainer container; diff --git a/model/mock-net-device.cc b/model/mock-net-device.cc index 4e11ed0..1a8ff6f 100644 --- a/model/mock-net-device.cc +++ b/model/mock-net-device.cc @@ -759,10 +759,10 @@ MockNetDevice::SupportsSendFrom (void) const } void -MockNetDevice::DoMpiReceive (Ptr p, Ptr senderDevice) +MockNetDevice::DoMpiReceive (Ptr p, Ptr senderDevice, double txPower) { NS_LOG_FUNCTION (this << p); - Receive (p, senderDevice); + Receive (p, senderDevice, txPower); } Address diff --git a/model/mock-net-device.h b/model/mock-net-device.h index 37ca1e3..8f281be 100644 --- a/model/mock-net-device.h +++ b/model/mock-net-device.h @@ -203,7 +203,7 @@ protected: * * \param p Packet received */ - void DoMpiReceive (Ptr p, Ptr sender); + void DoMpiReceive (Ptr p, Ptr sender, double txPower); virtual void DoInitialize (void); virtual void NotifyNewAggregate (void);