Attachment #2933 for bug #2413

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

(-)a/src/internet/helper/ipv6-address-helper.cc (+7 lines)

Lines 86-91 Ipv6Address Ipv6AddressHelper::NewAddress (Address addr)	Link Here

      Ipv6AddressGenerator::AddAllocated (address);

      Ipv6AddressGenerator::AddAllocated (address);

      return address;

      return address;

  else if (UanAddress::IsMatchingType (addr))

      Ipv6Address network = Ipv6AddressGenerator::GetNetwork (Ipv6Prefix (64));

      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (UanAddress::ConvertFrom (addr), network);

      Ipv6AddressGenerator::AddAllocated (address);

      return address;

  else

  else

      NS_FATAL_ERROR ("Did not pass in a valid Mac Address (16, 48 or 64 bits)");

      NS_FATAL_ERROR ("Did not pass in a valid Mac Address (16, 48 or 64 bits)");

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

(-)a/src/internet/model/ipv6-interface.cc (+6 lines)

Lines 113-118 void Ipv6Interface::DoSetup ()	Link Here

113

          AddAddress (ifaddr);

113

          AddAddress (ifaddr);

114

          m_linkLocalAddress = ifaddr;

114

          m_linkLocalAddress = ifaddr;

115

116

      else if (UanAddress::IsMatchingType (addr))

117

118

          Ipv6InterfaceAddress ifaddr = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredLinkLocalAddress (UanAddress::ConvertFrom (addr)), Ipv6Prefix (64));

119

          AddAddress (ifaddr);

120

          m_linkLocalAddress = ifaddr;

121

116

      else

122

      else

117

123

118

          NS_FATAL_ERROR ("IPv6 autoconf for this kind of address not implemented.");

124

          NS_FATAL_ERROR ("IPv6 autoconf for this kind of address not implemented.");




  return ret;
}

Ipv6Address Ipv6Address::MakeAutoconfiguredAddress (UanAddress addr, Ipv6Address prefix)
{
  NS_LOG_FUNCTION (addr << prefix);
  Ipv6Address ret;
  uint8_t buf[2];
  uint8_t buf2[16];

  buf[0] = 0;
  buf[1] = addr.GetAsInt();
  prefix.GetBytes (buf2);

  memcpy (buf2 + 14, buf, 2);
  buf2[11] = 0xff;
  buf2[12] = 0xfe;

  ret.Set (buf2);
  return ret;
}

Ipv6Address Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac16Address addr)
{
  NS_LOG_FUNCTION (addr);

  return ret;
}

Ipv6Address Ipv6Address::MakeAutoconfiguredLinkLocalAddress (UanAddress addr)
{
  NS_LOG_FUNCTION (addr);
  Ipv6Address ret;
  uint8_t buf[2];
  uint8_t buf2[16];

  buf[0] = 0;
  buf[1] = addr.GetAsInt();

  memset (buf2, 0x00, sizeof (buf2));
  buf2[0] = 0xfe;
  buf2[1] = 0x80;
  memcpy (buf2 + 14, buf, 2);
  buf2[11] = 0xff;
  buf2[12] = 0xfe;

  ret.Set (buf2);
  return ret;
}

