Attachment #775 for bug #829

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

(-)a/src/internet-stack/pending-data.cc (+1 lines)

Lines 102-107	Link Here

102

103

  data.push_back(p);

103

  data.push_back(p);

104

  size += p->GetSize();

104

  size += p->GetSize();

105

  //std::cout << this << ": pending data size: " << size << " (" << int(data.size ()) << " packets)" << std::endl;

105

106

107

uint32_t PendingData::SizeFromSeq (const SequenceNumber& f, const SequenceNumber& o)

108

uint32_t PendingData::SizeFromSeq (const SequenceNumber& f, const SequenceNumber& o)




    }
  // See if all pending ack'ed; if so we can delete the data
  if (m_pendingData)
    { // Data exists, see if can be entirely deleted
      if (m_pendingData->SizeFromSeq (m_firstPendingSequence, m_highestRxAck) == 0)
        { // All pending acked, can be deleted
          m_pendingData->Clear ();

                        Simulator::GetDelayLeft (m_retxEvent)).GetSeconds());
          m_retxEvent.Cancel ();
        }
      else // else delete just a portion
        {
          // std::cout << "begin delete portion of pending data;"
          //           << " m_firstPendingSequence=" << m_firstPendingSequence
          //           << "; m_highestRxAck=" << m_highestRxAck
          //           << "; size=" << m_pendingData->size << std::endl;
          
          for (std::vector< Ptr<Packet> >::iterator dataI = m_pendingData->data.begin ();
               dataI != m_pendingData->data.end ();)
            {
              Ptr<Packet> data = *dataI;
              // std::cout << "pending packet of size " << data->GetSize () << std::endl;
              if (m_firstPendingSequence + SequenceNumber (data->GetSize ()) <= m_highestRxAck)
                {
                  dataI = m_pendingData->data.erase (dataI);
                  m_pendingData->size -= data->GetSize ();
                  m_firstPendingSequence += data->GetSize ();
                }
              else
                {
                  break;
                }
            }
          // std::cout << "  end delete portion of pending data;"
          //           << " m_firstPendingSequence=" << m_firstPendingSequence
          //           << "; m_highestRxAck=" << m_highestRxAck
          //           << "; size=" << m_pendingData->size << std::endl;
        }
    }
  // Try to send more data
  SendPendingData (m_connected);

Return to bug 829