Attachment #2806 for bug #2413

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

(-)a/src/internet/model/arp-header.cc (-1 / +1 lines)

Lines 136-142 uint32_t	Link Here

136

ArpHeader::GetSerializedSize (void) const

136

ArpHeader::GetSerializedSize (void) const

137

138

  NS_LOG_FUNCTION (this);

138

  NS_LOG_FUNCTION (this);

139

  NS_ASSERT((m_macSource.GetLength () == 6) || (m_macSource.GetLength () == 8));

139

  NS_ASSERT((m_macSource.GetLength () == 6) || (m_macSource.GetLength () == 8) || (m_macSource.GetLength () == 1));

140

  NS_ASSERT (m_macSource.GetLength () == m_macDest.GetLength ());

140

  NS_ASSERT (m_macSource.GetLength () == m_macDest.GetLength ());

141

142

  uint32_t length = 16;   // Length minus two hardware addresses

142

  uint32_t length = 16;   // Length minus two hardware addresses




{
  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, uint8_t type, uint8_t protocolNumber)
  : Header (),
    m_dest (dest),
    m_src (src)
    m_type (type)
{
  m_uanProtocolBits.m_protocolNumber = protocolNumber;
  m_uanProtocolBits.m_type = type;
}

TypeId

void
UanHeaderCommon::SetType (uint8_t type)
{
  m_uanProtocolBits.m_type = type;
}

void
UanHeaderCommon::SetProtocolNumber (uint16_t protocolNumber)
{
  if(protocolNumber == 0x0800)
    m_uanProtocolBits.m_protocolNumber = 1;
  if(protocolNumber == 0x0806)
    m_uanProtocolBits.m_protocolNumber = 2;
  if(protocolNumber == 0x86DD)
    m_uanProtocolBits.m_protocolNumber = 3;
 }

UanAddress
UanHeaderCommon::GetDest (void) const
{

uint8_t
UanHeaderCommon::GetType (void) const
{
  return m_uanProtocolBits.m_type;
}

uint16_t
UanHeaderCommon::GetProtocolNumber (void) const
{
  if(m_uanProtocolBits.m_protocolNumber == 1)
    return 0x0800;
  if(m_uanProtocolBits.m_protocolNumber == 2)
    return 0x0806;
  if(m_uanProtocolBits.m_protocolNumber == 3)
    return 0x86DD;
  return 0;
}

// Inherrited methods

{
  start.WriteU8 (m_src.GetAsInt ());
  start.WriteU8 (m_dest.GetAsInt ());
  char tmp = m_uanProtocolBits.m_type;
  tmp = tmp << 4;
  tmp += m_uanProtocolBits.m_protocolNumber;
  start.WriteU8 (tmp);
}

uint32_t


  m_src = UanAddress (rbuf.ReadU8 ());
  m_dest = UanAddress (rbuf.ReadU8 ());
  char tmp = rbuf.ReadU8 ();
  m_uanProtocolBits.m_type = tmp >> 4;
  m_uanProtocolBits.m_protocolNumber = tmp;

  return rbuf.GetDistanceFrom (start);
}

void
UanHeaderCommon::Print (std::ostream &os) const
{
  os << "UAN src=" << m_src << " dest=" << m_dest << " type=" << (uint32_t) m_uanProtocolBits.m_type << "Protocol Number=" << (uint32_t) m_uanProtocolBits.m_protocolNumber;
}



(-)a/src/uan/model/uan-header-common.h (-3 / +22 lines)

Lines 27-32	Link Here

#include "uan-address.h"

#include "uan-address.h"

namespace ns3 {

namespace ns3 {

  struct UanProtocolBits

    uint8_t  m_type : 4;

    uint8_t  m_protocolNumber : 4;

};

/**

/**

 * \ingroup uan

 * \ingroup uan

Lines 50-57 public:	Link Here

   * \param src Source address defined in header.

   * \param src Source address defined in header.

   * \param dest Destination address defined in header.

   * \param dest Destination address defined in header.

   * \param type Header type.

   * \param type Header type.

   * \param protocolNumber the layer 3 protocol number

*/

*/

  UanHeaderCommon (const UanAddress src, const UanAddress dest, uint8_t type);