Ipv6Address Ipv6Address::MakeSolicitedAddress (Ipv6Address addr)
{
  NS_LOG_FUNCTION (addr);

(-)a/src/network/utils/ipv6-address.h (+16 lines)

Lines 30-35	Link Here

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/ipv4-address.h"

#include "ns3/ipv4-address.h"

#include "ns3/deprecated.h"

#include "ns3/deprecated.h"

#include "uan-address.h"

namespace ns3 {

namespace ns3 {

Lines 163-168 public:	Link Here

163

*/

164

*/

164

  static Ipv6Address MakeAutoconfiguredAddress (Mac64Address addr, Ipv6Address prefix);

165

  static Ipv6Address MakeAutoconfiguredAddress (Mac64Address addr, Ipv6Address prefix);

165

166

167

/**

168

   * \brief Make the autoconfigured IPv6 address with UanAddress.

169

   * \param addr the UAN address (8 bits).

170

   * \param prefix the IPv6 prefix

171

   * \return autoconfigured IPv6 address

172

*/

173

  static Ipv6Address MakeAutoconfiguredAddress (UanAddress addr, Ipv6Address prefix);

174

166

/**

175

/**

167

   * \brief Make the autoconfigured link-local IPv6 address with Mac16Address.

176

   * \brief Make the autoconfigured link-local IPv6 address with Mac16Address.

168

   * \param mac the MAC address (16 bits).

177

   * \param mac the MAC address (16 bits).

Lines 184-189 public:	Link Here

184

*/

193

*/

185

  static Ipv6Address MakeAutoconfiguredLinkLocalAddress (Mac64Address mac);

194

  static Ipv6Address MakeAutoconfiguredLinkLocalAddress (Mac64Address mac);

186

195

196

/**

197

    * \brief Make the autoconfigured link-local IPv6 address with UanAddress.

198

    * \param mac the MAC address (8 bits).

199

    * \return autoconfigured link-local IPv6 address

200

*/

201

  static Ipv6Address MakeAutoconfiguredLinkLocalAddress (UanAddress mac);

202

187

/**

203

/**

188

   * \brief Print this address to the given output stream.

204

   * \brief Print this address to the given output stream.

189

205

(-)a/src/network/wscript (+2 lines)

Lines 62-67 def build(bld):	Link Here

        'utils/packet-socket-server.cc',

        'utils/packet-socket-server.cc',

        'utils/packet-data-calculators.cc',

        'utils/packet-data-calculators.cc',

        'utils/packet-probe.cc',

        'utils/packet-probe.cc',

        'utils/uan-address.cc',

        'helper/application-container.cc',

        'helper/application-container.cc',

        'helper/net-device-container.cc',

        'helper/net-device-container.cc',

        'helper/node-container.cc',

        'helper/node-container.cc',

Lines 152-157 def build(bld):	Link Here

152

        'utils/pcap-test.h',

153

        'utils/pcap-test.h',

153

        'utils/packet-data-calculators.h',

154

        'utils/packet-data-calculators.h',

154

        'utils/packet-probe.h',

155

        'utils/packet-probe.h',

156

        'utils/uan-address.h',

155

        'helper/application-container.h',

157

        'helper/application-container.h',

156

        'helper/net-device-container.h',

158

        'helper/net-device-container.h',

157

        'helper/node-container.h',

159

        'helper/node-container.h',

(-)a/src/sixlowpan/model/sixlowpan-net-device.cc (+4 lines)

Lines 2099-2104 Ipv6Address SixLowPanNetDevice::MakeLinkLocalAddressFromMac (Address const &addr	Link Here

2099

2100

          ipv6Addr = Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac16Address::ConvertFrom (addr));

2100

          ipv6Addr = Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac16Address::ConvertFrom (addr));

2101

2102

      else if (UanAddress::IsMatchingType (addr))

2103

2104

          ipv6Addr = Ipv6Address::MakeAutoconfiguredLinkLocalAddress (UanAddress::ConvertFrom (addr));

2105

2102

2106

2103

  if (ipv6Addr.IsAny ())

2107

  if (ipv6Addr.IsAny ())

2104

2108

(-)a/src/uan/model/uan-header-common.cc (-10 / +42 lines)

Lines 19-25	Link Here

*/

*/

#include "uan-header-common.h"

#include "uan-header-common.h"

#include "uan-address.h"

#include "ns3/uan-address.h"

#include "ns3/arp-l3-protocol.h"

#include "ns3/ipv6-l3-protocol.h"

#include "ns3/ipv4-l3-protocol.h"

namespace ns3 {

namespace ns3 {

Lines 29-41 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, uint8_t protocolNumber)

  : Header (),

  : Header (),

    m_dest (dest),

    m_dest (dest),

    m_src (src),

    m_src (src)

    m_type (type)

  m_uanProtocolBits.m_protocolNumber = protocolNumber;

  m_uanProtocolBits.m_type = type;

TypeId

TypeId

Lines 73-79 UanHeaderCommon::SetSrc (UanAddress src)	Link Here

void

void

UanHeaderCommon::SetType (uint8_t type)

UanHeaderCommon::SetType (uint8_t type)

  m_type = type;

  m_uanProtocolBits.m_type = type;

void

UanHeaderCommon::SetProtocolNumber (uint16_t protocolNumber)

  NS_ASSERT_MSG(protocolNumber > 3 || protocolNumber <= 0, "UanHeaderCommon::SetProtocolNumber(): Protocol not supported");

  if(protocolNumber == Ipv4L3Protocol::PROT_NUMBER)

    m_uanProtocolBits.m_protocolNumber = 1;

  if(protocolNumber == ArpL3Protocol::PROT_NUMBER)

    m_uanProtocolBits.m_protocolNumber = 2;

  if(protocolNumber == Ipv6L3Protocol::PROT_NUMBER)

    m_uanProtocolBits.m_protocolNumber = 3;

UanAddress

UanAddress

Lines 89-95 UanHeaderCommon::GetSrc (void) const	Link Here

uint8_t

104

uint8_t

UanHeaderCommon::GetType (void) const

105

UanHeaderCommon::GetType (void) const

106

  return m_type;

107

  return m_uanProtocolBits.m_type;

108

109

110

uint16_t

111

UanHeaderCommon::GetProtocolNumber (void) const

112

113

  if(m_uanProtocolBits.m_protocolNumber == 1)

114

    return Ipv4L3Protocol::PROT_NUMBER;

115

  if(m_uanProtocolBits.m_protocolNumber == 2)

116

    return ArpL3Protocol::PROT_NUMBER;

117

  if(m_uanProtocolBits.m_protocolNumber == 3)

118

    return Ipv6L3Protocol::PROT_NUMBER;

119

  return 0;

120

121

// Inherrited methods

122

// Inherrited methods

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

105

132

106

  start.WriteU8 (m_src.GetAsInt ());

133

  start.WriteU8 (m_src.GetAsInt ());

107

  start.WriteU8 (m_dest.GetAsInt ());

134

  start.WriteU8 (m_dest.GetAsInt ());

108

  start.WriteU8 (m_type);

135

  char tmp = m_uanProtocolBits.m_type;

136

  tmp = tmp << 4;

137

  tmp += m_uanProtocolBits.m_protocolNumber;

138

  start.WriteU8 (tmp);

109

139

110

140

111

uint32_t

141

uint32_t

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

115

145

116

  m_src = UanAddress (rbuf.ReadU8 ());

146

  m_src = UanAddress (rbuf.ReadU8 ());

117

  m_dest = UanAddress (rbuf.ReadU8 ());

147

  m_dest = UanAddress (rbuf.ReadU8 ());

118

  m_type = rbuf.ReadU8 ();

148

  char tmp = rbuf.ReadU8 ();

149

  m_uanProtocolBits.m_type = tmp >> 4;

150

  m_uanProtocolBits.m_protocolNumber = tmp;

119

151

120

  return rbuf.GetDistanceFrom (start);

152

  return rbuf.GetDistanceFrom (start);

121

153

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

123

void

155

void

124

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

156

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

125

157

126

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

158

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

127

159

128

160

129

161




#include "ns3/header.h"
#include "ns3/nstime.h"
#include "ns3/simulator.h"
#include "ns3/uan-address.h"

namespace ns3 {

  struct UanProtocolBits
  {
    uint8_t  m_type : 4;
    uint8_t  m_protocolNumber : 4;
  };

/**
 * \ingroup uan
 *

   * \param src Source address defined in header.
   * \param dest Destination address defined in header.
   * \param type Header type.
   * \param protocolNumber the layer 3 protocol number
   */
  UanHeaderCommon (const UanAddress src, const UanAddress dest, uint8_t type, uint8_t protocolNumber);
  /** Destructor */
  virtual ~UanHeaderCommon ();


   * \param type The type value.
   */
  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.

   * \return value of type field.
   */
  uint8_t GetType (void) const;
  /**
   * Get the packet type value.
   *
   * \return value of protocolNumber field.
   */
  uint16_t GetProtocolNumber (void) const;

  // Inherited methods
  virtual uint32_t GetSerializedSize (void) const;

private:
  UanAddress m_dest;  //!< The destination address.
  UanAddress m_src;   //!< The source address.
  UanProtocolBits m_uanProtocolBits;  //!< The type and protocol bits

};  // class UanHeaderCommon






#include "uan-mac-aloha.h"
#include "uan-tx-mode.h"
#include "ns3/uan-address.h"
#include "ns3/log.h"
#include "uan-phy.h"
#include "uan-header-common.h"

  return tid;
}

Address
UanMacAloha::GetAddress (void)
{
  return m_address;
}

void
UanMacAloha::SetAddress (UanAddress addr)
{
  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 ());
    }

}

  NS_LOG_DEBUG ("" << Simulator::Now () << " MAC " << UanAddress::ConvertFrom (GetAddress ()) << " Received packet in error with sinr " << sinr);
}

