Attachment #473 for bug #569

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

(-)a/examples/tap-wifi-dumbbell.cc (-1 / +1 lines)

Lines 231-237 main (int argc, char *argv[])	Link Here

231

  apps = sink.Install (nodesRight.Get (0));

231

  apps = sink.Install (nodesRight.Get (0));

232

  apps.Start (Seconds (1.0));

232

  apps.Start (Seconds (1.0));

233

234

  CsmaHelper::EnablePcapAll ("tap-dumbbell", false);

234

  CsmaHelper::EnablePcapAll ("tap-wifi-dumbbell", false);

235

  GlobalRouteManager::PopulateRoutingTables ();

235

  GlobalRouteManager::PopulateRoutingTables ();

236

237

  Simulator::Stop (Seconds (60.));

237

  Simulator::Stop (Seconds (60.));

(-)a/src/devices/bridge/bridge-net-device.cc (+7 lines)

Lines 278-283 BridgeNetDevice::GetChannel (void) const	Link Here

278

  return m_channel;

278

  return m_channel;

279

280

281

void

282

BridgeNetDevice::SetAddress (Address address)

283

284

  NS_LOG_FUNCTION_NOARGS ();

285

  m_address = Mac48Address::ConvertFrom (address);

286

287

281

Address

288

Address

282

BridgeNetDevice::GetAddress (void) const

289

BridgeNetDevice::GetAddress (void) const

283

290

(-)a/src/devices/bridge/bridge-net-device.h (+1 lines)

Lines 91-96 public:	Link Here

  virtual void SetIfIndex(const uint32_t index);

  virtual void SetIfIndex(const uint32_t index);

  virtual uint32_t GetIfIndex(void) const;

  virtual uint32_t GetIfIndex(void) const;

  virtual Ptr<Channel> GetChannel (void) const;

  virtual Ptr<Channel> GetChannel (void) const;

  virtual void SetAddress (Address address);

  virtual Address GetAddress (void) const;

  virtual Address GetAddress (void) const;

  virtual bool SetMtu (const uint16_t mtu);

  virtual bool SetMtu (const uint16_t mtu);

  virtual uint16_t GetMtu (void) const;

  virtual uint16_t GetMtu (void) const;




CsmaNetDevice::GetFrameSize (void) const
{
  return m_frameSize;
}

  void 
CsmaNetDevice::SetAddress (Mac48Address self)
{
  NS_LOG_FUNCTION (self);
  m_address = self;
}

  void

  return m_channel;
}

  void
CsmaNetDevice::SetAddress (Address address)
{
  NS_LOG_FUNCTION_NOARGS ();
  m_address = Mac48Address::ConvertFrom (address);
}

  Address 
