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

wifi: Add check on length value set in L-SIG

Browse Source
This commit is contained in:
Deronne Sebastien
2019-05-15 12:59:50 +02:00
committed by Sébastien Deronne
parent 0afae8ef34
commit 48ae785d16
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/wifi/model/wifi-phy-header.cc
View File

@@ -293,6 +293,7 @@ LSigHeader::GetRate (uint16_t channelWidth) const
void
LSigHeader::SetLength (uint16_t length)
{
NS_ASSERT_MSG (length < 4096, "Invalid length");
m_length = length;
}

40
src/wifi/model/wifi-phy.cc
View File

@@ -2624,25 +2624,29 @@ WifiPhy::SendPacket (Ptr<const Packet> packet, WifiTxVector txVector)
LSigHeader sig;
if ((txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_OFDM) || (txVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM))
{
sig.SetRate (txVector.GetMode ().GetDataRate (GetChannelWidth ()), GetChannelWidth ());
sig.SetRate (txVector.GetMode ().GetDataRate (txVector), GetChannelWidth ());
sig.SetLength (packet->GetSize ());
}
uint8_t sigExtention = 0;
if (Is2_4Ghz (GetFrequency ()))
{
sigExtention = 6;
}
uint8_t m = 0;
if (txVector.GetPreambleType () == WIFI_PREAMBLE_HE_SU)
{
m = 2;
}
else if (txVector.GetPreambleType () == WIFI_PREAMBLE_HE_MU)
{
m = 1;
}
//Equation 27-11 of IEEE P802.11/D4.0
uint16_t length = ((ceil ((static_cast<double> (txDuration.GetNanoSeconds () - (20 * 1000) - (sigExtention * 1000)) / 1000) / 4.0) * 3) - 3 - m);
sig.SetLength (length);
else //HT, VHT or HE
{
uint8_t sigExtention = 0;
if (Is2_4Ghz (GetFrequency ()))
{
sigExtention = 6;
}
uint8_t m = 0;
if (txVector.GetPreambleType () == WIFI_PREAMBLE_HE_SU)
{
m = 2;
}
else if (txVector.GetPreambleType () == WIFI_PREAMBLE_HE_MU)
{
m = 1;
}
//Equation 27-11 of IEEE P802.11/D4.0
uint16_t length = ((ceil ((static_cast<double> (txDuration.GetNanoSeconds () - (20 * 1000) - (sigExtention * 1000)) / 1000) / 4.0) * 3) - 3 - m);
sig.SetLength (length);
}
newPacket->AddHeader (sig);
}

2
src/wifi/test/wifi-test.cc
View File

@@ -284,7 +284,7 @@ InterferenceHelperSequenceTest::InterferenceHelperSequenceTest ()
void
InterferenceHelperSequenceTest::SendOnePacket (Ptr<WifiNetDevice> dev)
{
Ptr<Packet> p = Create<Packet> (9999);
Ptr<Packet> p = Create<Packet> (1000);
dev->Send (p, dev->GetBroadcast (), 1);
}