--- a/src/laa-wifi-coexistence/test/lbt-txop-test.cc Sat Dec 09 11:46:26 2017 -0800
+++ b/src/laa-wifi-coexistence/test/lbt-txop-test.cc Tue Mar 06 09:05:10 2018 -0800
@@ -239,7 +239,7 @@
Config::SetDefault ("ns3::LteUePhy::TxPower", DoubleValue (phyParams.m_ueTxPower));
Config::SetDefault ("ns3::LteEnbPhy::ImplWith2msDelay", BooleanValue(true));
- if (UDP)
+ if (m_transport == UDP)
{
Config::SetDefault ("ns3::LteEnbRrc::EpsBearerToRlcMapping", EnumValue (LteEnbRrc::RLC_UM_ALWAYS));
}
--- a/src/network/model/node.cc Sat Dec 09 11:46:26 2017 -0800
+++ b/src/network/model/node.cc Tue Mar 06 09:05:10 2018 -0800
@@ -67,7 +67,7 @@
MakeUintegerAccessor (&Node::m_id),
MakeUintegerChecker<uint32_t> ())
.AddAttribute ("SystemId", "The systemId of this node: a unique integer used for parallel simulations.",
- TypeId::ATTR_GET || TypeId::ATTR_SET,
+ TypeId::ATTR_GET | TypeId::ATTR_SET,
UintegerValue (0),
MakeUintegerAccessor (&Node::m_sid),
MakeUintegerChecker<uint32_t> ())
--- a/src/wimax/model/snr-to-block-error-rate-manager.cc Sat Dec 09 11:46:26 2017 -0800
+++ b/src/wimax/model/snr-to-block-error-rate-manager.cc Tue Mar 06 09:05:10 2018 -0800
@@ -26,6 +26,7 @@
#include "ns3/log.h"
#include "ns3/assert.h"
#include <fstream>
+#include <sstream>
namespace ns3 {
@@ -39,7 +40,7 @@
m_recordModulation[i] = new std::vector<SNRToBlockErrorRateRecord*> ();
}
m_activateLoss = false;
- std::strcpy (m_traceFilePath,"DefaultTraces");
+ m_traceFilePath = "DefaultTraces";
}
SNRToBlockErrorRateManager::~SNRToBlockErrorRateManager (void)
@@ -79,25 +80,25 @@
void
SNRToBlockErrorRateManager::LoadTraces (void)
{
- std::ifstream m_ifTraceFile;
+ std::ifstream traceFile;
ClearRecords ();
double snrValue, bitErrorRate, burstErrorRate, sigma2, I1, I2;
for (int i = 0; i < 7; i++)
{
- char traceFile[1024];
- sprintf (traceFile, "%s/modulation%d.txt", m_traceFilePath, i);
+ std::stringstream traceFilePath;
+ traceFilePath << m_traceFilePath << "/modulation" << i << ".txt";
- m_ifTraceFile.open (traceFile, std::ifstream::in);
- if (m_ifTraceFile.good () == false)
+ traceFile.open (traceFilePath.str ().c_str (), std::ifstream::in);
+ if (traceFile.good () == false)
{
- NS_LOG_INFO ("Unable to load " << traceFile << "!! Loading default traces...");
+ NS_LOG_INFO ("Unable to load " << traceFilePath.str () << "!! Loading default traces...");
LoadDefaultTraces ();
return;
}
- while (m_ifTraceFile.good ())
+ while (traceFile.good ())
{
- m_ifTraceFile >> snrValue >> bitErrorRate >> burstErrorRate >> sigma2 >> I1 >> I2;
+ traceFile >> snrValue >> bitErrorRate >> burstErrorRate >> sigma2 >> I1 >> I2;
SNRToBlockErrorRateRecord *record = new SNRToBlockErrorRateRecord (snrValue,
bitErrorRate,
burstErrorRate,
@@ -107,7 +108,7 @@
m_recordModulation[i]->push_back (record);
}
- m_ifTraceFile.close ();
+ traceFile.close ();
}
m_activateLoss = true;
}
@@ -239,23 +240,23 @@
ClearRecords ();
- std::ifstream m_ifTraceFile;
+ std::ifstream traceFile;
for (int i = 0; i < 7; i++)
{
- char traceFile[1024];
- sprintf (traceFile, "%s/Modulation%d.txt", m_traceFilePath, i);
+ std::stringstream traceFilePath;
+ traceFilePath << m_traceFilePath << "/Modulation" << i << ".txt";
- m_ifTraceFile.open (traceFile, std::ifstream::in);
- if (m_ifTraceFile.good () == false)
+ traceFile.open (traceFilePath.str ().c_str (), std::ifstream::in);
+ if (traceFile.good () == false)
{
- NS_LOG_INFO ("Unable to load " << traceFile << "!!Loading default traces...");
+ NS_LOG_INFO ("Unable to load " << traceFilePath.str () << "!!Loading default traces...");
LoadDefaultTraces ();
return;
}
- while (m_ifTraceFile.good ())
+ while (traceFile.good ())
{
- m_ifTraceFile >> snrValue >> bitErrorRate >> burstErrorRate >> sigma2 >> I1 >> I2;
+ traceFile >> snrValue >> bitErrorRate >> burstErrorRate >> sigma2 >> I1 >> I2;
SNRToBlockErrorRateRecord *record = new SNRToBlockErrorRateRecord (snrValue,
bitErrorRate,
burstErrorRate,
@@ -266,7 +267,7 @@
m_recordModulation[i]->push_back (record);
}
- m_ifTraceFile.close ();
+ traceFile.close ();
}
m_activateLoss = true;
}
@@ -274,15 +275,13 @@
void
SNRToBlockErrorRateManager::SetTraceFilePath (char *traceFilePath)
{
- NS_ASSERT_MSG (std::strlen (traceFilePath) < TRACE_FILE_PATH_SIZE,
- "char * traceFilePath too long");
- std::strcpy (m_traceFilePath, traceFilePath);
+ m_traceFilePath = traceFilePath;
}
std::string
SNRToBlockErrorRateManager::GetTraceFilePath (void)
{
- return (std::string (m_traceFilePath));
+ return m_traceFilePath;
}
double
--- a/src/wimax/model/snr-to-block-error-rate-manager.h Sat Dec 09 11:46:26 2017 -0800
+++ b/src/wimax/model/snr-to-block-error-rate-manager.h Tue Mar 06 09:05:10 2018 -0800
@@ -102,8 +102,7 @@
private:
void ClearRecords (void);
uint8_t m_activateLoss;
- static const unsigned int TRACE_FILE_PATH_SIZE = 1024;
- char m_traceFilePath[TRACE_FILE_PATH_SIZE];
+ std::string m_traceFilePath;
std::vector<SNRToBlockErrorRateRecord *> * m_recordModulation[7];
--- a/src/wimax/model/ss-net-device.cc Sat Dec 09 11:46:26 2017 -0800
+++ b/src/wimax/model/ss-net-device.cc Tue Mar 06 09:05:10 2018 -0800
@@ -923,7 +923,7 @@
// intended for base station, ignore
break;
case ManagementMessageType::MESSAGE_TYPE_RNG_RSP:
- NS_ASSERT_MSG (SS_STATE_WAITING_RNG_RSP,
+ NS_ASSERT_MSG (GetState () == SS_STATE_WAITING_RNG_RSP,
"SS: Error while receiving a ranging response message: SS state should be SS_STATE_WAITING_RNG_RSP");
packet->RemoveHeader (rngrsp);
m_linkManager->PerformRanging (cid, rngrsp);
@@ -942,7 +942,7 @@
// intended for base station, ignore
break;
case ManagementMessageType::MESSAGE_TYPE_RNG_RSP:
- NS_ASSERT_MSG (SS_STATE_WAITING_RNG_RSP,
+ NS_ASSERT_MSG (GetState () == SS_STATE_WAITING_RNG_RSP,
"SS: Error while receiving a ranging response message: SS state should be SS_STATE_WAITING_RNG_RSP");
packet->RemoveHeader (rngrsp);
m_linkManager->PerformRanging (cid, rngrsp);