Attachment #2716 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 (+7 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;

/**

   * Convert to MAC Address.

100

101

   * \return 48 bit MAC Address.

102

*/

103

  Mac48Address GetAsMacAddress (void) const;

104

/**

105

/**

   * Get the broadcast address (255).

106

   * Get the broadcast address (255).

(-)a/src/uan/model/uan-header-common.cc (-4 / +18 lines)

Lines 29-39 UanHeaderCommon::UanHeaderCommon ()	Link Here

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

UanHeaderCommon::UanHeaderCommon (const UanAddress src, const UanAddress dest, uint8_t type, uint16_t protocolNumber)

  : Header (),

  : Header (),

    m_dest (dest),

    m_dest (dest),

    m_src (src),

    m_src (src),

    m_type (type)

    m_type (type),

    m_protocolNumber (protocolNumber)

Lines 76-81 UanHeaderCommon::SetType (uint8_t type)	Link Here

  m_type = type;

  m_type = type;

void

UanHeaderCommon::SetProtocolNumber (uint16_t protocolNumber)

  m_protocolNumber = protocolNumber;

UanAddress

UanAddress

UanHeaderCommon::GetDest (void) const

UanHeaderCommon::GetDest (void) const

Lines 91-103 UanHeaderCommon::GetType (void) const	Link Here

  return m_type;

  return m_type;

100

101

uint16_t

102

UanHeaderCommon::GetProtocolNumber (void) const

103

104

  return m_protocolNumber;

105

106

// Inherrited methods

107

// Inherrited methods

108

uint32_t

109

uint32_t

UanHeaderCommon::GetSerializedSize (void) const

110

UanHeaderCommon::GetSerializedSize (void) const

111

100

  return 1 + 1 + 1;

112

  return 1 + 1 + 1 + 2;

101

113

102

114

103

void

115

void

Lines 106-111 UanHeaderCommon::Serialize (Buffer::Iterator start) const	Link Here

106

  start.WriteU8 (m_src.GetAsInt ());

118

  start.WriteU8 (m_src.GetAsInt ());

107

  start.WriteU8 (m_dest.GetAsInt ());

119

  start.WriteU8 (m_dest.GetAsInt ());

108

  start.WriteU8 (m_type);

120

  start.WriteU8 (m_type);

121

  start.WriteU16 (m_protocolNumber);

109

122

110

123

111

uint32_t

124

uint32_t

Lines 116-121 UanHeaderCommon::Deserialize (Buffer::Iterator start)	Link Here

116

  m_src = UanAddress (rbuf.ReadU8 ());

129

  m_src = UanAddress (rbuf.ReadU8 ());

117

  m_dest = UanAddress (rbuf.ReadU8 ());

130

  m_dest = UanAddress (rbuf.ReadU8 ());

118

  m_type = rbuf.ReadU8 ();

131

  m_type = rbuf.ReadU8 ();

132

  m_protocolNumber = rbuf.ReadU16 ();

119

133

120

  return rbuf.GetDistanceFrom (start);

134

  return rbuf.GetDistanceFrom (start);

121

135

Lines 123-129 UanHeaderCommon::Deserialize (Buffer::Iterator start)	Link Here

123

void

137

void

124

UanHeaderCommon::Print (std::ostream &os) const

138

UanHeaderCommon::Print (std::ostream &os) const

125

139

126

  os << "UAN src=" << m_src << " dest=" << m_dest << " type=" << (uint32_t) m_type;

140

  os << "UAN src=" << m_src << " dest=" << m_dest << " type=" << (uint32_t) m_type << "Protocol Number=" << (uint32_t) m_protocolNumber;

127

141

128

142

129

143

(-)a/src/uan/model/uan-header-common.h (-2 / +15 lines)

Lines 51-57 public:	Link Here

   * \param dest Destination address defined in header.

   * \param dest Destination address defined in header.

   * \param type Header type.

   * \param type Header type.

*/

*/

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

  UanHeaderCommon (const UanAddress src, const UanAddress dest, uint8_t type, uint16_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 type The packet type 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.

105

   * \return value of type field.

100

*/

106

*/

101

  uint8_t GetType (void) const;

107

  uint8_t GetType (void) const;

108

/**

109

   * Get the packet type value.

110

111

   * \return value of protocolNumber field.

112

*/

113

  uint16_t GetProtocolNumber (void) const;

102

114

103

115

104

  // Inherited methods

116

  // Inherited methods

Lines 111-116 private:	Link Here

111

  UanAddress m_dest;  //!< The destination address.

123

  UanAddress m_dest;  //!< The destination address.

112

  UanAddress m_src;   //!< The source address.

124

  UanAddress m_src;   //!< The source address.

113

  uint8_t m_type;     //!< The type field.

125

  uint8_t m_type;     //!< The type field.

126

  uint16_t m_protocolNumber;     //!< The protocolNumber field.

114

127

115

};  // class UanHeaderCommon

