Attachment #3032 for bug #2870

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

(-)a/src/wifi/model/block-ack-manager.cc (+9 lines)

Lines 84-89 BlockAckManager::ExistsAgreement (Mac48Address recipient, uint8_t tid) const	Link Here

  return (m_agreements.find (std::make_pair (recipient, tid)) != m_agreements.end ());

  return (m_agreements.find (std::make_pair (recipient, tid)) != m_agreements.end ());

uint16_t

BlockAckManager::GetAgreementBufferSize (Mac48Address recipient, uint8_t tid) const

  NS_LOG_FUNCTION (this << recipient << static_cast<uint16_t> (tid));

  NS_ASSERT (ExistsAgreement (recipient, tid));

  uint16_t bufferSize = m_agreements.find (std::make_pair (recipient, tid))->second.first.GetBufferSize ();

  return bufferSize;

bool

bool

BlockAckManager::ExistsAgreementInState (Mac48Address recipient, uint8_t tid,

BlockAckManager::ExistsAgreementInState (Mac48Address recipient, uint8_t tid,

                                         OriginatorBlockAckAgreement::State state) const

                                         OriginatorBlockAckAgreement::State state) const




  /**
   * \param recipient Address of peer station involved in block ack mechanism.
   * \param tid Traffic ID.
   *
   * \return the buffer size negotiated for this peer and for the given TID
   *
   * Returns the negotiated buffer size of an existing block ack agreement
   * with station addressed by <i>recipient</i> for tid <i>tid</i>.
   */
  uint16_t GetAgreementBufferSize (Mac48Address recipient, uint8_t tid) const;
  /**
   * \param recipient Address of peer station involved in block ack mechanism.
   * \param tid Traffic ID.
   * \param state The state for block ack agreement
   *
   * \return true if a block ack agreement exists, false otherwise

(-)a/src/wifi/model/edca-txop-n.cc (+9 lines)

Lines 106-111 EdcaTxopN::GetBaAgreementExists (Mac48Address address, uint8_t tid) const	Link Here

106

  return m_baManager->ExistsAgreement (address, tid);

106

  return m_baManager->ExistsAgreement (address, tid);

107

108

109

uint16_t

110

EdcaTxopN::GetAgreementBufferSize (Mac48Address recipient, uint8_t tid) const

111

112

  NS_LOG_FUNCTION (this << recipient << static_cast<uint16_t> (tid));

113

  NS_ASSERT (GetBaAgreementExists (recipient, tid));

114

  uint16_t bufferSize = m_baManager->GetAgreementBufferSize (recipient, tid);

115

  return bufferSize;

116

117

109

void

118

void

110

EdcaTxopN::CompleteAmpduTransfer (Mac48Address recipient, uint8_t tid)

119

EdcaTxopN::CompleteAmpduTransfer (Mac48Address recipient, uint8_t tid)

111

120




   */
  bool GetBaAgreementExists (Mac48Address address, uint8_t tid) const;
  /**
   * \param recipient Address of peer station involved in block ack mechanism.
   * \param tid traffic ID.
   *
   * \return the buffer size negotiated for this peer and for the given TID
   *
   * Returns the negotiated buffer size of an existing block ack agreement
   * with station addressed by <i>recipient</i> for tid <i>tid</i>.
   */
  uint16_t GetAgreementBufferSize (Mac48Address recipient, uint8_t tid) const;
  /**
   * \param recipient address of peer station involved in block ack mechanism.
   * \param tid Ttraffic ID of transmitted packet.
   *




                  currentSequenceNumber = peekedHdr.GetSequenceNumber ();
                }

              while (IsInWindow (currentSequenceNumber, startingSequenceNumber, edcaIt->second->GetAgreementBufferSize (hdr.GetAddr1 (), tid))
                  && !StopMpduAggregation (peekedPacket, peekedHdr, currentAggregatedPacket, blockAckSize))
                {
                  //for now always send AMPDU with normal ACK
                  if (retry == false)

                          //find what will the sequence number be so that we don't send more than 64 packets apart
                          currentSequenceNumber = edcaIt->second->PeekNextSequenceNumberFor (&peekedHdr);

                          if (edcaIt->second->GetMsduAggregator () != 0
                              && IsInWindow (currentSequenceNumber, startingSequenceNumber, edcaIt->second->GetAgreementBufferSize (peekedHdr.GetAddr1 (), tid)))
                            {
                              tempPacket = PerformMsduAggregation (peekedPacket, &peekedHdr, &tstamp, currentAggregatedPacket, blockAckSize);
                              if (tempPacket != 0) //MSDU aggregation

Return to bug 2870