Attachment #2508 for bug #2413

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





#include "uan-address.h"
#include "ns3/address.h"
#include "ns3/mac48-address.h"

namespace ns3 {


{
  return m_address;
}

Mac48Address
UanAddress::GetAsMacAddress () const
{
  uint8_t address [6];
  address[0] = address[1] = address[2] = address[3] = address[4] = 0;
  address[5] = m_address;
  Mac48Address mac;
  mac.CopyFrom (address);
  return mac;
}

bool
UanAddress::IsMatchingType (const Address &address)
{

(-)a/src/uan/model/uan-address.h (+8 lines)

Lines 22-27	Link Here

#define UAN_ADDRESS_H

#define UAN_ADDRESS_H

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/mac48-address.h"

#include <iostream>

#include <iostream>

namespace ns3 {

namespace ns3 {

Lines 94-99 public:	Link Here

   * \return 8 bit integer version of address.

   * \return 8 bit integer version of address.

*/

*/

  uint8_t GetAsInt (void) const;

  uint8_t GetAsInt (void) const;

/**

100

   * Convert to MAC Address.

101

102

   * \return 48 bit MAC Address.

103

*/

104

  Mac48Address GetAsMacAddress (void) const;

105

/**

106

/**

   * Get the broadcast address (255).

107

   * Get the broadcast address (255).




{
}

UanHeaderCommon::UanHeaderCommon (const UanAddress src, const UanAddress dest, uint16_t packetType)
  : Header (),
    m_dest (dest),
    m_src (src),
    m_packetType (packetType)
{

}

}

void
UanHeaderCommon::SetPacketType (uint16_t packetType)
{
  m_packetType = packetType;
}

UanAddress

{
  return m_src;
}
uint16_t
UanHeaderCommon::GetPacketType (void) const
{
  return m_packetType;
}

// Inherrited methods

uint32_t
UanHeaderCommon::GetSerializedSize (void) const
{
  return 1 + 1 + 2;
}

void

{
  start.WriteU8 (m_src.GetAsInt ());
  start.WriteU8 (m_dest.GetAsInt ());
  start.WriteU16 (m_packetType);
}

uint32_t


  m_src = UanAddress (rbuf.ReadU8 ());
  m_dest = UanAddress (rbuf.ReadU8 ());
  m_packetType = rbuf.ReadU16 ();

  return rbuf.GetDistanceFrom (start);
}

void
UanHeaderCommon::Print (std::ostream &os) const
{
  os << "UAN src=" << m_src << " dest=" << m_dest << " type=" << (uint32_t) m_packetType;
}






 * Common packet header fields.
 *
 * Includes 1 byte src address, 1 byte dest address,
 * and a 2 bytes packetType field.
 *
 * The packetType field is protocol specific; see the relevant MAC protocol.
 */
class UanHeaderCommon : public Header
{

   *
   * \param src Source address defined in header.
   * \param dest Destination address defined in header.
   * \param packetType The type of the packet.
   */
  UanHeaderCommon (const UanAddress src, const UanAddress dest, uint16_t packetType);
  /** Destructor */
  virtual ~UanHeaderCommon ();


   */
  void SetSrc (UanAddress src);
  /**
   * Set the type of packet.
   *
   * Use of this value is protocol specific.
   * \param packetType The type of packet.
   */
  void SetPacketType (uint16_t packetType);

  /**
   * Get the destination address.

   */
  UanAddress GetSrc (void) const;
  /**
   * Get the type of packet.
   *
   * Use of this value is protocol specific.
   * \return The type of packet.
   */
  uint16_t GetPacketType (void) const;


  // Inherited methods

private:
  UanAddress m_dest;  //!< The destination address.
  UanAddress m_src;   //!< The source address.
  uint16_t m_packetType;     //!< The type field.

};  // class UanHeaderCommon





  m_address=addr;
}
bool
UanMacAloha::Enqueue (Ptr<Packet> packet, uint16_t packetType, const Address &dest)
{
  NS_LOG_DEBUG ("" << Simulator::Now ().GetSeconds () << " MAC " << UanAddress::ConvertFrom (GetAddress ()) << " Queueing packet for " << UanAddress::ConvertFrom (dest));


      UanHeaderCommon header;
      header.SetSrc (src);
      header.SetDest (udest);
      header.SetPacketType (packetType);

      packet->AddHeader (header);
      m_phy->SendPacket (packet, GetModeNum ());
      return true;
    }
  else

}

void
UanMacAloha::SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb)
{
  m_forUpCb = cb;
}


