Attachment #3056 for bug #2413

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

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

Lines 104-112 Ipv6Address Ipv6AddressHelper::NewAddress (Address addr)	Link Here

104

      Ipv6AddressGenerator::AddAllocated (address);

104

      Ipv6AddressGenerator::AddAllocated (address);

105

      return address;

105

      return address;

106

107

  else if (Mac8Address::IsMatchingType (addr))

108

109

      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac8Address::ConvertFrom (addr), m_network);

110

      Ipv6AddressGenerator::AddAllocated (address);

111

      return address;

112

107

  else

113

  else

108

114

109

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

115

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

110

116

111

  /* never reached */

117

  /* never reached */

112

  return Ipv6Address ("::");

118

  return Ipv6Address ("::");




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2008-2009 Strasbourg University
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
 */

#include "ns3/assert.h"
#include "ns3/log.h"
#include "ns3/ptr.h"
#include "ns3/node.h"
#include "ns3/net-device.h"
#include "ns3/loopback-net-device.h"
#include "ns3/mac16-address.h"
#include "ns3/mac48-address.h"
#include "ns3/mac64-address.h"
#include "ns3/ipv6.h"
#include "ns3/ipv6-address-generator.h"
#include "ns3/traffic-control-helper.h"
#include "ns3/traffic-control-layer.h"

#include "ipv6-address-helper.h"

namespace ns3 
{

NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper");

Ipv6AddressHelper::Ipv6AddressHelper ()
{
  NS_LOG_FUNCTION (this);
  m_network = Ipv6Address ("2001:db8::");
  m_prefix = 64;
  m_address = Ipv6Address ("::1");
  m_base = m_address;
}

Ipv6AddressHelper::Ipv6AddressHelper (Ipv6Address network, Ipv6Prefix prefix,
                                      Ipv6Address base)
{
  NS_LOG_FUNCTION (this << network << prefix << base);

  m_network = network;
  m_prefix = prefix;
  m_address = base;
  m_base = base;

  NS_ASSERT_MSG (m_network == network.CombinePrefix (prefix),
                 "Ipv6AddressHelper: network address and prefix mismatch: " << m_network << " " << m_prefix);

  NS_ASSERT_MSG (base.CombinePrefix (prefix) == Ipv6Address::GetZero (),
                 "Ipv6AddressHelper: base address and prefix mismatch: " << base << " " << m_prefix);
}

void Ipv6AddressHelper::SetBase (Ipv6Address network, Ipv6Prefix prefix,
                                 Ipv6Address base)
{
  NS_LOG_FUNCTION (this << network << prefix << base);

  m_network = network;
  m_prefix = prefix;
  m_address = base;
  m_base = base;

  NS_ASSERT_MSG (m_network == network.CombinePrefix (prefix),
                 "Ipv6AddressHelper::SetBase(): network address and prefix mismatch: " << m_network << " " << m_prefix);

  NS_ASSERT_MSG (base.CombinePrefix (prefix) == Ipv6Address::GetZero (),
                 "Ipv6AddressHelper::SetBase(): base address and prefix mismatch: " << base << " " << m_prefix);
}


Ipv6Address Ipv6AddressHelper::NewAddress (Address addr)
{
  NS_LOG_FUNCTION (this << addr);
  if (Mac64Address::IsMatchingType (addr))
    {
      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), m_network);
      Ipv6AddressGenerator::AddAllocated (address);
      return address;
    }
  else if (Mac48Address::IsMatchingType (addr))
    {
      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), m_network);
      Ipv6AddressGenerator::AddAllocated (address);
      return address;
    }
  else if (Mac16Address::IsMatchingType (addr))
    {
      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), m_network);
      Ipv6AddressGenerator::AddAllocated (address);
      return address;
    }
  else if (Mac8Address::IsMatchingType (addr))
    {
      Ipv6Address network = Ipv6AddressGenerator::GetNetwork (Ipv6Prefix (64));
      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac8Address::ConvertFrom (addr), network);
      Ipv6AddressGenerator::AddAllocated (address);
      return address;
    }
  else
    {
      NS_FATAL_ERROR ("Did not pass in a valid Mac Address (16, 48 or 64 bits)");
    }
  /* never reached */
  return Ipv6Address ("::");
}

Ipv6Address Ipv6AddressHelper::NewAddress (void)
{
  NS_LOG_FUNCTION (this);
//
// The way this is expected to be used is that an address and network number
// are initialized, and then NewAddress() is called repeatedly to allocate and
// get new addresses on a given subnet.  The client will expect that the first
// address she gets back is the one she used to initialize the generator with.
// This implies that this operation is a post-increment.

  uint8_t netBuf[16];
  uint8_t hostBuf[16];
  uint8_t addrBuf[16];
  m_network.GetBytes (netBuf);
  m_address.GetBytes (hostBuf);

  NS_ASSERT_MSG (m_address.CombinePrefix (m_prefix) == Ipv6Address::GetZero (),
                 "Ipv6AddressHelper::NewAddress(): Too many hosts in the network: " << m_address << " " << m_prefix);

  for (uint8_t i=0; i<16; i++)
    {
      addrBuf[i] = netBuf[i] | hostBuf[i];
    }

  Ipv6Address addr = Ipv6Address (addrBuf);

  // Remember: hostBuf[15] is the Least Significant Byte.
  uint16_t sum;
  sum = static_cast<uint16_t> (hostBuf[15]) + 1;
  hostBuf[15] += 1;
  for (uint8_t index=0; index<15; index++)
    {
      if (sum > hostBuf[15-index])
        {
          sum = static_cast<uint16_t> (hostBuf[14-index]) + 1;
          hostBuf[14-index] += 1;
        }
      else
        {
          break;
        }
    }
  m_address = Ipv6Address (hostBuf);

  Ipv6AddressGenerator::AddAllocated (addr);
  return addr;
}