CsmaNetDevice::GetAddress (void) const
{




  void SetReceiveEnable (bool enable);

  /**
   * Set the MAC address of the the network device.
   *
   * \param addr The Mac48Address to use as the address of the device.
   */
  void SetAddress (Mac48Address addr);

  /**
   * Set The max frame size of packets sent over this device.
   *
   * Okay, that was easy to say, but the details are a bit thorny.  We have a MAC-level MTU that is the payload that higher 

  virtual Ptr<Channel> GetChannel (void) const;
  virtual bool SetMtu (const uint16_t mtu);
  virtual uint16_t GetMtu (void) const;
  virtual void SetAddress (Address address);
  virtual Address GetAddress (void) const;
  virtual bool IsLinkUp (void) const;
  virtual void SetLinkChangeCallback (Callback<void> callback);

(-)a/src/devices/emu/emu-net-device.cc (-3 / +3 lines)

Lines 876-885 EmuNetDevice::GetChannel (void) const	Link Here

876

877

878

void

878

void

879

EmuNetDevice::SetAddress (Mac48Address addr)

879

EmuNetDevice::SetAddress (Address address)

880

881

  NS_LOG_FUNCTION (addr);

881

  NS_LOG_FUNCTION (address);

882

  m_address = addr;

882

  m_address = Mac48Address::ConvertFrom (address);

883

884

885

Address

885

Address




   */
  void SetQueue (Ptr<Queue> queue);

  /**
   * Assign a MAC address to this device.
   *
   * @see Mac48Address
   * @param addr The new address.
   */
  void SetAddress (Mac48Address addr);

//
// Pure virtual methods inherited from NetDevice we must implement.
//

  virtual uint32_t GetIfIndex(void) const;

  virtual Ptr<Channel> GetChannel (void) const;

  virtual void SetAddress (Address address);
  virtual Address GetAddress (void) const;

  virtual bool SetMtu (const uint16_t mtu);

(-)a/src/devices/point-to-point/point-to-point-net-device.cc (-2 / +3 lines)

Lines 395-404 PointToPointNetDevice::GetChannel (void)	Link Here

395

// information.  However, the base class NetDevice wants us to define the

395

// information.  However, the base class NetDevice wants us to define the

396

// methods to get and set the address.  Rather than be rude and assert, we let

396

// methods to get and set the address.  Rather than be rude and assert, we let

397

// clients get and set the address, but simply ignore them.

397

// clients get and set the address, but simply ignore them.

398

  void

399

  void

399

PointToPointNetDevice::SetAddress (Mac48Address addr)

400

PointToPointNetDevice::SetAddress (Address address)

400

401

  m_address = addr;

402

  m_address = Mac48Address::ConvertFrom (address);

402

403

404

  Address

405

  Address




  void Receive (Ptr<Packet> p);

  /**
   * Assign a MAC address to this device.
   *
   * @see Mac48Address
   * @param addr The new address.
   */
  void SetAddress (Mac48Address addr);

  /**
   * Set The max frame size of packets sent over this device.
   *
   * Okay, that was easy to say, but the details are a bit thorny.  We have a MAC-level MTU that is the payload that higher 

  virtual uint32_t GetIfIndex(void) const;

  virtual Ptr<Channel> GetChannel (void) const;

  virtual void SetAddress (Address address);
  virtual Address GetAddress (void) const;

  virtual bool SetMtu (const uint16_t mtu);




  m_startEvent (),
  m_stopEvent (),
  m_readThread (0),
  m_ns3AddressRewritten (false)
{
  NS_LOG_FUNCTION_NOARGS ();
  Start (m_tStart);

          return;
        }

      NS_LOG_INFO ("TapBridge::ReadThread(): Received packet on node " << m_node->GetId ());
      NS_LOG_INFO ("TapBridge::ReadThread(): Scheduling handler");
      DynamicCast<RealtimeSimulatorImpl> (Simulator::GetImplementation ())->ScheduleRealtimeNow (
        MakeEvent (&TapBridge::ForwardToBridgedDevice, this, buf, len));

      //
      NS_ASSERT_MSG (Mac48Address::ConvertFrom (src) != Mac48Address ("ff:ff:ff:ff:ff:ff"), 
                     "TapBridge::ForwardToBridgedDevice:  Source addr is broadcast");
      if (m_ns3AddressRewritten == false)
        {
          //
          // Set the ns-3 device's mac address to the overlying container's
          // mac address
          //
          Mac48Address learnedMac = Mac48Address::ConvertFrom (src);
          NS_LOG_LOGIC ("Learned MacAddr is " << learnedMac << ": setting ns-3 device to use this address");
          m_bridgedDevice->SetAddress (Mac48Address::ConvertFrom (learnedMac));
          m_ns3AddressRewritten = true;
        }
      // 
      // If we are operating in USE_LOCAL mode, we may be attached to an ns-3
      // device that does not support bridging (SupportsSendFrom returns false).
      // But, since the mac addresses are now aligned, we can call Send()
      // only packets from one source MAC to flow across the TapBridge in this 
      // mode and will spoof that address when packets flow the other way.  
      // Since we will be doing this spoofing, we can relax the normal bridged
      // device requirement to support SendFrom and use Send.
      //
      NS_LOG_LOGIC ("Forwarding packet to ns-3 device via Send()");
      m_bridgedDevice->Send (packet, dst, type);

    }

  //
  // We need to disconnect the bridged device from the internet stack on our
  // node to ensure that only one stack responds to packets inbound over the
  // bridged device.  That one stack lives outside ns-3 so we just blatantly
  // steal the device callbacks.
  //
  // N.B This can be undone if someone does a RegisterProtocolHandler later 
  // on this node.
  //
  bridgedDevice->SetReceiveCallback (MakeCallback (&TapBridge::DiscardFromBridgedDevice, this));
  bridgedDevice->SetPromiscReceiveCallback (MakeCallback (&TapBridge::ReceiveFromBridgedDevice, this));
  m_bridgedDevice = bridgedDevice;
}

bool
TapBridge::DiscardFromBridgedDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol, const Address &src)
{
  NS_LOG_FUNCTION (device << packet << protocol << src);
  NS_LOG_LOGIC ("Discarding packet stolen from bridged device " << device);
  return true;
}

bool
TapBridge::ReceiveFromBridgedDevice (
  Ptr<NetDevice> device, 
  Ptr<const Packet> packet, 
  uint16_t protocol,
  const Address &src, 
  const Address &dst, 
  PacketType packetType)
{
  NS_LOG_FUNCTION (device << packet << protocol << src << dst << packetType);

      // we want to act like a bridge and forward these PACKET_OTHERHOST 
      // packets.
      //
      return true;
    }

  //
  // We have received a packet from the ns-3 net device that has been associated
  // with this bridge.  We want to take these bits and send them off to the tap
  // device on the Linux host.  The only question we have to answer is, what 
  // should the destination address be?
  //
  // If we are in CONFIGURE_LOCAL mode, then the destination address is just
  // left alone since it can only be the shared single MAC address, broadcast
  // or multicast.
  //
  // If we are in USE_LOCAL mode, then we need to spoof the destination 
  // address with the one we saved.
  //
  // If we are in USE_BRIDGE mode, then we need to do the equvalent of a 
  // SendFrom and leave the source and destination alone.
  //
  Mac48Address from = Mac48Address::ConvertFrom (src);
  Mac48Address to = Mac48Address::ConvertFrom (dst);
  if (m_mode == USE_LOCAL)
    {
      to = Mac48Address::ConvertFrom (m_learnedMac);
    }
  else 
    {
      to = Mac48Address::ConvertFrom (dst);
    }

  Ptr<Packet> p = packet->Copy ();
  EthernetHeader header = EthernetHeader (false);

  NS_LOG_LOGIC ("Pkt destination is " << header.GetDestination ());
  NS_LOG_LOGIC ("Pkt LengthType is " << header.GetLengthType ());
  NS_LOG_LOGIC ("Pkt size is " << p->GetSize ());
  NS_LOG_LOGIC ("End of receive packet handling on node " << m_node->GetId ());

  uint32_t bytesWritten = write (m_sock, p->PeekData (), p->GetSize ());
  NS_ABORT_MSG_IF (bytesWritten != p->GetSize (), "TapBridge::ReceiveFromBridgedDevice(): Write error.");
  return true;
}

void 

{
  NS_LOG_FUNCTION_NOARGS ();
  return 0;
}

void
TapBridge::SetAddress (Address address)
{
  NS_LOG_FUNCTION (address);
  m_address = Mac48Address::ConvertFrom (address);
}

Address 

(-)a/src/devices/tap-bridge/tap-bridge.h (-7 / +8 lines)

Lines 176-181 public:	Link Here

176

  virtual void SetIfIndex(const uint32_t index);

176

  virtual void SetIfIndex(const uint32_t index);

177

  virtual uint32_t GetIfIndex(void) const;

177

  virtual uint32_t GetIfIndex(void) const;

178

  virtual Ptr<Channel> GetChannel (void) const;

178

  virtual Ptr<Channel> GetChannel (void) const;

179

  virtual void SetAddress (Address address);

179

  virtual Address GetAddress (void) const;

180

  virtual Address GetAddress (void) const;

180

  virtual bool SetMtu (const uint16_t mtu);

181

  virtual bool SetMtu (const uint16_t mtu);

181

  virtual uint16_t GetMtu (void) const;

182

  virtual uint16_t GetMtu (void) const;

Lines 208-215 protected:	Link Here

208

*/

209

*/

209

  virtual void DoDispose (void);

210

  virtual void DoDispose (void);

210

211

  void ReceiveFromBridgedDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,

212

  bool ReceiveFromBridgedDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,

212

                                 Address const &src, Address const &dst, PacketType packetType);