  if (header.GetDest () == GetAddress () || header.GetDest () == UanAddress::GetBroadcast ())
    {
      m_forUpCb (pkt, header.GetPacketType (), header.GetSrc ());
    }

}

(-)a/src/uan/model/uan-mac-aloha.h (-3 / +3 lines)

Lines 57-64 public:	Link Here

  // Inherited methods

  // Inherited methods

  Address GetAddress (void);

  Address GetAddress (void);

  virtual void SetAddress (UanAddress addr);

  virtual void SetAddress (UanAddress addr);

  virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);

  virtual bool Enqueue (Ptr<Packet> pkt, uint16_t packetType, const Address &dest);

  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress& > cb);

  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb);

  virtual void AttachPhy (Ptr<UanPhy> phy);

  virtual void AttachPhy (Ptr<UanPhy> phy);

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual void Clear (void);

  virtual void Clear (void);

Lines 70-76 private:	Link Here

  /** PHY layer attached to this MAC. */

  /** PHY layer attached to this MAC. */

  Ptr<UanPhy> m_phy;

  Ptr<UanPhy> m_phy;

  /** Forwarding up callback. */

  /** Forwarding up callback. */

  Callback<void, Ptr<Packet>, const UanAddress& > m_forUpCb;

  Callback<void, Ptr<Packet>, uint16_t, const UanAddress& > m_forUpCb;

  /** Flag when we've been cleared. */

  /** Flag when we've been cleared. */

  bool m_cleared;

  bool m_cleared;




}

bool
UanMacCw::Enqueue (Ptr<Packet> packet, uint16_t packetType, const Address &dest)
{

  switch (m_state)

        UanHeaderCommon header;
        header.SetDest (UanAddress::ConvertFrom (dest));
        header.SetSrc (m_address);
        header.SetPacketType (packetType);
        packet->AddHeader (header);

        m_enqueueLogger (packet, GetModeNum ());

        if (m_phy->IsStateBusy ())
          {
            m_pktTx = packet;
            m_pktTxProt = GetModeNum ();
            m_state = CCABUSY;
            uint32_t cw = (uint32_t) m_rv->GetValue (0,m_cw);
            m_savedDelayS = Seconds ((double)(cw) * m_slotTime.GetSeconds ());

            NS_LOG_DEBUG ("Time " << Simulator::Now ().GetSeconds () << ": Addr " << GetAddress () << ": Enqueuing new packet while idle (sending)");
            NS_ASSERT (m_phy->GetTransducer ()->GetArrivalList ().size () == 0 && !m_phy->IsStateTx ());
            m_state = TX;
            m_phy->SendPacket (packet, GetModeNum ());

          }
        break;

}

void
UanMacCw::SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb)
{
  m_forwardUpCb = cb;
}


  if (header.GetDest () == m_address || header.GetDest () == UanAddress::GetBroadcast ())
    {
      m_forwardUpCb (packet, header.GetPacketType (), header.GetSrc ());
    }
}
void

(-)a/src/uan/model/uan-mac-cw.h (-3 / +3 lines)

Lines 85-92 public:	Link Here

  // Inherited methods from UanMac

  // Inherited methods from UanMac

  virtual Address GetAddress ();

  virtual Address GetAddress ();

  virtual void SetAddress (UanAddress addr);

  virtual void SetAddress (UanAddress addr);

  virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);

  virtual bool Enqueue (Ptr<Packet> pkt, uint16_t packetType, const Address &dest);

  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress&> cb);

  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb);

  virtual void AttachPhy (Ptr<UanPhy> phy);

  virtual void AttachPhy (Ptr<UanPhy> phy);

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual void Clear (void);

  virtual void Clear (void);

Lines 119-125 private:	Link Here

119

  } State;

119

  } State;

120

121

  /** Forwarding up callback. */

121

  /** Forwarding up callback. */