Address
UanMacAloha::GetBroadcast (void) const
{
  UanAddress broadcast (255);
  return broadcast;
}

int64_t
UanMacAloha::AssignStreams (int64_t stream)
{




#define UAN_MAC_ALOHA_H

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

namespace ns3
{



  // Inherited methods
  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 bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);
  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress& > cb);
  virtual void AttachPhy (Ptr<UanPhy> phy);
  virtual Address GetBroadcast (void) const;
  virtual void Clear (void);
  int64_t AssignStreams (int64_t stream);


  /** 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;





  return tid;
}

Address
UanMacCw::GetAddress ()
{
  return this->m_address;
}

void
UanMacCw::SetAddress (UanAddress addr)
{
  m_address = addr;
}

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

  m_phy->RegisterListener (this);
}

Address
UanMacCw::GetBroadcast (void) const
{
  return UanAddress::GetBroadcast ();
}


void
UanMacCw::NotifyRxStart (void)
{


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




  virtual Time GetSlotTime (void);

  // Inherited methods from UanMac
  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 bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);
  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress&> cb);
  virtual void AttachPhy (Ptr<UanPhy> phy);
  virtual Address GetBroadcast (void) const;
  virtual void Clear (void);
  int64_t AssignStreams (int64_t stream);


  } State;

  /** Forwarding up callback. */
  Callback <void, Ptr<Packet>, uint16_t, const UanAddress&> m_forwardUpCb;
  /** The MAC address. */
  UanAddress m_address;
  /** PHY layer attached to this MAC. */




  return tid;
}