213

                                 Address const &src, Address const &dst, PacketType packetType);

214

215

  bool DiscardFromBridgedDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol, Address const &src);

216

213

private:

217

private:

214

218

215

/**

219

/**

Lines 443-455 private:	Link Here

443

/**

447

/**

444

   * \internal

448

   * \internal

445

449

446

   * The MAC address of the local tap device is stored in this variable.

450

   * Whether the MAC address of the underlying ns-3 device has already been

447

   * When in UseLocal mode, this address is added back to the destination

451

   * rewritten is stored in this variable (for UseLocal mode only).

448

   * Mac address for frames destined to the tap device.  It is learned from

449

   * the first frame sent from the host to the TapBridge device.  In the

450

   * other modes of this device, this value is unused.

451

*/

452

*/

452

  Mac48Address m_learnedMac;

453

  bool m_ns3AddressRewritten;

453

454

};

455

};

455

456




                PacketType packetType);


  /**
   * Set the MAC address of the the network device.
   *
   * \param addr The Address to use as the address of the device.
   */
  void SetAddress (Address addr);

  // inherited from NetDevice base class.
  virtual void SetIfIndex(const uint32_t index);
  virtual uint32_t GetIfIndex(void) const;
  virtual Ptr<Channel> GetChannel (void) const;
  virtual void SetAddress (Address address);
  virtual Address GetAddress (void) const;
  virtual uint16_t GetMtu (void) const;
  virtual bool IsLinkUp (void) const;