  UanHeaderCommon (const UanAddress src, const UanAddress dest, uint8_t type, uint8_t protocolNumber);

  /** Destructor */

  /** Destructor */

  virtual ~UanHeaderCommon ();

  virtual ~UanHeaderCommon ();

Lines 80-86 public:	Link Here

   * \param type The type value.

   * \param type The type value.

*/

*/

  void SetType (uint8_t type);

  void SetType (uint8_t type);

/**

   * Set the packet type.

   * Used to indicate the layer 3 protocol

   * \param protocolNumber The layer 3 protocol number value.

*/

  void SetProtocolNumber (uint16_t protocolNumber);

/**

/**

   * Get the destination address.

   * Get the destination address.

Lines 99-104 public:	Link Here

   * \return value of type field.

112

   * \return value of type field.

100

*/

113

*/

101

  uint8_t GetType (void) const;

114

  uint8_t GetType (void) const;

115

/**

116

   * Get the packet type value.

117

118

   * \return value of protocolNumber field.

119

*/

120

  uint16_t GetProtocolNumber (void) const;

102

121

103

122

104

  // Inherited methods

123

  // Inherited methods

Lines 110-116 public:	Link Here

110

private:

129

private:

111

  UanAddress m_dest;  //!< The destination address.

130

  UanAddress m_dest;  //!< The destination address.

112

  UanAddress m_src;   //!< The source address.

131

  UanAddress m_src;   //!< The source address.

113

  uint8_t m_type;     //!< The type field.

132

  UanProtocolBits m_uanProtocolBits;  //!< The type and protocol bits

114

133

115

};  // class UanHeaderCommon

134

};  // class UanHeaderCommon

116

135




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


      header.SetSrc (src);
      header.SetDest (udest);
      header.SetType (0);
      header.SetProtocolNumber (protocolNumber);

      packet->AddHeader (header);
      m_phy->SendPacket (packet, GetTxModeIndex ());
      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.GetProtocolNumber (), header.GetSrc ());
    }

}





#include "uan-mac.h"
#include "uan-address.h"
#include "uan-tx-mode.h"

namespace ns3
{

  // Inherited methods
  Address GetAddress (void);
  virtual void SetAddress (UanAddress addr);
  virtual bool Enqueue (Ptr<Packet> pkt, uint16_t protocolNumber, const Address &dest);
  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> cb);
  virtual void AttachPhy (Ptr<UanPhy> phy);
  virtual Address GetBroadcast (void) const;
  virtual void Clear (void);

  /** PHY layer attached to this MAC. */
  Ptr<UanPhy> m_phy;
  /** Forwarding up callback. */
  Callback<void, Ptr<Packet>, uint16_t, const UanAddress& > m_forUpCb;
  /** Flag when we've been cleared. */
  bool m_cleared;





}

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

  switch (m_state)

        header.SetType (0);
        packet->AddHeader (header);

        m_enqueueLogger (packet, GetTxModeIndex ());

        if (m_phy->IsStateBusy ())
          {
            m_pktTx = packet;
            m_pktTxProt = GetTxModeIndex ();
            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,GetTxModeIndex ());

          }
        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.GetProtocolNumber (), 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 protocolNumber, 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 protocolNumber, 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;
}

            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.GetProtocolNumber (), ch.GetSrc ());
      }
      break;
    case UanMacRc::TYPE_GWPING:

      ctsg.SetRetryRate (m_currentRetryRate);
      ctsg.SetTxTimeStamp (Simulator::Now ());

      UanHeaderCommon ch (m_address, UanAddress::GetBroadcast (), UanMacRc::TYPE_CTS, 0);
      Ptr<Packet> p = Create<Packet> ();
      p->AddHeader (ctsg);
      p->AddHeader (ch);