Address
UanMacRcGw::GetAddress (void)
{
  return m_address;
}

void
UanMacRcGw::SetAddress (UanAddress addr)
{
  m_address = addr;
}

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

{
}

Address
UanMacRcGw::GetBroadcast (void) const
{
  return UanAddress::GetBroadcast ();
}

void
UanMacRcGw::ReceivePacket (Ptr<Packet> pkt, double sinr, UanTxMode mode)
{

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




#define UAN_MAC_RC_GW_H

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

#include "ns3/nstime.h"
#include "ns3/traced-callback.h"

  static TypeId GetTypeId (void);

  // Inherited methods
  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 bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);
  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress&> cb);
  virtual void AttachPhy (Ptr<UanPhy> phy);
  virtual Address GetBroadcast (void) const;
  virtual void Clear (void);
  int64_t AssignStreams (int64_t stream);


    uint8_t expFrames;  //!< Expected number of frames.
  };
  /** Forwarding up callback. */
  Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> m_forwardUpCb;
  
  Ptr<UanPhy> m_phy;            //!< PHY layer attached to this MAC.
  UanAddress m_address;         //!< The MAC address.




  return 1;
}

Address
UanMacRc::GetAddress (void)
{
  return m_address;
}

void
UanMacRc::SetAddress (UanAddress addr)
{
  m_address = addr;
}

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

  m_phy->SetReceiveOkCallback (MakeCallback (&UanMacRc::ReceiveOkFromPhy, this));
}

Address
UanMacRc::GetBroadcast (void) const
{
  return UanAddress::GetBroadcast ();
}

void
UanMacRc::ReceiveOkFromPhy (Ptr<Packet> pkt, double sinr, UanTxMode mode)
{

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

    }




#define UAN_MAC_RC_H

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

