diff --git a/src/wifi/examples/wifi-phy-test.cc b/src/wifi/examples/wifi-phy-test.cc index ff2ccf518d..6992b0d542 100644 --- a/src/wifi/examples/wifi-phy-test.cc +++ b/src/wifi/examples/wifi-phy-test.cc @@ -62,8 +62,8 @@ class PsrExperiment */ void Receive(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); Ptr m_tx; ///< transmit Input m_input; ///< input Output m_output; ///< output @@ -84,8 +84,8 @@ PsrExperiment::Send() void PsrExperiment::Receive(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { m_output.received++; } @@ -194,8 +194,8 @@ class CollisionExperiment */ void Receive(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); Ptr m_txA; ///< transmit A Ptr m_txB; ///< transmit B uint32_t m_flowIdA; ///< flow ID A @@ -231,8 +231,8 @@ CollisionExperiment::SendB() const void CollisionExperiment::Receive(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { FlowIdTag tag; if ((*psdu->begin())->GetPacket()->FindFirstMatchingByteTag(tag)) diff --git a/src/wifi/model/frame-exchange-manager.cc b/src/wifi/model/frame-exchange-manager.cc index ecdc578965..4b94f403fb 100644 --- a/src/wifi/model/frame-exchange-manager.cc +++ b/src/wifi/model/frame-exchange-manager.cc @@ -187,8 +187,8 @@ FrameExchangeManager::ResetPhy() m_phy->SetReceiveOkCallback(MakeNullCallback, RxSignalInfo, - WifiTxVector, - std::vector>()); + const WifiTxVector&, + const std::vector&>()); m_phy->SetReceiveErrorCallback(MakeNullCallback>()); } m_phy = nullptr; @@ -1150,8 +1150,8 @@ FrameExchangeManager::PsduRxError(Ptr psdu) void FrameExchangeManager::Receive(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector perMpduStatus) + const WifiTxVector& txVector, + const std::vector& perMpduStatus) { NS_LOG_FUNCTION( this << psdu << rxSignalInfo << txVector << perMpduStatus.size() diff --git a/src/wifi/model/frame-exchange-manager.h b/src/wifi/model/frame-exchange-manager.h index 25f56292ae..e182da63ec 100644 --- a/src/wifi/model/frame-exchange-manager.h +++ b/src/wifi/model/frame-exchange-manager.h @@ -96,8 +96,8 @@ class FrameExchangeManager : public Object */ void Receive(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector perMpduStatus); + const WifiTxVector& txVector, + const std::vector& perMpduStatus); /** * Information about the MPDU being received. The TXVECTOR is populated upon diff --git a/src/wifi/model/wifi-phy-state-helper.h b/src/wifi/model/wifi-phy-state-helper.h index fc07973e0d..77aa02f081 100644 --- a/src/wifi/model/wifi-phy-state-helper.h +++ b/src/wifi/model/wifi-phy-state-helper.h @@ -44,7 +44,11 @@ struct RxSignalInfo; * arg3: TXVECTOR of PSDU * arg4: vector of per-MPDU status of reception. */ -typedef Callback, RxSignalInfo, WifiTxVector, std::vector> +typedef Callback, + RxSignalInfo, + const WifiTxVector&, + const std::vector&> RxOkCallback; /** * Callback if PSDU unsuccessfuly received diff --git a/src/wifi/test/spectrum-wifi-phy-test.cc b/src/wifi/test/spectrum-wifi-phy-test.cc index 11ed61a2b8..c3d66b2f27 100644 --- a/src/wifi/test/spectrum-wifi-phy-test.cc +++ b/src/wifi/test/spectrum-wifi-phy-test.cc @@ -148,8 +148,8 @@ class SpectrumWifiPhyBasicTest : public TestCase */ void SpectrumWifiPhyRxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Spectrum wifi receive failure function * \param psdu the PSDU @@ -225,8 +225,8 @@ SpectrumWifiPhyBasicTest::SendSignal(Watt_u txPower) void SpectrumWifiPhyBasicTest::SpectrumWifiPhyRxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_count++; @@ -1283,8 +1283,8 @@ class SpectrumWifiPhy80Plus80Test : public TestCase */ void RxSuccessSta(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function for STA @@ -1375,8 +1375,8 @@ SpectrumWifiPhy80Plus80Test::StopInterference() void SpectrumWifiPhy80Plus80Test::RxSuccessSta(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta++; @@ -1667,8 +1667,8 @@ class SpectrumWifiPhyMultipleInterfacesTest : public TestCase void RxSuccess(std::size_t index, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function @@ -1851,8 +1851,8 @@ void SpectrumWifiPhyMultipleInterfacesTest::RxSuccess(std::size_t index, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << index << *psdu << rxSignalInfo << txVector); m_countRxSuccess.at(index)++; diff --git a/src/wifi/test/wifi-non-ht-dup-test.cc b/src/wifi/test/wifi-non-ht-dup-test.cc index df64dc6422..ccfb4341a9 100644 --- a/src/wifi/test/wifi-non-ht-dup-test.cc +++ b/src/wifi/test/wifi-non-ht-dup-test.cc @@ -228,8 +228,8 @@ class TestNonHtDuplicatePhyReception : public TestCase void RxSuccess(std::size_t index, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function @@ -374,8 +374,8 @@ void TestNonHtDuplicatePhyReception::RxSuccess(std::size_t index, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << index << *psdu << rxSignalInfo << txVector); const auto expectedWidth = @@ -664,8 +664,8 @@ class TestMultipleCtsResponsesFromMuRts : public TestCase void RxCtsSuccess(std::size_t phyIndex, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * CTS RX failure function @@ -775,8 +775,8 @@ void TestMultipleCtsResponsesFromMuRts::RxCtsSuccess(std::size_t phyIndex, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << phyIndex << *psdu << rxSignalInfo << txVector); std::vector successfulCtsInfos{}; diff --git a/src/wifi/test/wifi-phy-mu-mimo-test.cc b/src/wifi/test/wifi-phy-mu-mimo-test.cc index 145ed27277..9f974d461f 100644 --- a/src/wifi/test/wifi-phy-mu-mimo-test.cc +++ b/src/wifi/test/wifi-phy-mu-mimo-test.cc @@ -350,8 +350,8 @@ class TestDlMuMimoPhyTransmission : public TestCase */ void RxSuccessSta1(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive success function for STA 2 * \param psdu the PSDU @@ -361,8 +361,8 @@ class TestDlMuMimoPhyTransmission : public TestCase */ void RxSuccessSta2(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive success function for STA 3 * \param psdu the PSDU @@ -372,8 +372,8 @@ class TestDlMuMimoPhyTransmission : public TestCase */ void RxSuccessSta3(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function for STA 1 @@ -569,8 +569,8 @@ TestDlMuMimoPhyTransmission::SendMuPpdu(const std::vector& staInfos) void TestDlMuMimoPhyTransmission::RxSuccessSta1(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta1++; @@ -580,8 +580,8 @@ TestDlMuMimoPhyTransmission::RxSuccessSta1(Ptr psdu, void TestDlMuMimoPhyTransmission::RxSuccessSta2(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta2++; @@ -591,8 +591,8 @@ TestDlMuMimoPhyTransmission::RxSuccessSta2(Ptr psdu, void TestDlMuMimoPhyTransmission::RxSuccessSta3(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta3++; @@ -1216,8 +1216,8 @@ class TestUlMuMimoPhyTransmission : public TestCase */ void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function @@ -1407,8 +1407,8 @@ TestUlMuMimoPhyTransmission::SendHeTbPpdu(uint16_t txStaId, void TestUlMuMimoPhyTransmission::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << psdu->GetAddr2() << RatioToDb(rxSignalInfo.snr) << txVector); NS_TEST_ASSERT_MSG_EQ((RatioToDb(rxSignalInfo.snr) > dB_u{0.0}), true, "Incorrect SNR value"); diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index 195e2d4652..b89dfbbe5c 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -305,8 +305,8 @@ class TestDlOfdmaPhyTransmission : public TestCase */ void RxSuccessSta1(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive success function for STA 2 * \param psdu the PSDU @@ -316,8 +316,8 @@ class TestDlOfdmaPhyTransmission : public TestCase */ void RxSuccessSta2(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive success function for STA 3 * \param psdu the PSDU @@ -327,8 +327,8 @@ class TestDlOfdmaPhyTransmission : public TestCase */ void RxSuccessSta3(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function for STA 1 @@ -563,8 +563,8 @@ TestDlOfdmaPhyTransmission::~TestDlOfdmaPhyTransmission() void TestDlOfdmaPhyTransmission::RxSuccessSta1(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta1++; @@ -574,8 +574,8 @@ TestDlOfdmaPhyTransmission::RxSuccessSta1(Ptr psdu, void TestDlOfdmaPhyTransmission::RxSuccessSta2(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta2++; @@ -585,8 +585,8 @@ TestDlOfdmaPhyTransmission::RxSuccessSta2(Ptr psdu, void TestDlOfdmaPhyTransmission::RxSuccessSta3(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta3++; @@ -1197,8 +1197,8 @@ class TestDlOfdmaPhyPuncturing : public TestCase */ void RxSuccessSta1(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - const std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive success function for STA 2 @@ -1209,8 +1209,8 @@ class TestDlOfdmaPhyPuncturing : public TestCase */ void RxSuccessSta2(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function for STA 1 @@ -1441,8 +1441,8 @@ TestDlOfdmaPhyPuncturing::StopInterference() void TestDlOfdmaPhyPuncturing::RxSuccessSta1(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta1++; @@ -1452,8 +1452,8 @@ TestDlOfdmaPhyPuncturing::RxSuccessSta1(Ptr psdu, void TestDlOfdmaPhyPuncturing::RxSuccessSta2(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccessSta2++; @@ -3108,8 +3108,8 @@ class TestUlOfdmaPhyTransmission : public TestCase */ void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function @@ -3462,8 +3462,8 @@ TestUlOfdmaPhyTransmission::~TestUlOfdmaPhyTransmission() void TestUlOfdmaPhyTransmission::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << psdu->GetAddr2() << rxSignalInfo << txVector); if (psdu->GetAddr2() == Mac48Address("00:00:00:00:00:01")) @@ -4836,8 +4836,8 @@ class TestPhyPaddingExclusion : public TestCase */ void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Receive failure function @@ -4946,8 +4946,8 @@ TestPhyPaddingExclusion::~TestPhyPaddingExclusion() void TestPhyPaddingExclusion::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_LOG_FUNCTION(this << *psdu << psdu->GetAddr2() << rxSignalInfo << txVector); if (psdu->GetAddr2() == Mac48Address("00:00:00:00:00:01")) @@ -5380,8 +5380,8 @@ class TestUlOfdmaPowerControl : public TestCase */ void ReceiveOkCallbackAtAp(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); uint8_t m_bssColor; ///< BSS color @@ -5551,8 +5551,8 @@ TestUlOfdmaPowerControl::SendMuBar(std::vector staIds) void TestUlOfdmaPowerControl::ReceiveOkCallbackAtAp(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector /*statusPerMpdu*/) + const WifiTxVector& txVector, + const std::vector& /*statusPerMpdu*/) { NS_TEST_ASSERT_MSG_EQ(txVector.GetPreambleType(), WIFI_PREAMBLE_HE_TB, "HE TB PPDU expected"); const auto rssi = rxSignalInfo.rssi; diff --git a/src/wifi/test/wifi-phy-reception-test.cc b/src/wifi/test/wifi-phy-reception-test.cc index 5710daaa14..4ccfb2e69d 100644 --- a/src/wifi/test/wifi-phy-reception-test.cc +++ b/src/wifi/test/wifi-phy-reception-test.cc @@ -216,8 +216,8 @@ class TestThresholdPreambleDetectionWithoutFrameCapture : public WifiPhyReceptio */ void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Spectrum wifi receive failure function * \param psdu the PSDU @@ -259,8 +259,8 @@ TestThresholdPreambleDetectionWithoutFrameCapture::CheckRxPacketCount(uint32_t e void TestThresholdPreambleDetectionWithoutFrameCapture::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccess++; @@ -832,8 +832,8 @@ class TestThresholdPreambleDetectionWithFrameCapture : public WifiPhyReceptionTe */ void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Spectrum wifi receive failure function * \param psdu the PSDU @@ -874,8 +874,8 @@ TestThresholdPreambleDetectionWithFrameCapture::CheckRxPacketCount(uint32_t expe void TestThresholdPreambleDetectionWithFrameCapture::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { NS_LOG_FUNCTION(this << *psdu << txVector); m_countRxSuccess++; @@ -1856,8 +1856,8 @@ class TestSimpleFrameCaptureModel : public WifiPhyReceptionTest */ void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * RX dropped function * \param p the packet @@ -1896,8 +1896,8 @@ TestSimpleFrameCaptureModel::TestSimpleFrameCaptureModel() void TestSimpleFrameCaptureModel::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); NS_ASSERT(!psdu->IsAggregate() || psdu->IsSingle()); @@ -2436,8 +2436,8 @@ class TestAmpduReception : public WifiPhyReceptionTest */ void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * RX failure function * \param psdu the PSDU @@ -2540,8 +2540,8 @@ TestAmpduReception::ResetBitmaps() void TestAmpduReception::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); if (statusPerMpdu.empty()) // wait for the whole A-MPDU @@ -4201,8 +4201,8 @@ class TestUnsupportedBandwidthReception : public TestCase */ void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * Function called upon a PSDU received unsuccessfuly @@ -4301,8 +4301,8 @@ TestUnsupportedBandwidthReception::SendPpdu(MHz_u centerFreq, MHz_u bandwidth) void TestUnsupportedBandwidthReception::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_countRxSuccess++; diff --git a/src/wifi/test/wifi-phy-thresholds-test.cc b/src/wifi/test/wifi-phy-thresholds-test.cc index a43e5a13f0..54d713a33d 100644 --- a/src/wifi/test/wifi-phy-thresholds-test.cc +++ b/src/wifi/test/wifi-phy-thresholds-test.cc @@ -78,8 +78,8 @@ class WifiPhyThresholdsTest : public TestCase */ virtual void RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu); + const WifiTxVector& txVector, + const std::vector& statusPerMpdu); /** * PHY receive failure callback function * \param psdu the PSDU @@ -194,8 +194,8 @@ WifiPhyThresholdsTest::SendSignal(Watt_u txPower, bool wifiSignal) void WifiPhyThresholdsTest::RxSuccess(Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector statusPerMpdu) + const WifiTxVector& txVector, + const std::vector& statusPerMpdu) { NS_LOG_FUNCTION(this << *psdu << rxSignalInfo << txVector); m_rxSuccess++; diff --git a/src/wifi/test/wifi-primary-channels-test.cc b/src/wifi/test/wifi-primary-channels-test.cc index 2536f4977b..135de57b99 100644 --- a/src/wifi/test/wifi-primary-channels-test.cc +++ b/src/wifi/test/wifi-primary-channels-test.cc @@ -126,8 +126,8 @@ class WifiPrimaryChannelsTest : public TestCase uint8_t station, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector perMpduStatus); + const WifiTxVector& txVector, + const std::vector& perMpduStatus); /** * Callback invoked when an AP receives an UL PPDU. * @@ -140,8 +140,8 @@ class WifiPrimaryChannelsTest : public TestCase void ReceiveUl(uint8_t bss, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector perMpduStatus); + const WifiTxVector& txVector, + const std::vector& perMpduStatus); /** * Check that all stations associated with an AP. */ @@ -244,8 +244,8 @@ WifiPrimaryChannelsTest::ReceiveDl(uint8_t bss, uint8_t station, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector perMpduStatus) + const WifiTxVector& txVector, + const std::vector& perMpduStatus) { if (psdu->GetNMpdus() == 1) { @@ -279,8 +279,8 @@ void WifiPrimaryChannelsTest::ReceiveUl(uint8_t bss, Ptr psdu, RxSignalInfo rxSignalInfo, - WifiTxVector txVector, - std::vector perMpduStatus) + const WifiTxVector& txVector, + const std::vector& perMpduStatus) { // if the BSS color is zero, this AP might receive the frame sent by another AP. Given that // stations only send TB PPDUs, we ignore this frame if the TX vector is not UL MU.