(-)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 protocolNumber, 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 protocolNumber, const Address &dest)
{
  if (protocolNumber > 0)
    {

}

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

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

    {
      Ptr<Packet> pkt = Create<Packet> (0);
      pkt->AddHeader (CreateRtsHeader (res));
      pkt->AddHeader (UanHeaderCommon (m_address, UanAddress::GetBroadcast (), (uint8_t) TYPE_GWPING, 0));
      NS_LOG_DEBUG (Simulator::Now ().GetSeconds () << " Sending first GWPING " << *pkt);
      SendPacket (pkt,m_currentRate + m_numRates);
    }

      res.IncrementRetry ();

      pkt->AddHeader (CreateRtsHeader (res));
      pkt->AddHeader (UanHeaderCommon (m_address, UanAddress::GetBroadcast (), (uint8_t) TYPE_GWPING, 0));

      SendPacket (pkt,m_currentRate + m_numRates);
      m_resList.push_back (res);

    {
      Ptr<Packet> pkt = Create<Packet> (0);
      pkt->AddHeader (CreateRtsHeader (res));
      pkt->AddHeader (UanHeaderCommon (m_address, UanAddress::GetBroadcast (), (uint8_t) TYPE_RTS, 0));
      SendPacket (pkt,m_currentRate + m_numRates);
    }
  m_state = RTSSENT;

      res.IncrementRetry ();
      m_resList.push_back (res);
      pkt->AddHeader (CreateRtsHeader (res));
      pkt->AddHeader (UanHeaderCommon (m_address, UanAddress::GetBroadcast (), (uint8_t) TYPE_RTS, 0));
      SendPacket (pkt,m_currentRate + m_numRates);

    }

(-)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 protocolNumber, 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;

(-)a/src/uan/model/uan-mac.cc (+16 lines)

Lines 23-28	Link Here

namespace ns3 {

namespace ns3 {

NS_OBJECT_ENSURE_REGISTERED (UanMac);

NS_OBJECT_ENSURE_REGISTERED (UanMac);

UanMac::UanMac ()

  : m_txModeIndex (0)

TypeId UanMac::GetTypeId (void)

TypeId UanMac::GetTypeId (void)

Lines 33-36 TypeId UanMac::GetTypeId (void)	Link Here

  return tid;

  return tid;

void

UanMac::SetTxModeIndex (uint32_t txModeIndex)

  m_txModeIndex = txModeIndex;

uint32_t

UanMac::GetTxModeIndex ()

  return m_txModeIndex;

} // namespace ns3

} // namespace ns3

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

Lines 48-53 class UanAddress;	Link Here

class UanMac : public Object

class UanMac : public Object

public:

public:

  /** Default constructor */

   UanMac ();

/**

/**

   * Register this type.

   * Register this type.

   * \return The TypeId.

   * \return The TypeId.

Lines 73-82 public:	Link Here

   * \param pkt Packet to be transmitted.

   * \param pkt Packet to be transmitted.

   * \param dest Destination address.

   * \param dest Destination address.

   * \param protocolNumber Protocol number.  Usage varies by MAC.

   * \param protocolNumber The type of the packet.

   * \return True if packet was successfully enqueued.

   * \return True if packet was successfully enqueued.

*/

*/

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

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

/**

/**

   * Set the callback to forward packets up to higher layers.

   * Set the callback to forward packets up to higher layers.

Lines 84-90 public:	Link Here

   * \pname{packet} The packet.

   * \pname{packet} The packet.

   * \pname{address} The source address.

   * \pname{address} The source address.

*/

*/

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

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

/**

/**

   * Attach PHY layer to this MAC.

   * Attach PHY layer to this MAC.

Lines 124-129 public:	Link Here

124

*/

126

*/

125

  typedef void (* PacketModeTracedCallback)

127

  typedef void (* PacketModeTracedCallback)

126

    (Ptr<const Packet> packet, UanTxMode mode);

128

    (Ptr<const Packet> packet, UanTxMode mode);

129

130

  uint32_t GetTxModeIndex ();

131

  void SetTxModeIndex (uint32_t txModeIndex);

132

133

private:

134

  /** Modulation type */

135

  uint32_t m_txModeIndex;

127

136

128

};  // class UanMac

137

};  // class UanMac

129

138




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
{
  return UanAddress::ConvertFrom (m_mac->GetBroadcast ()).GetAsMacAddress ();
  return m_mac->GetBroadcast ();
}

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

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);

}


(-)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 protocolNumber The layer 3 protocol number.

165

*/

166

*/

166

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

167

  virtual void ForwardUp (Ptr<Packet> pkt, uint16_t protocolNumber, 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;

Return to bug 2413