(-)a/src/devices/wifi/wifi-net-device.cc (+5 lines)

Lines 156-161 WifiNetDevice::DoGetChannel (void) const	Link Here

156

WifiNetDevice::DoGetChannel (void) const

156

WifiNetDevice::DoGetChannel (void) const

157

158

  return m_phy->GetChannel ();

158

  return m_phy->GetChannel ();

159

160

void

161

WifiNetDevice::SetAddress (Address address)

162

163

  m_mac->SetAddress (Mac48Address::ConvertFrom (address));

159

164

160

Address

165

Address

161

WifiNetDevice::GetAddress (void) const

166

WifiNetDevice::GetAddress (void) const

(-)a/src/devices/wifi/wifi-net-device.h (+1 lines)

Lines 78-83 public:	Link Here

  virtual void SetIfIndex(const uint32_t index);

  virtual void SetIfIndex(const uint32_t index);

  virtual uint32_t GetIfIndex(void) const;

  virtual uint32_t GetIfIndex(void) const;

  virtual Ptr<Channel> GetChannel (void) const;

  virtual Ptr<Channel> GetChannel (void) const;

  virtual void SetAddress (Address address);

  virtual Address GetAddress (void) const;

  virtual Address GetAddress (void) const;

  virtual bool SetMtu (const uint16_t mtu);

  virtual bool SetMtu (const uint16_t mtu);

  virtual uint16_t GetMtu (void) const;

  virtual uint16_t GetMtu (void) const;

(-)a/src/internet-stack/icmpv4.h (-1 / +1 lines)

Lines 64-70 private:	Link Here

private:

private:

  uint16_t m_identifier;

  uint16_t m_identifier;

  uint16_t m_sequence;

  uint16_t m_sequence;

  uint8_t m_data[16];

  uint8_t m_data[64];

  uint32_t m_dataSize;

  uint32_t m_dataSize;

};

};

(-)a/src/internet-stack/loopback-net-device.cc (+6 lines)

Lines 91-96 LoopbackNetDevice::GetChannel (void) con	Link Here

LoopbackNetDevice::GetChannel (void) const

LoopbackNetDevice::GetChannel (void) const

  return 0;

  return 0;

void

LoopbackNetDevice::SetAddress (Address address)

  m_address = Mac48Address::ConvertFrom (address);

100

101

Address

102

Address

(-)a/src/internet-stack/loopback-net-device.h (+1 lines)

Lines 45-50 public:	Link Here

  virtual void SetIfIndex(const uint32_t index);

  virtual void SetIfIndex(const uint32_t index);

  virtual uint32_t GetIfIndex(void) const;

  virtual uint32_t GetIfIndex(void) const;

  virtual Ptr<Channel> GetChannel (void) const;

  virtual Ptr<Channel> GetChannel (void) const;

  virtual void SetAddress (Address address);

  virtual Address GetAddress (void) const;

  virtual Address GetAddress (void) const;

  virtual bool SetMtu (const uint16_t mtu);

  virtual bool SetMtu (const uint16_t mtu);

  virtual uint16_t GetMtu (void) const;

  virtual uint16_t GetMtu (void) const;

(-)a/src/internet-stack/tcp-test.cc (-1 / +1 lines)

Lines 303-309 TcpSocketImplTest::AddSimpleNetDevice (P	Link Here

303

TcpSocketImplTest::AddSimpleNetDevice (Ptr<Node> node, const char* ipaddr, const char* netmask)

303

TcpSocketImplTest::AddSimpleNetDevice (Ptr<Node> node, const char* ipaddr, const char* netmask)

304

305

  Ptr<SimpleNetDevice> dev = CreateObject<SimpleNetDevice> ();

305

  Ptr<SimpleNetDevice> dev = CreateObject<SimpleNetDevice> ();

306

  dev->SetAddress (Mac48Address::Allocate ());

306

  dev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));

307

  node->AddDevice (dev);

