Attachment #674 for bug #668

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

(-)a/src/devices/mesh/mesh-wifi-interface-mac.cc (-2 / +2 lines)

Lines 401-411	Link Here

401

  if (packet->RemovePacketTag (tag))

401

  if (packet->RemovePacketTag (tag))

402

403

      hdr.SetType (WIFI_MAC_QOSDATA);

403

      hdr.SetType (WIFI_MAC_QOSDATA);

404

      hdr.SetQosTid (tag.Get ());

404

      hdr.SetQosTid (tag.GetTid ());

405

      //Aftre setting type DsFrom and DsTo fields are reset.

405

      //Aftre setting type DsFrom and DsTo fields are reset.

406

      hdr.SetDsFrom ();

406

      hdr.SetDsFrom ();

407

      hdr.SetDsTo ();

407

      hdr.SetDsTo ();

408

      ac = QosUtilsMapTidToAc (tag.Get ());

408

      ac = QosUtilsMapTidToAc (tag.GetTid ());

409

410

  m_stats.sentFrames++;

410

  m_stats.sentFrames++;

411

  m_stats.sentBytes += packet->GetSize ();

411

  m_stats.sentBytes += packet->GetSize ();




    .AddConstructor<QosTag> ()
    .AddAttribute ("tid", "The tid that indicates AC which packet belongs",
                   UintegerValue (0),
                   MakeUintegerAccessor (&QosTag::GetTid),
                   MakeUintegerChecker<uint8_t> ())
    ;
  return tid;

QosTag::QosTag (uint8_t tid):
  m_tid (tid)
{}
  
void
QosTag::SetTid (uint8_t tid)
{
  m_tid = tid;
}

void
QosTag::SetUserPriority (UserPriority up)
{
  m_tid = up;
}

uint32_t 
QosTag::GetSerializedSize (void) const

void
QosTag::Deserialize (TagBuffer i)
{
  m_tid = (UserPriority) i.ReadU8 ();
}

void
QosTag::Set (uint8_t tid)
{
  m_tid = tid;
}

uint8_t
QosTag::GetTid () const
{
  return m_tid;
}





class Tag;


/**
 * As per IEEE Std. 802.11-2007, Section 6.1.1.1.1, when EDCA is used the
 * the Traffic ID (TID) value corresponds to one of the User Priority (UP)
 * values defined by the IEEE Std. 802.1D-2004, Annex G, table G-2.
 *
 * Note that this correspondence does not hold for HCCA, since in that
 * case the mapping between UPs and TIDs should be determined by a
 * TSPEC element as per IEEE Std. 802.11-2007, Section 7.3.2.30
 */
enum UserPriority {
  UP_BK = 1, /**< background  */
  UP_BE = 0, /**< best effort (default) */
  UP_EE = 3, /**< excellent effort  */
  UP_CL = 4, /**< controlled load */
  UP_VI = 5, /**< video, < 100ms latency and jitter */
  UP_VO = 6, /**< voice, < 10ms latency and jitter */
  UP_NC = 7  /**< network control */
};
  

  
  /**
   * The aim of the QosTag is to provide means for an Application to
   * specify the TID which will be used by a QoS-aware WifiMac for a
   * given traffic flow. Note that the current QosTag class was
   * designed to be completely mac/wifi specific without any attempt
   * at being generic. 
   */
class QosTag : public Tag
{
public:
  static TypeId GetTypeId (void);
  virtual TypeId GetInstanceTypeId (void) const;

  /** 
   * Create a QosTag with the default TID = 0 (best effort traffic) 
   */  
  QosTag ();

  /** 
   * Create a QosTag with the given TID 
   */  
  QosTag (uint8_t tid);

  /** 
   * Set the TID to the given value. This assumes that the
   * application is aware of the QoS support provided by the MAC
   * layer, and is therefore able to set the correct TID. 
   * 
   * @param tid the value of the TID to set
   */
  void SetTid (uint8_t tid);

  /** 
   * Set the TID to the value that corresponds to the requested
   * UserPriority. Note that, since the mapping of UserPriority to TID
   * is defined for EDCA only, you should call this method only when
   * EDCA is used. When using HDCA, QosTag(uint8_t tid) should be used
   * instead.
   * 
   * @param up the requested UserPriority
   * 
   */
  void SetUserPriority (UserPriority up);

  virtual void Serialize (TagBuffer i) const;
  virtual void Deserialize (TagBuffer i);
  virtual uint32_t GetSerializedSize () const;
  virtual void Print (std::ostream &os) const;

  uint8_t GetTid (void) const;

private:
  uint8_t m_tid;
};

(-)a/src/devices/wifi/qos-utils.cc (-2 / +2 lines)

Lines 61-69	Link Here

  uint8_t tid = 8;

  uint8_t tid = 8;

  if (packet->PeekPacketTag (qos))

  if (packet->PeekPacketTag (qos))

      if (qos.Get () < 8)

      if (qos.GetTid () < 8)

          tid = qos.Get ();

          tid = qos.GetTid ();

  return tid;

  return tid;

Return to bug 668