Attachment #2470 for bug #2222

View | Details | Raw Unified | Return to bug 2222
Collapse All | Expand All




  return packet;
}

Ptr<const Packet>
BlockAckManager::PeekNextPacket (WifiMacHeader &hdr)
{
  NS_LOG_FUNCTION (this << &hdr);
  Ptr<const Packet> packet = 0;
  uint8_t tid;
  Mac48Address recipient;
  CleanupBuffers ();
  if (!m_retryPackets.empty ())
    {
      NS_LOG_DEBUG ("Retry buffer size is " << m_retryPackets.size ());
      std::list<PacketQueueI>::iterator it = m_retryPackets.begin ();
      while (it != m_retryPackets.end ())
        {
          if ((*it)->hdr.IsQosData ())
            {
              tid = (*it)->hdr.GetQosTid ();
            }
          else
            {
              NS_FATAL_ERROR ("Packet in blockAck manager retry queue is not Qos Data");
            }
          recipient = (*it)->hdr.GetAddr1 ();
          AgreementsI agreement = m_agreements.find (std::make_pair (recipient, tid));
          NS_ASSERT (agreement != m_agreements.end ());
          packet = (*it)->packet->Copy ();
          hdr = (*it)->hdr;
          hdr.SetRetry ();
          if (hdr.IsQosData ())
            {
              tid = hdr.GetQosTid ();
            }
          else
            {
              NS_FATAL_ERROR ("Packet in blockAck manager retry queue is not Qos Data");
            }
          recipient = hdr.GetAddr1 ();
          if (!agreement->second.first.IsHtSupported ()
              && (ExistsAgreementInState (recipient, tid, OriginatorBlockAckAgreement::ESTABLISHED)
                  || SwitchToBlockAckIfNeeded (recipient, tid, hdr.GetSequenceNumber ())))
            {
              hdr.SetQosAckPolicy (WifiMacHeader::BLOCK_ACK);
            }
          else
            {
              /* From section 9.10.3 in IEEE802.11e standard:
               * In order to improve efficiency, originators using the Block Ack facility
               * may send MPDU frames with the Ack Policy subfield in QoS control frames
               * set to Normal Ack if only a few MPDUs are available for transmission.[...]
               * When there are sufficient number of MPDUs, the originator may switch back to
               * the use of Block Ack.
               */
              hdr.SetQosAckPolicy (WifiMacHeader::NORMAL_ACK);
            }
          break;
        }
    }
  return packet;
}