307

  node->AddDevice (dev);

308

  Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();

308

  Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();

309

  uint32_t ndid = ipv4->AddInterface (dev);

309

  uint32_t ndid = ipv4->AddInterface (dev);




  Ptr<SimpleNetDevice> rxDev1, rxDev2;
  { // first interface
    rxDev1 = CreateObject<SimpleNetDevice> ();
    rxDev1->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
    rxNode->AddDevice (rxDev1);
    Ptr<Ipv4> ipv4 = rxNode->GetObject<Ipv4> ();
    uint32_t netdev_idx = ipv4->AddInterface (rxDev1);


  { // second interface
    rxDev2 = CreateObject<SimpleNetDevice> ();
    rxDev2->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
    rxNode->AddDevice (rxDev2);
    Ptr<Ipv4> ipv4 = rxNode->GetObject<Ipv4> ();
    uint32_t netdev_idx = ipv4->AddInterface (rxDev2);

  Ptr<SimpleNetDevice> txDev1;
  {
    txDev1 = CreateObject<SimpleNetDevice> ();
    txDev1->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
    txNode->AddDevice (txDev1);
    Ptr<Ipv4> ipv4 = txNode->GetObject<Ipv4> ();
    uint32_t netdev_idx = ipv4->AddInterface (txDev1);

  Ptr<SimpleNetDevice> txDev2;
  {
    txDev2 = CreateObject<SimpleNetDevice> ();
    txDev2->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ()));
    txNode->AddDevice (txDev2);
    Ptr<Ipv4> ipv4 = txNode->GetObject<Ipv4> ();
    uint32_t netdev_idx = ipv4->AddInterface (txDev2);

(-)a/src/node/net-device.h (+6 lines)

Lines 98-106 public:	Link Here

  virtual Ptr<Channel> GetChannel (void) const = 0;

  virtual Ptr<Channel> GetChannel (void) const = 0;

100

/**

100

/**

101

   * Set the address of this interface

102

*/

103

  virtual void SetAddress (Address address) = 0;

104

105

/**

101

   * \return the current Address of this interface.

106

   * \return the current Address of this interface.

102

*/

107

*/

103

  virtual Address GetAddress (void) const = 0;

108

  virtual Address GetAddress (void) const = 0;

109

104

/**

110

/**

105

   * \param mtu MTU value, in bytes, to set for the device

111

   * \param mtu MTU value, in bytes, to set for the device

106

   * \return whether the MTU value was within legal bounds

112

   * \return whether the MTU value was within legal bounds




               i != m_devices.end (); i++)
            {
              Ptr<NetDevice> dev = *i;
              dev->SetPromiscReceiveCallback (MakeCallback (&Node::PromiscReceiveFromDevice, this));
                {
                  dev->SetPromiscReceiveCallback (MakeCallback (&Node::PromiscReceiveFromDevice, this));
                }
            }
        }
      else
        {
          device->SetPromiscReceiveCallback (MakeCallback (&Node::PromiscReceiveFromDevice, this));
            {
              device->SetPromiscReceiveCallback (MakeCallback (&Node::PromiscReceiveFromDevice, this));
            }
          else
            {
              NS_LOG_WARN ("Protocol handler request promiscuous mode for a specific netdevice,"
                           " but netdevice does not support promiscuous mode.");
            }
        }
    }





}

void 
SimpleNetDevice::SetAddress (Mac48Address address)
{
  m_address = address;
}

void 
SimpleNetDevice::SetIfIndex(const uint32_t index)
{
  m_ifIndex = index;

{
  return m_channel;
}
void
SimpleNetDevice::SetAddress (Address address)
{
  m_address = Mac48Address::ConvertFrom(address);
}
Address 
SimpleNetDevice::GetAddress (void) const
{
  //
  // Implicit conversion from Mac48Address to Address
  //
  return m_address;
}
bool 





  void Receive (Ptr<Packet> packet, uint16_t protocol, Mac48Address to, Mac48Address from);
  void SetChannel (Ptr<SimpleChannel> channel);
  void SetAddress (Mac48Address address);

  // inherited from NetDevice base class.
  virtual void SetIfIndex(const uint32_t index);
  virtual uint32_t GetIfIndex(void) const;
  virtual Ptr<Channel> GetChannel (void) const;
  virtual void SetAddress (Address address);
  virtual Address GetAddress (void) const;
  virtual bool SetMtu (const uint16_t mtu);
  virtual uint16_t GetMtu (void) const;

Return to bug 569