122

  Callback <void, Ptr<Packet>, const UanAddress& > m_forwardUpCb;

122

  Callback <void, Ptr<Packet>, uint16_t, const UanAddress&> m_forwardUpCb;

123

  /** The MAC address. */

123

  /** The MAC address. */

124

  UanAddress m_address;

124

  UanAddress m_address;

125

  /** PHY layer attached to this MAC. */

125

  /** PHY layer attached to this MAC. */




}

bool
UanMacRcGw::Enqueue (Ptr<Packet> packet, uint16_t packetType, const Address &dest)
{
  NS_LOG_WARN ("RCMAC Gateway transmission to acoustic nodes is not yet implemented");
  return false;
}

void
UanMacRcGw::SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb)
{
  m_forwardUpCb = cb;
}


  pkt->RemoveHeader (ch);

  switch (ch.GetPacketType ())
    {
    case UanMacRc::TYPE_DATA:
      {

            NS_LOG_DEBUG (Simulator::Now ().GetSeconds () << " GW Received data packet from " << ch.GetSrc () << " length = " << pkt->GetSize ());
            m_ackData[ch.GetSrc ()].rxFrames.insert (dh.GetFrameNo ());
          }
        m_forwardUpCb (pkt, ch.GetPacketType (), ch.GetSrc ());
      }
      break;
    case UanMacRc::TYPE_GWPING:

  UanHeaderCommon ch;
  ch.SetDest (UanAddress::GetBroadcast ());
  ch.SetSrc (m_address);
  ch.SetPacketType (UanMacRc::TYPE_CTS);
  cts->AddHeader (ctsg);
  cts->AddHeader (ch);
  SendPacket (cts, m_currentRateNum);

      UanHeaderCommon ch;
      ch.SetDest (dest);
      ch.SetSrc (m_address);
      ch.SetPacketType (UanMacRc::TYPE_ACK);
      UanHeaderRcAck ah;
      ah.SetFrameNo (data.frameNo);
      std::list<uint32_t>::iterator nit = toNack.begin ();

  UanHeaderCommon ch;
  pkt->PeekHeader (ch);
  std::string type;
  switch (ch.GetPacketType ())
    {
    case UanMacRc::TYPE_DATA:
      type = "DATA";

(-)a/src/uan/model/uan-mac-rc-gw.h (-3 / +3 lines)

Lines 69-76 public:	Link Here

  // Inherited methods

  // Inherited methods

  virtual Address GetAddress (void);

  virtual Address GetAddress (void);

  virtual void SetAddress (UanAddress addr);

  virtual void SetAddress (UanAddress addr);

  virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);

  virtual bool Enqueue (Ptr<Packet> pkt, uint16_t packetType, const Address &dest);

  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress&> cb);

  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb);

  virtual void AttachPhy (Ptr<UanPhy> phy);

  virtual void AttachPhy (Ptr<UanPhy> phy);

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual void Clear (void);

  virtual void Clear (void);

Lines 126-132 private:	Link Here

126

    uint8_t expFrames;  //!< Expected number of frames.

126

    uint8_t expFrames;  //!< Expected number of frames.

127

};

127

};

128

  /** Forwarding up callback. */

128

  /** Forwarding up callback. */

129

  Callback<void, Ptr<Packet>, const UanAddress& > m_forwardUpCb;

129

  Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> m_forwardUpCb;

130

131

  Ptr<UanPhy> m_phy;            //!< PHY layer attached to this MAC.

131

  Ptr<UanPhy> m_phy;            //!< PHY layer attached to this MAC.

132

  UanAddress m_address;         //!< The MAC address.

132

  UanAddress m_address;         //!< The MAC address.




}

bool
UanMacRc::Enqueue (Ptr<Packet> packet, uint16_t packetType, const Address &dest)
{
  if (packetType > 0)
    {
      NS_LOG_WARN ("Warning: UanMacRc does not support multiple protocols.  packetType argument to Enqueue is being ignored");
    }



}