void Ipv6AddressHelper::NewNetwork (void)
{
  NS_LOG_FUNCTION (this);

  uint8_t netBuf[16];
  uint8_t addBuf[16];
  m_network.GetBytes (netBuf);

  uint8_t prefixIndex = (m_prefix.GetPrefixLength ()-1)/8;
  uint8_t prefixPosition = (8-(m_prefix.GetPrefixLength ()%8))%8;

  for (uint8_t index=0; index<16; index++)
    {
      addBuf[index] = 0;
      if (index==prefixIndex)
        {
          addBuf[index] = (1<<prefixPosition);
        }
    }

  uint16_t sum[16];
  for (uint8_t index=0; index<16; index++)
    {
      sum[index] = static_cast<uint16_t> (netBuf[index]) + static_cast<uint16_t> (addBuf[index]);
      netBuf[index] += addBuf[index];
    }

  for (uint8_t index=0; index<15; index++)
    {
      if (sum[15-index] > netBuf[15-index])
        {
          sum[14-index] = static_cast<uint16_t> (netBuf[14-index]) + 1;
          netBuf[14-index] += 1;
        }
    }

  m_network = Ipv6Address (netBuf);
  m_address = m_base;
}

Ipv6InterfaceContainer Ipv6AddressHelper::Assign (const NetDeviceContainer &c)
{
  NS_LOG_FUNCTION (this);
  Ipv6InterfaceContainer retval;

  for (uint32_t i = 0; i < c.GetN (); ++i) 
    {
      Ptr<NetDevice> device = c.Get (i);

      Ptr<Node> node = device->GetNode ();
      NS_ASSERT_MSG (node, "Ipv6AddressHelper::Allocate (): Bad node");

      Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();
      NS_ASSERT_MSG (ipv6, "Ipv6AddressHelper::Allocate (): Bad ipv6");
      int32_t ifIndex = 0;

      ifIndex = ipv6->GetInterfaceForDevice (device);
      if (ifIndex == -1)
        {
          ifIndex = ipv6->AddInterface (device);
        }
      NS_ASSERT_MSG (ifIndex >= 0, "Ipv6AddressHelper::Allocate (): "
                     "Interface index not found");

      Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (NewAddress (device->GetAddress ()), Ipv6Prefix (64));
      ipv6->SetMetric (ifIndex, 1);
      ipv6->AddAddress (ifIndex, ipv6Addr);
      ipv6->SetUp (ifIndex);

      retval.Add (ipv6, ifIndex);

      // Install the default traffic control configuration if the traffic
      // control layer has been aggregated, if this is not
      // a loopback interface, and there is no queue disc installed already
      Ptr<TrafficControlLayer> tc = node->GetObject<TrafficControlLayer> ();
      if (tc && DynamicCast<LoopbackNetDevice> (device) == 0 && tc->GetRootQueueDiscOnDevice (device) == 0)
        {
          NS_LOG_LOGIC ("Installing default traffic control configuration");
          TrafficControlHelper tcHelper = TrafficControlHelper::Default ();
          tcHelper.Install (device);
        }
    }
  return retval;
}

Ipv6InterfaceContainer Ipv6AddressHelper::Assign (const NetDeviceContainer &c, std::vector<bool> withConfiguration)
{
  NS_LOG_FUNCTION (this);
  Ipv6InterfaceContainer retval;
  for (uint32_t i = 0; i < c.GetN (); ++i) 
    {
      Ptr<NetDevice> device = c.Get (i);

      Ptr<Node> node = device->GetNode ();
      NS_ASSERT_MSG (node, "Ipv6AddressHelper::Allocate (): Bad node");

      Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();
      NS_ASSERT_MSG (ipv6, "Ipv6AddressHelper::Allocate (): Bad ipv6");

      int32_t ifIndex = ipv6->GetInterfaceForDevice (device);
      if (ifIndex == -1)
        {
          ifIndex = ipv6->AddInterface (device);
        }
      NS_ASSERT_MSG (ifIndex >= 0, "Ipv6AddressHelper::Allocate (): "
                     "Interface index not found");

      ipv6->SetMetric (ifIndex, 1);

      if (withConfiguration.at (i))
        {
          Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (NewAddress (device->GetAddress ()), Ipv6Prefix (64));
          ipv6->AddAddress (ifIndex, ipv6Addr);
        }

      ipv6->SetUp (ifIndex);
      retval.Add (ipv6, ifIndex);

      // Install the default traffic control configuration if the traffic
      // control layer has been aggregated, if this is not
      // a loopback interface, and there is no queue disc installed already
      Ptr<TrafficControlLayer> tc = node->GetObject<TrafficControlLayer> ();
      if (tc && DynamicCast<LoopbackNetDevice> (device) == 0 && tc->GetRootQueueDiscOnDevice (device) == 0)
        {
          NS_LOG_LOGIC ("Installing default traffic control configuration");
          TrafficControlHelper tcHelper = TrafficControlHelper::Default ();
          tcHelper.Install (device);
        }
    }
  return retval;
}