128

};  // class UanHeaderCommon

116

129





UanMacAloha::UanMacAloha ()
  : UanMac (),
    m_cleared (false),
    m_txModeIndex (UanTxMode::PSK)
{
}


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

}

  return 0;
}

void
UanMacAloha::SetTxModeIndex (uint32_t txModeIndex)
{
  m_txModeIndex = txModeIndex;
}

uint32_t
UanMacAloha::GetTxModeIndex ()
{
  return m_txModeIndex;
}

}

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

Lines 23-28	Link Here

#include "uan-mac.h"

#include "uan-mac.h"

#include "uan-address.h"

#include "uan-address.h"

#include "uan-tx-mode.h"

namespace ns3

namespace ns3

Lines 57-68 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 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);

  int64_t AssignStreams (int64_t stream);

  int64_t AssignStreams (int64_t stream);

  uint32_t GetTxModeIndex ();

  void SetTxModeIndex (uint32_t txModeIndex);

private:

private:

  /** The MAC address. */

  /** The MAC address. */

Lines 70-78 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;

  /** Modulation type */

  uint32_t m_txModeIndex;

/**

/**

   * Receive packet from lower layer (passed to PHY as callback).

   * Receive packet from lower layer (passed to PHY as callback).




    m_phy (0),
    m_pktTx (0),
    m_state (IDLE),
    m_cleared (false),
    m_txModeIndex (UanTxMode::PSK)

{
  m_rv = CreateObject<UniformRandomVariable> ();

}

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

  switch (m_state)

        header.SetDest (UanAddress::ConvertFrom (dest));
        header.SetSrc (m_address);
        header.SetType (0);
        header.SetProtocolNumber (protocolNumber);
        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

  m_savedDelayS = Seconds (0);
}

void
UanMacCw::SetTxModeIndex (uint32_t txModeIndex)
{
  m_txModeIndex = txModeIndex;
}

uint32_t
UanMacCw::GetTxModeIndex ()
{
  return m_txModeIndex;
}

} // namespace ns3

(-)a/src/uan/model/uan-mac-cw.h (-3 / +7 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 99-104 public:	Link Here

  virtual void NotifyCcaStart (void);

  virtual void NotifyCcaStart (void);

100

  virtual void NotifyCcaEnd (void);

100

  virtual void NotifyCcaEnd (void);

101

  virtual void NotifyTxStart (Time duration);

101

  virtual void NotifyTxStart (Time duration);

102

  uint32_t GetTxModeIndex ();

103

  void SetTxModeIndex (uint32_t txModeIndex);

102

104

103

/**

105

/**

104

   *  TracedCallback signature for enqueue/dequeue of a packet.

106

   *  TracedCallback signature for enqueue/dequeue of a packet.

Lines 119-125 private:	Link Here

119

  } State;

121

  } State;

120

122

121

  /** Forwarding up callback. */

123

  /** Forwarding up callback. */

122

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

124

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

123

  /** The MAC address. */

125

  /** The MAC address. */

124

  UanAddress m_address;

126

  UanAddress m_address;

125

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

127

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

Lines 156-161 private:	Link Here

156

158

157

  /** Provides uniform random variable for contention window. */

159

  /** Provides uniform random variable for contention window. */

158

  Ptr<UniformRandomVariable> m_rv;

160

  Ptr<UniformRandomVariable> m_rv;

161

  /** Modulation type */

162

  uint32_t m_txModeIndex;

159

163

160

/**

164

/**

161

   * Receive packet from lower layer (passed to PHY as callback).

165

   * Receive packet from lower layer (passed to PHY as callback).




}

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)
    {
      NS_LOG_WARN ("Warning: UanMacRc does not support multiple protocols.  protocolNumber argument to Enqueue is being ignored");
    }


  if (m_pktQueue.size () >= m_queueLimit)
    {
      return false;

}

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;




   *
   * \param pkt Packet to be transmitted.
   * \param dest Destination address.
   * \param protocolNumber The type of the packet. Usage varies by MAC.
   * \return True if packet was successfully enqueued.
   */
  virtual bool Enqueue (Ptr<Packet> pkt, uint16_t protocolNumber, 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.




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 / +3 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 Type of the packet.

166

165

*/

167

*/

166

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

168

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

167

169

168

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

170

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

169

  Ptr<UanChannel> DoGetChannel (void) const;

171

  Ptr<UanChannel> DoGetChannel (void) const;

Return to bug 2413