void
UanMacRc::SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb)
{
  m_forwardUpCb = cb;
}

      m_rxLogger (pkt, mode);
    }

  switch (ch.GetPacketType ())
    {
    case TYPE_DATA:


          NS_LOG_DEBUG (Simulator::Now ().GetSeconds () << " Node " << m_address << " UanMacRc Receiving DATA packet from PHY");
          UanHeaderRcData dh;
          pkt->RemoveHeader (dh);
          m_forwardUpCb (pkt, ch.GetPacketType (), ch.GetSrc ());
        }
      break;
    case TYPE_RTS:

      ProcessAck (pkt);
      break;
    default:
      NS_FATAL_ERROR ("Unknown packet type " << ch.GetPacketType () << " received at node " << GetAddress ());
    }

}

      pkt->AddHeader (dh);

      UanHeaderCommon ch;
      ch.SetPacketType (TYPE_DATA);
      ch.SetDest (m_assocAddr);
      ch.SetSrc (m_address);


  UanHeaderCommon ch;
  pkt->PeekHeader (ch);
  std::string type;
  switch (ch.GetPacketType ())
    {
    case TYPE_DATA:
      type = "DATA";

      Ptr<Packet> pkt = phyDual->GetPhy1PacketRx ();
      UanHeaderCommon ch;
      pkt->PeekHeader (ch);
      if (ch.GetPacketType () == TYPE_CTS || ch.GetPacketType () == TYPE_ACK)
        {
          phy1ok = false;
        }

(-)a/src/uan/model/uan-mac-rc.h (-3 / +3 lines)

Lines 185-192 public:	Link Here

185

  // Inherited methods

185

  // Inherited methods

186

  virtual Address GetAddress (void);

186

  virtual Address GetAddress (void);

187

  virtual void SetAddress (UanAddress addr);

187

  virtual void SetAddress (UanAddress addr);

188

  virtual bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);

188

  virtual bool Enqueue (Ptr<Packet> pkt, uint16_t packetType, const Address &dest);

189

  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress&> cb);

189

  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb);

190

  virtual void AttachPhy (Ptr<UanPhy> phy);

190

  virtual void AttachPhy (Ptr<UanPhy> phy);

191

  virtual Address GetBroadcast (void) const;

191

  virtual Address GetBroadcast (void) const;

192

  virtual void Clear (void);

192

  virtual void Clear (void);

Lines 241-247 private:	Link Here

241

  std::list<Reservation> m_resList;

241

  std::list<Reservation> m_resList;

242

243

  /** The callback to forward a packet up to higher layer. */

243

  /** The callback to forward a packet up to higher layer. */

244

  Callback<void, Ptr<Packet>, const UanAddress& > m_forwardUpCb;

244

  Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> m_forwardUpCb;

245

246

  /** A packet was destined for and received at this MAC layer. */

246

  /** A packet was destined for and received at this MAC layer. */

247

  TracedCallback<Ptr<const Packet>, UanTxMode > m_rxLogger;

247

  TracedCallback<Ptr<const Packet>, UanTxMode > m_rxLogger;




  return tid;
}

void
UanMac::SetModeNum (uint32_t modeNum)
{
  m_modeNum = modeNum;
}

uint32_t
UanMac::GetModeNum ()
{
  return m_modeNum;
}

} // namespace ns3




   * Enqueue packet to be transmitted.
   *
   * \param pkt Packet to be transmitted.
   * \param packetType The type of the packet. Usage varies by MAC.
   * \param dest Destination address.
   * \param protocolNumber Protocol number.  Usage varies by MAC.
   * \return True if packet was successfully enqueued.
   */
  virtual bool Enqueue (Ptr<Packet> pkt, uint16_t packetType, const Address &dest) = 0;
  /**
   * Set the callback to forward packets up to higher layers.
   * 

   * \pname{packet} The packet.
   * \pname{address} The source address.
   */
  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb) = 0;

  /**
   * Attach PHY layer to this MAC.

   */
  typedef void (* PacketModeTracedCallback)
    (Ptr<const Packet> packet, UanTxMode mode);
  
  /**
   * Get the Tx mode number.
   *
   * \return The Tx mode number..
   */
  uint32_t GetModeNum ();
  
  /**
   * Set the Tx mode number.
   *
   * \param modeNum Tx mode number.
   */
  void SetModeNum (uint32_t modeNum);
  
private:
  uint32_t m_modeNum;   //!< The Tx mode number.
  
};  // class UanMac

} // namespace ns3




