wifi: (fixes #2763) Fix pcap printing for wifi management frames

This commit is contained in:
Sébastien Deronne
2017-07-17 09:57:44 +02:00
parent 6ef602d818
commit ab1ee5d8d5
3 changed files with 6 additions and 5 deletions

View File

@@ -113,6 +113,7 @@ Bugs fixed
- Bug 2760 - OLSR uses unicast-bound sockets to receive broadcasts
- Bug 2761 - Packet has no Traffic ID for CTS frames when A-MPDU is used
- Bug 2762 - BindToNetDevice behaviour is not coherent with Linux
- Bug 2763 - wifi management packets in the PCAPs are all marked as wrong by Wireshark
Known issues
------------

View File

@@ -585,6 +585,7 @@ ApWifiMac::SendProbeResp (Mac48Address to)
hdr.SetAddr3 (GetAddress ());
hdr.SetDsNotFrom ();
hdr.SetDsNotTo ();
hdr.SetNoOrder ();
Ptr<Packet> packet = Create<Packet> ();
MgtProbeResponseHeader probe;
probe.SetSsid (GetSsid ());
@@ -609,7 +610,6 @@ ApWifiMac::SendProbeResp (Mac48Address to)
{
probe.SetHtCapabilities (GetHtCapabilities ());
probe.SetHtOperation (GetHtOperation ());
hdr.SetNoOrder ();
}
if (m_vhtSupported || m_heSupported)
{
@@ -640,6 +640,7 @@ ApWifiMac::SendAssocResp (Mac48Address to, bool success)
hdr.SetAddr3 (GetAddress ());
hdr.SetDsNotFrom ();
hdr.SetDsNotTo ();
hdr.SetNoOrder ();
Ptr<Packet> packet = Create<Packet> ();
MgtAssocResponseHeader assoc;
StatusCode code;
@@ -667,7 +668,6 @@ ApWifiMac::SendAssocResp (Mac48Address to, bool success)
{
assoc.SetHtCapabilities (GetHtCapabilities ());
assoc.SetHtOperation (GetHtOperation ());
hdr.SetNoOrder ();
}
if (m_vhtSupported || m_heSupported)
{
@@ -698,6 +698,7 @@ ApWifiMac::SendOneBeacon (void)
hdr.SetAddr3 (GetAddress ());
hdr.SetDsNotFrom ();
hdr.SetDsNotTo ();
hdr.SetNoOrder ();
Ptr<Packet> packet = Create<Packet> ();
MgtBeaconHeader beacon;
beacon.SetSsid (GetSsid ());
@@ -722,7 +723,6 @@ ApWifiMac::SendOneBeacon (void)
{
beacon.SetHtCapabilities (GetHtCapabilities ());
beacon.SetHtOperation (GetHtOperation ());
hdr.SetNoOrder ();
}
if (m_vhtSupported || m_heSupported)
{

View File

@@ -164,6 +164,7 @@ StaWifiMac::SendProbeRequest (void)
hdr.SetAddr3 (Mac48Address::GetBroadcast ());
hdr.SetDsNotFrom ();
hdr.SetDsNotTo ();
hdr.SetNoOrder ();
Ptr<Packet> packet = Create<Packet> ();
MgtProbeRequestHeader probe;
probe.SetSsid (GetSsid ());
@@ -171,7 +172,6 @@ StaWifiMac::SendProbeRequest (void)
if (m_htSupported || m_vhtSupported || m_heSupported)
{
probe.SetHtCapabilities (GetHtCapabilities ());
hdr.SetNoOrder ();
}
if (m_vhtSupported || m_heSupported)
{
@@ -208,6 +208,7 @@ StaWifiMac::SendAssociationRequest (void)
hdr.SetAddr3 (GetBssid ());
hdr.SetDsNotFrom ();
hdr.SetDsNotTo ();
hdr.SetNoOrder ();
Ptr<Packet> packet = Create<Packet> ();
MgtAssocRequestHeader assoc;
assoc.SetSsid (GetSsid ());
@@ -216,7 +217,6 @@ StaWifiMac::SendAssociationRequest (void)
if (m_htSupported || m_vhtSupported || m_heSupported)
{
assoc.SetHtCapabilities (GetHtCapabilities ());
hdr.SetNoOrder ();
}
if (m_vhtSupported || m_heSupported)
{