Attachment #263 for bug #372

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




  return station->NeedFragmentation (m_currentPacket);
}

uint32_t
DcaTxop::GetNFragments (void)
{
  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
  return station->GetNFragments (m_currentPacket);
}
void
DcaTxop::NextFragment (void)
{

  return station->GetFragmentSize (m_currentPacket, m_fragmentNumber + 1);
}

uint32_t
DcaTxop::GetFragmentOffset (void) 
{
  WifiRemoteStation *station = GetStation (m_currentHdr.GetAddr1 ());
  return station->GetFragmentOffset (m_currentPacket, m_fragmentNumber);
}

Ptr<Packet>
DcaTxop::GetFragmentPacket (WifiMacHeader *hdr)
{
  *hdr = m_currentHdr;
  hdr->SetFragmentNumber (m_fragmentNumber);
  uint32_t startOffset = GetFragmentOffset ();
  Ptr<Packet> fragment;
  if (IsLastFragment ()) 
    {

(-)a/src/devices/wifi/dca-txop.h (-1 / +1 lines)

Lines 137-145	Link Here

137

  bool NeedRtsRetransmission (void);

137

  bool NeedRtsRetransmission (void);

138

  bool NeedDataRetransmission (void);

138

  bool NeedDataRetransmission (void);

139

  bool NeedFragmentation (void);

139

  bool NeedFragmentation (void);

140

  uint32_t GetNFragments (void);

141

  uint32_t GetNextFragmentSize (void);

140

  uint32_t GetNextFragmentSize (void);

142

  uint32_t GetFragmentSize (void);

141

  uint32_t GetFragmentSize (void);

142

  uint32_t GetFragmentOffset (void);

143

  WifiRemoteStation *GetStation (Mac48Address to) const;

143

  WifiRemoteStation *GetStation (Mac48Address to) const;

144

  bool IsLastFragment (void);

144

  bool IsLastFragment (void);

145

  void NextFragment (void);

145

  void NextFragment (void);

(-)a/src/devices/wifi/wifi-remote-station-manager.cc (+8 lines)

Lines 656-661	Link Here

656

      return GetManager ()->GetFragmentationThreshold ();

656

      return GetManager ()->GetFragmentationThreshold ();

657

658

659

uint32_t

660

WifiRemoteStation::GetFragmentOffset (Ptr<const Packet> packet, uint32_t fragmentNumber)

661

662

  uint32_t nFragment = GetNFragments (packet);

663

  NS_ASSERT (fragmentNumber < nFragment);

664

  uint32_t fragmentOffset = fragmentNumber * GetManager ()->GetFragmentationThreshold ();

665

  return fragmentOffset;

666

659

667

660

bool

668

bool

661

WifiRemoteStation::IsLastFragment (Ptr<const Packet> packet, uint32_t fragmentNumber)

669

WifiRemoteStation::IsLastFragment (Ptr<const Packet> packet, uint32_t fragmentNumber)




  virtual bool NeedFragmentation (Ptr<const Packet> packet);
  /**
   * \param packet the packet to send
   * \returns the number of fragments which should be used for this packet.
   */
  virtual uint32_t GetNFragments (Ptr<const Packet> packet);
  /**
   * \param packet the packet to send
   * \param fragmentNumber the fragment index of the next fragment to send (starts at zero).
   * \returns the size of the corresponding fragment.
   */
  virtual uint32_t GetFragmentSize (Ptr<const Packet> packet, uint32_t fragmentNumber);
  /**
   * \param packet the packet to send
   * \param fragmentNumber the fragment index of the next fragment to send (starts at zero).
   * \returns the offset within the original packet where this fragment starts.
   */
  virtual uint32_t GetFragmentOffset (Ptr<const Packet> packet, uint32_t fragmentNumber);
  /**
   * \param packet the packet to send
   * \param fragmentNumber the fragment index of the next fragment to send (starts at zero).

  virtual Ptr<WifiRemoteStationManager> GetManager (void) const = 0;
  virtual WifiMode DoGetDataMode (uint32_t size) = 0;
  virtual WifiMode DoGetRtsMode (void) = 0;
  uint32_t GetNFragments (Ptr<const Packet> packet);
protected:
  virtual void DoReportRtsFailed (void) = 0;
  virtual void DoReportDataFailed (void) = 0;

Return to bug 372