Address
UanNetDevice::GetAddress () const
{
  return UanAddress::ConvertFrom (m_mac->GetAddress ()).GetAsMacAddress (); 
}

bool

Address
UanNetDevice::GetBroadcast () const
{
  return UanAddress::ConvertFrom (m_mac->GetBroadcast ()).GetAsMacAddress (); 
}

bool
UanNetDevice::IsMulticast () const
{
  return true;
}

Address
UanNetDevice::GetMulticast (Ipv4Address multicastGroup) const
{
  //NS_FATAL_ERROR ("UanNetDevice does not support multicast");
  return UanAddress::ConvertFrom (m_mac->GetBroadcast ()).GetAsMacAddress ();
}

Address
UanNetDevice::GetMulticast (Ipv6Address addr) const
{
  //NS_FATAL_ERROR ("UanNetDevice does not support multicast");
  return UanAddress::ConvertFrom (m_mac->GetBroadcast ()).GetAsMacAddress ();
}

bool

bool
UanNetDevice::Send (Ptr<Packet> packet, const Address &dest, uint16_t protocolNumber)
{
  uint8_t tmp [6];
  dest.CopyTo (tmp);
  UanAddress udest (tmp[5]);
  return m_mac->Enqueue (packet, protocolNumber, udest);
}

bool

bool
UanNetDevice::NeedsArp () const
{
  return true;
}

void

}

void
UanNetDevice::ForwardUp (Ptr<Packet> pkt, uint16_t protocolNumber, const UanAddress &src)
{
  NS_LOG_DEBUG ("Forwarding packet up to application");
  m_rxLogger (pkt, src);
  m_forwardUp (this, pkt, protocolNumber, src.GetAsMacAddress ());

}


(-)a/src/uan/model/uan-net-device.h (-1 / +2 lines)

Lines 162-169 private:	Link Here

162

163

   * \param pkt The packet.

163

   * \param pkt The packet.

164

   * \param src The source address.

164

   * \param src The source address.

165

   * \param packetType The Type of the packet.

165

*/

166

*/

166

  virtual void ForwardUp (Ptr<Packet> pkt, const UanAddress &src);

167

  virtual void ForwardUp (Ptr<Packet> pkt, uint16_t packetType, const UanAddress &src);

167

168

  /** \return The channel attached to this device. */

169

  /** \return The channel attached to this device. */

169

  Ptr<UanChannel> DoGetChannel (void) const;

170

  Ptr<UanChannel> DoGetChannel (void) const;

(-)a/src/uan/model/uan-phy-dual.cc (-1 / +1 lines)

Lines 97-103 UanPhyCalcSinrDual::CalcSinrDb (Ptr<Packet> pkt,	Link Here

          if (pkt)

          if (pkt)

100

              if (ch.GetType () == UanMacRc::TYPE_DATA)

100

              if (ch.GetPacketType () == UanMacRc::TYPE_DATA)

101

102

                  NS_LOG_DEBUG ("Adding interferer from " << ch2.GetSrc () << " against " << ch.GetSrc () << ": PktRxMode: "

102

                  NS_LOG_DEBUG ("Adding interferer from " << ch2.GetSrc () << " against " << ch.GetSrc () << ": PktRxMode: "

103

                                                          << mode.GetName () << " Int mode: " << it->GetTxMode ().GetName () << " Separation: "

103

                                                          << mode.GetName () << " Int mode: " << it->GetTxMode ().GetName () << " Separation: "





void
UanPhyGen::SendPacket (Ptr<Packet> pkt, uint32_t modeNum)
{ 
  NS_LOG_DEBUG ("PHY " << m_mac->GetAddress () << ": Transmitting packet");
  if (m_state == DISABLED)
    {

      NS_LOG_DEBUG ("Transmission ended but node sleeping or dead");
      return;
    }
  
  NS_ASSERT (m_state == TX);
  if (GetInterferenceDb ( (Ptr<Packet>) 0) > m_ccaThreshDb)
    {


void
UanPhyGen::RxEndEvent (Ptr<Packet> pkt, double rxPowerDb, UanTxMode txMode)
{ 
  if (pkt != m_pktRx)
    {
      return;

Return to bug 2413