// Helper API that is redundant with Assign (c, false);
Ipv6InterfaceContainer Ipv6AddressHelper::AssignWithoutAddress (const NetDeviceContainer &c)
{
  NS_LOG_FUNCTION (this);
  std::vector<bool> withConfiguration;
  for (uint32_t i = 0; i < c.GetN (); ++i) 
    {
      withConfiguration.push_back (false);
    }
  return Assign (c, withConfiguration);
}

} /* namespace ns3 */


(-)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 (Mac8Address::IsMatchingType (addr))

117

118

          Ipv6InterfaceAddress ifaddr = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredLinkLocalAddress (Mac8Address::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 (Mac8Address addr, Ipv6Address prefix)
{
  NS_LOG_FUNCTION (addr << prefix);
  Ipv6Address ret;
  uint8_t buf[2];
  uint8_t buf2[16];

  buf[0] = 0;
  addr.CopyTo (&buf[1]);
  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 (Mac8Address addr)
{
  NS_LOG_FUNCTION (addr);
  Ipv6Address ret;
  uint8_t buf[2];
  uint8_t buf2[16];

  buf[0] = 0;
  addr.CopyTo (&buf[1]);

  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 "mac8-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 Mac8Address.

169

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

170

   * \param prefix the IPv6 prefix

171

   * \return autoconfigured IPv6 address

172

*/

173

  static Ipv6Address MakeAutoconfiguredAddress (Mac8Address 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 Mac8Address.

198

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

199

   * \return autoconfigured link-local IPv6 address

200

*/

201

  static Ipv6Address MakeAutoconfiguredLinkLocalAddress (Mac8Address 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




 * Author: Leonard Tracy <lentracy@gmail.com>
 */

#include "mac8-address.h"
#include "ns3/address.h"

namespace ns3 {

Mac8Address::Mac8Address ()
{
  m_address = 255;
}

Mac8Address::Mac8Address (uint8_t addr)
  : m_address (addr)
{
}

Mac8Address::~Mac8Address ()
{
}

uint8_t
Mac8Address::GetType (void)
{
  static uint8_t type = Address::Register ();
  return type;
}

Address
Mac8Address::ConvertTo (void) const
{
  return Address (GetType (), &m_address, 1);
}

Mac8Address
Mac8Address::ConvertFrom (const Address &address)
{
  NS_ASSERT (IsMatchingType (address));
  Mac8Address uAddr;
  address.CopyTo (&uAddr.m_address);
  return uAddr;
}

uint8_t
UanAddress::GetAsInt (void) const
{
  return m_address;
}
bool
Mac8Address::IsMatchingType (const Address &address)
{
  return address.CheckCompatible (GetType (), 1);
}

Mac8Address::operator Address () const
{
  return ConvertTo ();
}

void
Mac8Address::CopyFrom (const uint8_t *pBuffer)
{
  m_address = *pBuffer;
}

void
Mac8Address::CopyTo (uint8_t *pBuffer) const
{
  *pBuffer = m_address;

}

Mac8Address
Mac8Address::GetBroadcast ()
{
  return Mac8Address (255);
}
Mac8Address
Mac8Address::Allocate ()
{
  static uint8_t nextAllocated = 0;


      nextAllocated = 0;
    }

  return Mac8Address (address);
}

bool
operator < (const Mac8Address &a, const Mac8Address &b)
{
  return a.m_address < b.m_address;
}

bool
operator == (const Mac8Address &a, const Mac8Address &b)
{
  return a.m_address == b.m_address;
}

bool
operator != (const Mac8Address &a, const Mac8Address &b)
{
  return !(a == b);
}

std::ostream&
operator<< (std::ostream& os, const Mac8Address & address)
{
  os << (int) address.m_address;
  return os;
}
std::istream&
operator>> (std::istream& is, Mac8Address & address)
{
  int x;
  is >> x;




 * Author: Leonard Tracy <lentracy@gmail.com>
 */

#ifndef MAC8_ADDRESS_H
#define MAC8_ADDRESS_H

#include "ns3/address.h"
#include <iostream>

namespace ns3 {

class Address;

/**
 * \ingroup network
 *
 * A class used for addressing MAC8 MAC's.
 *
 * This implementation uses a simple 8 bit flat addressing scheme.
 * It is unlikely that perceived underwater networks will soon

 * - the ocean is big), so this should provide adequate addressing
 * for most applications.
 */
class Mac8Address
{
public:
  /** Constructor */
  Mac8Address ();
  /**
   * Create Mac8Address object with address addr.
   *
   * \param addr Byte address to assign to this address.
   */
  Mac8Address (uint8_t addr);
  /** Destructor */
  virtual ~Mac8Address ();

  /**
   * Convert a generic address to a Mac8Address.
   *
   * \param address  Address to convert to Mac8Address address.
   * \return Mac8Address from Address.
   */
  static Mac8Address ConvertFrom (const Address &address);

  /**
   * Check that a generic Address is compatible with Mac8Address.
   *
   * \param address  Address to test.
   * \return True if address given is consistant with Mac8Address.
   */
  static bool IsMatchingType  (const Address &address);


   *
   * \param pBuffer
   */
  void CopyTo (uint8_t *pBuffer) const;

  /**
   * Convert to integer.
   *
   * \return 8 bit integer version of address.
   */
  uint8_t GetAsInt (void) const;

  /**
   * Get the broadcast address (255).
   *
   * \return Broadcast address.
   */
  static Mac8Address GetBroadcast (void);

  /**
   * Allocates Mac8Address from 0-254
   *
   * Will wrap back to 0 if more than 254 are allocated.
   * Excludes the broadcast address.
   *
   * \return The next sequential Mac8Address.
   */
  static Mac8Address Allocate ();


private:
  uint8_t m_address;  //!< The address.

  /**
   * Get the Mac8Address type.
   *
   * \return The type value.
   */

   */
  Address ConvertTo (void) const;

  friend bool operator <  (const Mac8Address &a, const Mac8Address &b);
  friend bool operator == (const Mac8Address &a, const Mac8Address &b);
  friend bool operator != (const Mac8Address &a, const Mac8Address &b);
  friend std::ostream& operator<< (std::ostream& os, const Mac8Address & address);
  friend std::istream& operator>> (std::istream& is, Mac8Address & address);

};  // class Mac8Address


/**

 * \param b Second address to compare.
 * \return True if a < b.
 */
bool operator < (const Mac8Address &a, const Mac8Address &b);

/**
 * Address comparison, equalit.

 * \param b Second address to compare.
 * \return True if a == b.
 */
bool operator == (const Mac8Address &a, const Mac8Address &b);

/**
 * Address comparison, unequal.

 * \param b Second address to compare.
 * \return True if a != b.
 */
bool operator != (const Mac8Address &a, const Mac8Address &b);

/**
 * Write \pname{address} to stream \pname{os} as 8 bit integer.

 * \param address The address
 * \return The output stream.
 */
std::ostream& operator<< (std::ostream& os, const Mac8Address & address);

/**
 * Read \pname{address} from stream \pname{is} as 8 bit integer.

 * \param address The address variable to set.
 * \return The input stream.
 */
std::istream& operator>> (std::istream& is, Mac8Address & address);

} // namespace ns3

#endif /* MAC8_ADDRESS_H */

(-)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/mac8-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/mac8-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 (Mac8Address::IsMatchingType (addr))

2103

2104

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

2105

2102

2106

2103

  if (ipv6Addr.IsAny ())

2107

  if (ipv6Addr.IsAny ())

2104

2108

(-)a/src/uan/helper/uan-helper.cc (-1 / +1 lines)

Lines 242-248 UanHelper::Install (Ptr<Node> node, Ptr<UanChannel> channel) const	Link Here

242

  Ptr<UanPhy> phy = m_phy.Create<UanPhy> ();

242

  Ptr<UanPhy> phy = m_phy.Create<UanPhy> ();

243

  Ptr<UanTransducer> trans = m_transducer.Create<UanTransducer> ();

243

  Ptr<UanTransducer> trans = m_transducer.Create<UanTransducer> ();

244

245

  mac->SetAddress (UanAddress::Allocate ());

245

  mac->SetAddress (Mac8Address::Allocate ());

246

  device->SetMac (mac);

246

  device->SetMac (mac);

247

  device->SetPhy (phy);

247

  device->SetPhy (phy);

248

  device->SetTransducer (trans);

248

  device->SetTransducer (trans);

(-)a/src/uan/model/uan-header-common.cc (-19 / +57 lines)

Lines 19-25	Link Here

*/

*/

#include "uan-header-common.h"

#include "uan-header-common.h"

#include "uan-address.h"

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

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

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

#include "src/network/utils/mac8-address.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 Mac8Address src, const Mac8Address dest, uint8_t type, uint8_t protocolNumber)

  : Header (),

  : Header (),

    m_dest (dest),

  m_dest (dest),

    m_src (src),

  m_src (src)

    m_type (type)

  SetProtocolNumber (protocolNumber);

  m_uanProtocolBits.m_type = type;

TypeId

TypeId

Lines 60-71 UanHeaderCommon::~UanHeaderCommon ()	Link Here

void

void

UanHeaderCommon::SetDest (UanAddress dest)

UanHeaderCommon::SetDest (Mac8Address dest)

  m_dest = dest;

  m_dest = dest;

void

void

UanHeaderCommon::SetSrc (UanAddress src)

UanHeaderCommon::SetSrc (Mac8Address src)

  m_src = src;

  m_src = src;

Lines 73-87 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)

  if(protocolNumber == 0)

    m_uanProtocolBits.m_protocolNumber = 0;

  else if(protocolNumber == Ipv4L3Protocol::PROT_NUMBER)

    m_uanProtocolBits.m_protocolNumber = 1;

  else if(protocolNumber == ArpL3Protocol::PROT_NUMBER)

    m_uanProtocolBits.m_protocolNumber = 2;

  else if(protocolNumber == Ipv6L3Protocol::PROT_NUMBER)

    m_uanProtocolBits.m_protocolNumber = 3;

  else

    NS_ASSERT_MSG (false, "UanHeaderCommon::SetProtocolNumber(): Protocol not supported");

UanAddress

Mac8Address

UanHeaderCommon::GetDest (void) const

UanHeaderCommon::GetDest (void) const

  return m_dest;

100

  return m_dest;

101

UanAddress

102

Mac8Address

UanHeaderCommon::GetSrc (void) const

103

UanHeaderCommon::GetSrc (void) const

104

  return m_src;

105

  return m_src;

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

uint8_t

107

uint8_t

UanHeaderCommon::GetType (void) const

108

UanHeaderCommon::GetType (void) const

109

  return m_type;

110

  return m_uanProtocolBits.m_type;

111

112

113

uint16_t

114

UanHeaderCommon::GetProtocolNumber (void) const

115

116

  if(m_uanProtocolBits.m_protocolNumber == 1)

117

    return Ipv4L3Protocol::PROT_NUMBER;

118

  if(m_uanProtocolBits.m_protocolNumber == 2)

119

    return ArpL3Protocol::PROT_NUMBER;

120

  if(m_uanProtocolBits.m_protocolNumber == 3)

121

    return Ipv6L3Protocol::PROT_NUMBER;

122

  return 0;

123

124

// Inherrited methods

125

// Inherrited methods

Lines 103-111 UanHeaderCommon::GetSerializedSize (void) const	Link Here

103

void

133

void

104

UanHeaderCommon::Serialize (Buffer::Iterator start) const

134

UanHeaderCommon::Serialize (Buffer::Iterator start) const

105

135

106

  start.WriteU8 (m_src.GetAsInt ());

136

  uint8_t address = 0;

107

  start.WriteU8 (m_dest.GetAsInt ());

137

  m_src.CopyTo (&address);

108

  start.WriteU8 (m_type);

138

  start.WriteU8 (address);

139

  m_dest.CopyTo (&address);

140

  start.WriteU8 (address);

141

  char tmp = m_uanProtocolBits.m_type;

142

  tmp = tmp << 4;

143

  tmp += m_uanProtocolBits.m_protocolNumber;

144

  start.WriteU8 (tmp);

109

145

110

146

111

uint32_t

147

uint32_t

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

113

149

114

  Buffer::Iterator rbuf = start;

150

  Buffer::Iterator rbuf = start;

115

151

116

  m_src = UanAddress (rbuf.ReadU8 ());

152

  m_src = Mac8Address (rbuf.ReadU8 ());

117

  m_dest = UanAddress (rbuf.ReadU8 ());

153

  m_dest = Mac8Address (rbuf.ReadU8 ());

118

  m_type = rbuf.ReadU8 ();

154

  char tmp = rbuf.ReadU8 ();

155

  m_uanProtocolBits.m_type = tmp >> 4;

156

  m_uanProtocolBits.m_protocolNumber = tmp;

119

157

120

  return rbuf.GetDistanceFrom (start);

158

  return rbuf.GetDistanceFrom (start);

121

159

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

123

void

161

void

124

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

162

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

125

163

126

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

164

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

127

165

128

166

129

167




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

namespace ns3 {

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

/**
 * \ingroup uan
 *
 * Common packet header fields.
 *
 *  1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8 1 2 3 4 5 6 7 8
 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 * |    src addr   |    dst addr   | prtcl |  type |
 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 *
 *
 * src addr: The MAC8 source address
 *
 * dst addr: The MAC8 destination address
 *
 * prtcl: The layer 3 protocol
 * prtcl=1 (IPv4)
 * prtcl=2 (ARP)
 * prtcl=3 (IPv6)
 *
 * type: The type field is MAC protocol specific
 */
class UanHeaderCommon : public Header
{

   * \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 Mac8Address src, const Mac8Address dest, uint8_t type, uint8_t protocolNumber);
  /** Destructor */
  virtual ~UanHeaderCommon ();


   *
   * \param dest Address of destination node.
   */
  void SetDest (Mac8Address dest);
  /**
   * Set the source address.
   *
   * \param src Address of packet source node.
   */
  void SetSrc (Mac8Address src);
  /**
   * Set the header type.
   *

   * \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 Mac8Address in destination field.
   */
  Mac8Address GetDest (void) const;
  /**
   * Get the source address
   *
   * \return Mac8Address in source field.
   */
  Mac8Address GetSrc (void) const;
  /**
   * Get the header type value.
   *
   * \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;

  virtual void Print (std::ostream &os) const;
  virtual TypeId GetInstanceTypeId (void) const;
private:
  Mac8Address m_dest;  //!< The destination address.
  Mac8Address m_src;   //!< The source address.
  UanProtocolBits m_uanProtocolBits;  //!< The type and protocol bits

};  // class UanHeaderCommon







#include "uan-header-rc.h"
#include "src/network/utils/mac8-address.h"

#include <set>


    m_timeStampRts (Seconds (0)),
    m_retryNo (0),
    m_delay (Seconds (0)),
    m_address (Mac8Address::GetBroadcast ())
{

}

UanHeaderRcCts::UanHeaderRcCts (uint8_t frameNo, uint8_t retryNo, Time ts, Time delay, Mac8Address addr)
  : Header (),
    m_frameNo (frameNo),
    m_timeStampRts (ts),

}

void
UanHeaderRcCts::SetAddress (Mac8Address addr)
{
  m_address = addr;
}

  return m_retryNo;
}

Mac8Address
UanHeaderRcCts::GetAddress () const
{
  return m_address;

void
UanHeaderRcCts::Serialize (Buffer::Iterator start) const
{
  uint8_t address = 0;
  m_address.CopyTo (&address);
  start.WriteU8 (address);
  start.WriteU8 (m_frameNo);
  start.WriteU8 (m_retryNo);
  start.WriteU32 ((uint32_t)(m_timeStampRts.GetSeconds () * 1000.0 + 0.5));

UanHeaderRcCts::Deserialize (Buffer::Iterator start)
{
  Buffer::Iterator rbuf = start;
  m_address = Mac8Address (rbuf.ReadU8 ());
  m_frameNo = rbuf.ReadU8 ();
  m_retryNo = rbuf.ReadU8 ();
  m_timeStampRts = Seconds ( ( (double) rbuf.ReadU32 ()) / 1000.0 );





#include "ns3/header.h"
#include "ns3/nstime.h"
#include "ns3/mac8-address.h"

#include <set>


   * \param addr Destination of CTS packet.
   * \note Times are serialized, with ms precission, into 32 bit fields.
   */
  UanHeaderRcCts (uint8_t frameNo, uint8_t retryNo, Time rtsTs, Time delay, Mac8Address addr);
  /** Destructor */
  virtual ~UanHeaderRcCts ();


   *
   * \param addr The destination address.
   */
  void SetAddress (Mac8Address addr);

  /**
   * Get the frame number of the RTS being cleared.

   *
   * \return The destination address.
   */
  Mac8Address GetAddress (void) const;

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

  Time m_timeStampRts;   //!< RX time of RTS packet at gateway.
  uint8_t m_retryNo;     //!< Retry number of received RTS packet.
  Time m_delay;          //!< Delay until transmission.
  Mac8Address m_address;  //!< Destination of CTS packet.

};  // class UanHeaderRcCts






#include "uan-mac-aloha.h"
#include "uan-tx-mode.h"
#include "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 " << Mac8Address::ConvertFrom (GetAddress ()) << " Queueing packet for " << Mac8Address::ConvertFrom (dest));

  if (!m_phy->IsStateTx ())
    {
      Mac8Address src = Mac8Address::ConvertFrom (GetAddress ());
      Mac8Address udest = Mac8Address::ConvertFrom (dest);

      UanHeaderCommon header;
      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 Mac8Address&> cb)
{
  m_forUpCb = cb;
}

  pkt->RemoveHeader (header);
  NS_LOG_DEBUG ("Receiving packet from " << header.GetSrc () << " For " << header.GetDest ());

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

}

void
UanMacAloha::RxPacketError (Ptr<Packet> pkt, double sinr)
{
  NS_LOG_DEBUG ("" << Simulator::Now () << " MAC " << Mac8Address::ConvertFrom (GetAddress ()) << " Received packet in error with sinr " << sinr);
}

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

int64_t




#define UAN_MAC_ALOHA_H

#include "uan-mac.h"
#include "ns3/mac8-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 Mac8Address&> 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);

private:
  /** The MAC address. */
  Mac8Address m_address;
  /** PHY layer attached to this MAC. */
  Ptr<UanPhy> m_phy;
  /** Forwarding up callback. */
  Callback<void, Ptr<Packet>, uint16_t, const Mac8Address& > 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)

        NS_ASSERT (!m_pktTx);

        UanHeaderCommon header;
        header.SetDest (Mac8Address::ConvertFrom (dest));
        header.SetSrc (m_address);
        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 Mac8Address&> cb)
{
  m_forwardUpCb = cb;
}

  m_phy->RegisterListener (this);
}

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


void
UanMacCw::NotifyRxStart (void)
{

  UanHeaderCommon header;
  packet->RemoveHeader (header);

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




#include "ns3/simulator.h"
#include "ns3/uan-phy.h"
#include "ns3/uan-tx-mode.h"
#include "ns3/mac8-address.h"
#include "ns3/random-variable-stream.h"

namespace ns3 {

  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 Mac8Address&> 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 Mac8Address&> m_forwardUpCb;
  /** The MAC address. */
  Mac8Address m_address;
  /** PHY layer attached to this MAC. */
  Ptr<UanPhy> m_phy;
  /** A packet destined for this MAC was received. */




      m_phy = 0;
    }
  m_propDelay.clear ();
  std::map<Mac8Address, AckData>::iterator it = m_ackData.begin ();
  for (; it != m_ackData.end (); it++)
    {
      it->second.rxFrames.clear ();

  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 Mac8Address&> cb)
{
  m_forwardUpCb = cb;
}

{
}

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

void
UanMacRcGw::ReceivePacket (Ptr<Packet> pkt, double sinr, UanTxMode mode)
{
  UanHeaderCommon ch;
  pkt->PeekHeader (ch);

  if (ch.GetDest () == m_address || ch.GetDest () == Mac8Address::GetBroadcast ())
    {
      m_rxLogger (pkt, 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:

            req.length = rh.GetLength ();
            NS_LOG_DEBUG (Simulator::Now ().GetSeconds () << " GW storing reservation from " << ch.GetSrc () << " with length " << req.length);
            m_requests.insert (std::make_pair (ch.GetSrc (), req));
            std::map<Mac8Address, Time>::iterator it = m_propDelay.find (ch.GetSrc ());
            if (it == m_propDelay.end ())
              {
                m_sortedRes.insert (std::make_pair (m_maxDelta, ch.GetSrc ()));

  double pDelay = 0;
  if (numRts > 0)
    {
      std::map<Mac8Address, Request>::iterator rit = m_requests.begin ();
      for (; rit != m_requests.end (); rit++)
        {
          totalBytes += (*rit).second.length;

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

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

  m_state = CTSING;
  Simulator::Schedule (nextEarliest, &UanMacRcGw::CycleStarted, this);

  std::set<std::pair<Time, Mac8Address> >::iterator it = m_sortedRes.begin ();
  Time minPdelay = (*it).first;
  Ptr<Packet> cts = Create<Packet> ();


      AckData newData;
      newData.expFrames = req.numFrames;
      newData.frameNo = req.frameNo;
      Mac8Address dest = (*it).second;
      m_ackData.insert (std::make_pair (dest, newData));

      Time earliestArr = ctsTxTimeTotal + pdelay + pdelay + m_sifs;

  ctsg.SetWindowTime (Seconds (effWinSize));
  ctsg.SetTxTimeStamp (Simulator::Now ());
  UanHeaderCommon ch;
  ch.SetDest (Mac8Address::GetBroadcast ());
  ch.SetSrc (m_address);
  ch.SetType (UanMacRc::TYPE_CTS);
  cts->AddHeader (ctsg);


  Time ackTime = Seconds (m_ackSize * 8.0 / m_phy->GetMode (m_currentRateNum).GetDataRateBps ());

  std::map<Mac8Address, AckData>::iterator it = m_ackData.begin ();
  for (; it != m_ackData.end (); it++)
    {
      Mac8Address dest = (*it).first;
      AckData &data = (*it).second;

      std::list<uint32_t> toNack;

{
  uint32_t n = m_numNodes;
  std::vector<double> pds;
  std::map<Mac8Address, Time>::iterator pdit = m_propDelay.begin ();

  for (; pdit != m_propDelay.end (); pdit++)
    {




#define UAN_MAC_RC_GW_H

#include "uan-mac.h"
#include "ns3/mac8-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 Mac8Address&> 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 Mac8Address&> m_forwardUpCb;
  
  Ptr<UanPhy> m_phy;            //!< PHY layer attached to this MAC.
  Mac8Address m_address;         //!< The MAC address.
  Time m_maxDelta;              //!< Maximum propagation delay between gateway and non-gateway nodes .
  Time m_sifs;                  //!< Spacing between frames to account for timing error and processing delay.
  uint32_t m_maxRes;            //!< Maximum number of reservations to accept per cycle.

  double m_retryStep;           //!< Retry rate increment.

  /** Propagation delay to each node. */
  std::map<Mac8Address, Time> m_propDelay;

  /** AckData for each node. */
  std::map<Mac8Address, AckData> m_ackData;

  /** Request for each node. */
  std::map<Mac8Address, Request> m_requests;
  /** Queued request times. */
  std::set<std::pair<Time, Mac8Address> > m_sortedRes;

  /** Flag when we've been cleared. */
  bool m_cleared;





}

Reservation::Reservation (std::list<std::pair <Ptr<Packet>, Mac8Address > > &list, uint8_t frameNo, uint32_t maxPkts)
  : m_frameNo (frameNo),
    m_retryNo (0),
    m_transmitted (false)


Reservation::~Reservation ()
{
  std::list<std::pair <Ptr<Packet>, Mac8Address > >::iterator it;
  for (it = m_pktList.begin (); it != m_pktList.end (); it++)
    {
      it->first = Ptr<Packet> ((Packet *) 0);

  return m_length;
}

const std::list<std::pair <Ptr<Packet>, Mac8Address > > &
Reservation::GetPktList (void) const
{
  return m_pktList;

      m_phy->Clear ();
      m_phy = 0;
    }
  std::list<std::pair <Ptr<Packet>, Mac8Address > >::iterator it;
  for (it = m_pktQueue.begin (); it != m_pktQueue.end (); it++)
    {
      it->first = 0;

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

      return false;
    }

  m_pktQueue.push_back (std::make_pair (packet, Mac8Address::ConvertFrom (dest)));

  switch (m_state)
    {

}

void
UanMacRc::SetForwardUpCb (Callback<void, Ptr<Packet>, uint16_t, const Mac8Address&> 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)
{

  UanHeaderCommon ch;
  pkt->RemoveHeader (ch);
  if (ch.GetDest () == m_address || ch.GetDest () == Mac8Address::GetBroadcast ())
    {
      m_rxLogger (pkt, 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:

          }

        UanHeaderRcCts ctsh;
        ctsh.SetAddress (Mac8Address::GetBroadcast ());
        while (pkt->GetSize () > 0)
          {
            pkt->RemoveHeader (ctsh);


  Time frameDelay = Seconds (0);

  const std::list<std::pair <Ptr<Packet>, Mac8Address > > l = it->GetPktList ();
  std::list<std::pair <Ptr<Packet>, Mac8Address > >::const_iterator pit;
  pit = l.begin ();



    }
  if (ah.GetNoNacks () > 0)
    {
      const std::list<std::pair <Ptr<Packet>, Mac8Address > > l = it->GetPktList ();
      std::list<std::pair <Ptr<Packet>, Mac8Address > >::const_iterator pit;
      pit = l.begin ();

      const std::set<uint8_t> &nacks = ah.GetNackedFrames ();

    {
      Ptr<Packet> pkt = Create<Packet> (0);
      pkt->AddHeader (CreateRtsHeader (res));
      pkt->AddHeader (UanHeaderCommon (m_address, Mac8Address::GetBroadcast (), static_cast<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, Mac8Address::GetBroadcast (), static_cast<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, Mac8Address::GetBroadcast (), static_cast<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, Mac8Address::GetBroadcast (), static_cast<uint8_t> (TYPE_RTS), 0));
      SendPacket (pkt,m_currentRate + m_numRates);

    }




#define UAN_MAC_RC_H

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

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

   * \param maxPkts Maximum number of packets to assign to reservation
   *   from packet list (0 = no maximum).
   */
  Reservation (std::list<std::pair <Ptr<Packet>, Mac8Address > > &list, uint8_t frameNo, uint32_t maxPkts = 0);
  /** Destructor */
  ~Reservation ();
  /**

   *
   * \return The list of packets.
   */
  const std::list<std::pair <Ptr<Packet>, Mac8Address > > &GetPktList (void) const;
  /**
   * Get the frame number.
   * 


private:
  /** Queued packets for each address. */
  std::list<std::pair <Ptr<Packet>, Mac8Address > > m_pktList;
  /** Total length of queued packets. */
  uint32_t m_length;
  /** Frame number. */

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


  bool m_rtsBlocked;       //!< RTS blocked while processing ACK.

  EventId m_startAgain;    //!< (Unused).
  Mac8Address m_address;    //!< My addrese.s
  double m_retryRate;      //!< Number of retry attempts per second (of RTS/GWPING.
  Mac8Address m_assocAddr;  //!< Next hop address.
  Ptr<UanPhy> m_phy;       //!< PHY layer attached to this MAC.
  uint32_t m_numRates;     //!< Number of rates per Phy layer.
  uint32_t m_currentRate;  //!< Rate number corresponding to data rate of current cycle.

  bool m_cleared;          //!< Flag when we've been cleared.

  /** Pending packets. */
  std::list<std::pair <Ptr<Packet>, Mac8Address > > m_pktQueue;
  /** List of scheduled reservations. */
  std::list<Reservation> m_resList;

  /** The callback to forward a packet up to higher layer. */
  Callback<void, Ptr<Packet>, uint16_t, const Mac8Address&> 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 (Mac8Address addr)

  m_address=addr;

Address

UanMac::GetBroadcast (void) const

  Mac8Address broadcast = Mac8Address (255);

  return broadcast;

} // namespace ns3

} // namespace ns3

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

Lines 28-33	Link Here

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/ptr.h"

#include "ns3/ptr.h"

#include "ns3/mac8-address.h"

namespace ns3 {

namespace ns3 {

Lines 36-42 class UanChannel;	Link Here

class UanNetDevice;

class UanNetDevice;

class UanTransducer;

class UanTransducer;

class UanTxMode;

class UanTxMode;

class UanAddress;

class Mac8Address;

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 59-82 public:	Link Here

   * \return MAC Address.

   * \return MAC Address.

*/

*/

  virtual Address GetAddress (void) = 0;

  virtual Address GetAddress (void);

/**

/**

   * Set the address.

   * Set the address.

   * \param addr UanAddress for this MAC.

   * \param addr Mac8Address for this MAC.

*/

*/

  virtual void SetAddress (UanAddress addr) = 0;

  virtual void SetAddress (Mac8Address addr);

/**

/**

   * Enqueue packet to be transmitted.

   * Enqueue packet to be transmitted.

   * \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 Mac8Address&> cb) = 0;

/**

/**

   * Attach PHY layer to this MAC.

   * Attach PHY layer to this MAC.

Lines 101-107 public:	Link Here

101

104

102

   * \return The broadcast address.

105

   * \return The broadcast address.

103

*/

106

*/

104

  virtual Address GetBroadcast (void) const = 0;

107

  virtual Address GetBroadcast (void) const;

105

108

106

  /** Clears all pointer references. */

109

  /** Clears all pointer references. */

107

  virtual void Clear (void) = 0;

110

  virtual void Clear (void) = 0;

Lines 125-130 public:	Link Here

125

  typedef void (* PacketModeTracedCallback)

128

  typedef void (* PacketModeTracedCallback)

126

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

129

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

127

130

131

  uint32_t GetTxModeIndex ();

132

  void SetTxModeIndex (uint32_t txModeIndex);

133

134

private:

135

  /** Modulation type */

136

  uint32_t m_txModeIndex;

137

  /** The MAC address. */

138

  Mac8Address m_address;

139

128

};  // class UanMac

140

};  // class UanMac

129

141

130

} // namespace ns3

142

} // 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);
  Mac8Address 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 Mac8Address &src)
{
  NS_LOG_DEBUG ("Forwarding packet up to application");
  m_rxLogger (pkt, src);
  m_forwardUp (this, pkt, protocolNumber, src);

}


UanNetDevice::SetAddress (Address address)
{
  NS_ASSERT_MSG (0, "Tried to set MAC address with no MAC");
  m_mac->SetAddress (Mac8Address::ConvertFrom (address));
}

void




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

namespace ns3 {

   * \param [in] address The source address.
   */
  typedef void (* RxTxTracedCallback)
    (Ptr<const Packet> packet, Mac8Address address);
  
private:
  /**

   *
   * \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 Mac8Address &src);
  
  /** \return The channel attached to this device. */
  Ptr<UanChannel> DoGetChannel (void) const;

  ReceiveCallback m_forwardUp;     //!< The receive callback.

  /** Trace source triggered when forwarding up received payload from the MAC layer. */
  TracedCallback<Ptr<const Packet>, Mac8Address> m_rxLogger;
  /** Trace source triggered when sending to the MAC layer */
  TracedCallback<Ptr<const Packet>, Mac8Address> m_txLogger;

  /** Flag when we've been cleared. */
  bool m_cleared;

(-)a/src/uan/test/uan-test.cc (-1 / +1 lines)

Lines 125-131 UanTest::CreateNode (Vector pos, Ptr<UanChannel> chan)	Link Here

125

126

  mobility->SetPosition (pos);

126

  mobility->SetPosition (pos);

127

  node->AggregateObject (mobility);

127

  node->AggregateObject (mobility);

128

  mac->SetAddress (UanAddress::Allocate ());

128

  mac->SetAddress (Mac8Address::Allocate ());

129

130

  dev->SetPhy (phy);

130

  dev->SetPhy (phy);

131

  dev->SetMac (mac);

131

  dev->SetMac (mac);

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