#include "ns3/nstime.h"
#include "ns3/trace-source-accessor.h"

  static TypeId GetTypeId (void);

  // Inherited methods
  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 bool Enqueue (Ptr<Packet> pkt, const Address &dest, uint16_t protocolNumber);
  virtual void SetForwardUpCb (Callback<void, Ptr<Packet>, const UanAddress&> cb);
  virtual void AttachPhy (Ptr<UanPhy> phy);
  virtual Address GetBroadcast (void) const;
  virtual void Clear (void);
  int64_t AssignStreams (int64_t stream);


  std::list<Reservation> m_resList;

  /** The callback to forward a packet up to higher layer. */
  Callback<void, Ptr<Packet>, uint16_t, const UanAddress&> m_forwardUpCb;

  /** A packet was destined for and received at this MAC layer. */
  TracedCallback<Ptr<const Packet>, UanTxMode > m_rxLogger;

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

Lines 24-29 namespace ns3 {	Link Here

NS_OBJECT_ENSURE_REGISTERED (UanMac);

NS_OBJECT_ENSURE_REGISTERED (UanMac);

UanMac::UanMac ()

  : m_txModeIndex (0)

TypeId UanMac::GetTypeId (void)

TypeId UanMac::GetTypeId (void)

  static TypeId tid = TypeId ("ns3::UanMac")

  static TypeId tid = TypeId ("ns3::UanMac")

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;

Address

UanMac::GetAddress (void)

  return m_address;

void

UanMac::SetAddress (UanAddress addr)

  m_address=addr;

Address

UanMac::GetBroadcast (void) const

  UanAddress broadcast = UanAddress(255);

  return broadcast;

} // namespace ns3

} // namespace ns3




class UanMac : public Object
{
public:
  /** Default constructor */
  UanMac ();
  /**
   * Register this type.
   * \return The TypeId.

   *
   * \return MAC Address.
   */
  virtual Address GetAddress (void);

  /**
   * Set the address.
   *
   * \param addr UanAddress for this MAC.
   */
  virtual void SetAddress (UanAddress addr);

  /**
   * Enqueue packet to be transmitted.
   *
   * \param pkt Packet to be transmitted.
   * \param dest Destination address.
   * \param protocolNumber The type of the packet.
   * \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.

   *
   * \return The broadcast address.
   */
  virtual Address GetBroadcast (void) const;

  /** Clears all pointer references. */
  virtual void Clear (void) = 0;

  typedef void (* PacketModeTracedCallback)
    (Ptr<const Packet> packet, UanTxMode mode);

  uint32_t GetTxModeIndex ();
  void SetTxModeIndex (uint32_t txModeIndex);

private:
  /** Modulation type */
  uint32_t m_txModeIndex;
  /** The MAC address. */
  UanAddress m_address;

};  // class UanMac

} // namespace ns3




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

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

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


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

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

}





#include "ns3/net-device.h"
#include "ns3/pointer.h"
#include "ns3/traced-callback.h"
#include "ns3/uan-address.h"
#include <list>

namespace ns3 {

   *
   * \param pkt The packet.
   * \param src The source address.
   * \param protocolNumber The layer 3 protocol number.
   */
  virtual void ForwardUp (Ptr<Packet> pkt, uint16_t protocolNumber, const UanAddress &src);
  
  /** \return The channel attached to this device. */
  Ptr<UanChannel> DoGetChannel (void) const;

(-)a/src/uan/wscript (-2 lines)

Lines 8-14 def build(bld):	Link Here

        'model/uan-mac.cc',

        'model/uan-mac.cc',

        'model/uan-transducer.cc',

        'model/uan-transducer.cc',

        'model/uan-transducer-hd.cc',

        'model/uan-transducer-hd.cc',

        'model/uan-address.cc',

        'model/uan-net-device.cc',

        'model/uan-net-device.cc',

        'model/uan-tx-mode.cc',

        'model/uan-tx-mode.cc',

        'model/uan-prop-model.cc',

        'model/uan-prop-model.cc',

Lines 46-52 def build(bld):	Link Here

        'model/uan-transducer.h',

        'model/uan-transducer.h',

        'model/uan-phy-gen.h',

        'model/uan-phy-gen.h',

        'model/uan-transducer-hd.h',

        'model/uan-transducer-hd.h',

        'model/uan-address.h',

        'model/uan-prop-model-ideal.h',

        'model/uan-prop-model-ideal.h',

        'model/uan-mac-aloha.h',

        'model/uan-mac-aloha.h',

        'model/uan-header-common.h',

        'model/uan-header-common.h',

Return to bug 2413