Ptr<const Packet>
BlockAckManager::PeekNextPacketByTidAndAddress (WifiMacHeader &hdr, Mac48Address recipient, uint8_t tid, Time *tstamp)
{
  NS_LOG_FUNCTION (this);
  Ptr<const Packet> packet = 0;

(-)a/src/wifi/model/block-ack-manager.h (-2 / +13 lines)

Lines 152-157	Link Here

152

   * corresponding block ack bitmap.

152

   * corresponding block ack bitmap.

153

*/

153

*/

154

  Ptr<const Packet> GetNextPacket (WifiMacHeader &hdr);

154

  Ptr<const Packet> GetNextPacket (WifiMacHeader &hdr);

155

/**

156

   * \param hdr 802.11 header of returned packet (if exists).

157

158

   * \return the packet

159

160

   * This methods returns a packet (if exists) indicated as not received in

161

   * corresponding block ack bitmap. This method doesn't remove the packet from this queue.

162

*/

163

  Ptr<const Packet> PeekNextPacket (WifiMacHeader &hdr);

155

  bool HasBar (struct Bar &bar);

164

  bool HasBar (struct Bar &bar);

156

/**

165

/**

157

   * Returns true if there are packets that need of retransmission or at least a

166

   * Returns true if there are packets that need of retransmission or at least a

Lines 320-328	Link Here

320

*/

329

*/

321

  bool RemovePacket (uint8_t tid, Mac48Address recipient, uint16_t seqnumber);

330

  bool RemovePacket (uint8_t tid, Mac48Address recipient, uint16_t seqnumber);

322

/*

331

/*

323

   * Peek in retransmit queue and get the next packet without removing it from the queue

332

   * Peek in retransmit queue and get the next packet having address indicated

333

   * by <i>type</i> equals to <i>addr</i>, and tid equals to <i>tid</i>.

334

   * This method doesn't remove the packet from this queue.

324

*/

335

*/

325

  Ptr<const Packet> PeekNextPacket (WifiMacHeader &hdr, Mac48Address recipient, uint8_t tid, Time *timestamp);

336

  Ptr<const Packet> PeekNextPacketByTidAndAddress (WifiMacHeader &hdr, Mac48Address recipient, uint8_t tid, Time *timestamp);

326

/**

337

/**

327

   * This function returns true if the lifetime of the packets a BAR refers to didn't expire yet else it returns false.

338

   * This function returns true if the lifetime of the packets a BAR refers to didn't expire yet else it returns false.

328

   * If it return false then the BAR will be discarded (i.e. will not be re-transmitted)

339

   * If it return false then the BAR will be discarded (i.e. will not be re-transmitted)




    m_msduAggregator (0),
    m_mpduAggregator (0),
    m_typeOfStation (STA),
    m_blockAckType (COMPRESSED_BLOCK_ACK),
    m_isAccessRequestedForRts (false)
{
  NS_LOG_FUNCTION (this);
  m_transmissionListener = new EdcaTxopN::TransmissionListener (this);

Ptr<const Packet>
EdcaTxopN::PeekNextRetransmitPacket (WifiMacHeader &header,Mac48Address recipient, uint8_t tid, Time *timestamp)
{
  return m_baManager->PeekNextPacketByTidAndAddress (header,recipient,tid, timestamp);
}

void

EdcaTxopN::NotifyAccessGranted (void)
{
  NS_LOG_FUNCTION (this);
  m_isAccessRequestedForRts = false;
  if (m_currentPacket == 0)
    {
      if (m_queue->IsEmpty () && !m_baManager->HasPackets ())

void EdcaTxopN::NotifyInternalCollision (void)
{
  NS_LOG_FUNCTION (this);
  bool resetDcf = false;
  if (m_isAccessRequestedForRts)
    {
      if (!NeedRtsRetransmission ())
      {
        resetDcf = true;
        m_stationManager->ReportFinalRtsFailed (m_currentHdr.GetAddr1 (), &m_currentHdr);
      }
      else
      {
        m_stationManager->ReportRtsFailed (m_currentHdr.GetAddr1 (), &m_currentHdr);
      }
    }
  else
    {
      if (!NeedDataRetransmission ())
      {
        resetDcf = true;
        m_stationManager->ReportFinalDataFailed (m_currentHdr.GetAddr1 (), &m_currentHdr);
      }
      else
      {
        m_stationManager->ReportDataFailed (m_currentHdr.GetAddr1 (), &m_currentHdr);
      }
    }
  if (resetDcf)
    {
      if (!m_txFailedCallback.IsNull ())
        {
          m_txFailedCallback (m_currentHdr);
        }
      //to reset the dcf.
      m_currentPacket = 0;
      m_dcf->ResetCw ();
    }
  else
    {
      m_dcf->UpdateFailedCw ();
    }
  m_backoffTrace = m_rng->GetNext (0, m_dcf->GetCw ());
  m_dcf->StartBackoffNow (m_backoffTrace);
  RestartAccessIfNeeded ();
}

void

       || !m_queue->IsEmpty () || m_baManager->HasPackets ())
      && !m_dcf->IsAccessRequested ())
    {
      Ptr<const Packet> packet;
      WifiMacHeader hdr;
      if (m_currentPacket != 0)
        {
          packet = m_currentPacket;
          hdr = m_currentHdr;
        }
      else if (m_baManager->HasPackets ())
        {
          packet = m_baManager->PeekNextPacket (hdr);
        }
      else if (m_queue->PeekFirstAvailable (&hdr, m_currentPacketTimestamp, m_qosBlockedDestinations) != 0)
        {
          packet = m_queue->PeekFirstAvailable (&hdr, m_currentPacketTimestamp, m_qosBlockedDestinations);
        }
      if (packet != 0)
        {
          m_isAccessRequestedForRts = m_stationManager->NeedRts (hdr.GetAddr1 (), &hdr, packet, m_low->GetDataTxVector (packet, &hdr));
        }
      else
        {
          m_isAccessRequestedForRts = false;
        }
      m_manager->RequestAccess (m_dcf);
    }
}

      && (!m_queue->IsEmpty () || m_baManager->HasPackets ())
      && !m_dcf->IsAccessRequested ())
    {
      Ptr<const Packet> packet;
      WifiMacHeader hdr;
      if (m_currentPacket != 0)
        {
          packet = m_currentPacket;
          hdr = m_currentHdr;
        }
      else if (m_baManager->HasPackets ())
        {
          packet = m_baManager->PeekNextPacket (hdr);
        }
      else if (m_queue->PeekFirstAvailable (&hdr, m_currentPacketTimestamp, m_qosBlockedDestinations) != 0)
        {
          packet = m_queue->PeekFirstAvailable (&hdr, m_currentPacketTimestamp, m_qosBlockedDestinations);
        }
      if (packet != 0)
        {
          m_isAccessRequestedForRts = m_stationManager->NeedRts (hdr.GetAddr1 (), &hdr, packet, m_low->GetDataTxVector (packet, &hdr));
        }
      else
        {
          m_isAccessRequestedForRts = false;
        }
      m_manager->RequestAccess (m_dcf);
    }
}

(-)a/src/wifi/model/edca-txop-n.h (+1 lines)

Lines 567-572	Link Here

567

  Time m_currentPacketTimestamp;

567

  Time m_currentPacketTimestamp;

568

  uint16_t m_blockAckInactivityTimeout;

568

  uint16_t m_blockAckInactivityTimeout;

569

  struct Bar m_currentBar;

569

  struct Bar m_currentBar;

570

  bool m_isAccessRequestedForRts;

570

  TracedValue<uint32_t> m_backoffTrace;

571

  TracedValue<uint32_t> m_backoffTrace;

571

  TracedValue<uint32_t> m_cwTrace;

572

  TracedValue<uint32_t> m_cwTrace;

572

};

573

};

(-)a/src/wifi/model/mac-low.h (-1 / +1 lines)

Lines 823-829	Link Here

823

*/

823

*/

824

  void FlushAggregateQueue (void);

824

  void FlushAggregateQueue (void);

825

826

protected:

827

/**

826

/**

828

   * Return a TXVECTOR for the DATA frame given the destination.

827

   * Return a TXVECTOR for the DATA frame given the destination.

829

   * The function consults WifiRemoteStationManager, which controls the rate

828

   * The function consults WifiRemoteStationManager, which controls the rate

Lines 834-839	Link Here

834

   * \return TXVECTOR for the given packet

833

   * \return TXVECTOR for the given packet

835

*/

834

*/

836

  virtual WifiTxVector GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;

835

  virtual WifiTxVector GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const;

836

837

private:

837

private:

838

/**

838

/**

839

   * Cancel all scheduled events. Called before beginning a transmission

839

   * Cancel all scheduled events. Called before beginning a transmission

Return to bug 2222