F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lte: fix #13b0ed8d and formatting

Browse Source 
- remove lines of code that were commented out before #13b0ed8d and enabled in #13b0ed8d
- fix formatting in one file that existed before #13b0ed8d
This commit is contained in:
bbojovic
2020-11-07 23:05:18 +01:00
parent 42e8bdcf03
commit c078f2e431
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lte/helper/phy-rx-stats-calculator.cc
View File

@@ -117,7 +117,7 @@ PhyRxStatsCalculator::DlPhyReception (PhyReceptionStatParameters params)
return;
}
}
outFile << Simulator::Now ().GetSeconds () << "\t";
outFile << params.m_timestamp << "\t";
outFile << (uint32_t) params.m_cellId << "\t";
outFile << params.m_imsi << "\t";
@@ -161,7 +161,7 @@ PhyRxStatsCalculator::UlPhyReception (PhyReceptionStatParameters params)
return;
}
}
outFile << Simulator::Now ().GetSeconds () << "\t";
outFile << params.m_timestamp << "\t";
outFile << (uint32_t) params.m_cellId << "\t";
outFile << params.m_imsi << "\t";

5
src/lte/helper/phy-tx-stats-calculator.cc
View File

@@ -105,7 +105,6 @@ PhyTxStatsCalculator::DlPhyTransmission (PhyTransmissionStatParameters params)
return;
}
m_dlTxFirstWrite = false;
//outFile << "% time\tcellId\tIMSI\tRNTI\tlayer\tmcs\tsize\trv\tndi"; // txMode is not available at dl tx side
outFile << "% time\tcellId\tIMSI\tRNTI\tlayer\tmcs\tsize\trv\tndi\tccId";
outFile << std::endl;
}
@@ -118,7 +117,7 @@ PhyTxStatsCalculator::DlPhyTransmission (PhyTransmissionStatParameters params)
return;
}
}
outFile << Simulator::Now ().GetSeconds () << "\t";
outFile << params.m_timestamp << "\t";
outFile << (uint32_t) params.m_cellId << "\t";
outFile << params.m_imsi << "\t";
@@ -162,7 +161,7 @@ PhyTxStatsCalculator::UlPhyTransmission (PhyTransmissionStatParameters params)
return;
}
}
outFile << Simulator::Now ().GetSeconds () << "\t";
outFile << params.m_timestamp << "\t";
outFile << (uint32_t) params.m_cellId << "\t";
outFile << params.m_imsi << "\t";

11
src/lte/test/epc-test-s1u-uplink.cc
View File

@@ -139,12 +139,11 @@ EpsBearerTagUdpClient::GetTypeId (void)
"The time to wait between packets", TimeValue (Seconds (1.0)),
MakeTimeAccessor (&EpsBearerTagUdpClient::m_interval),
MakeTimeChecker ())
.AddAttribute (
"RemoteAddress",
"The destination Ipv4Address of the outbound packets",
Ipv4AddressValue (),
MakeIpv4AddressAccessor (&EpsBearerTagUdpClient::m_peerAddress),
MakeIpv4AddressChecker ())
.AddAttribute ("RemoteAddress",
"The destination Ipv4Address of the outbound packets",
Ipv4AddressValue (),
MakeIpv4AddressAccessor (&EpsBearerTagUdpClient::m_peerAddress),
MakeIpv4AddressChecker ())
.AddAttribute ("RemotePort", "The destination port of the outbound packets",
UintegerValue (100),
MakeUintegerAccessor (&EpsBearerTagUdpClient::m_peerPort),