Attachment #386 for bug #498

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

(-)a/src/devices/bridge/bridge-channel.cc (-1 / +1 lines)

Lines 34-40	Link Here

BridgeChannel::BridgeChannel ()

BridgeChannel::BridgeChannel ()

  : Channel ("BridgeChannel")

  : Channel ()

  NS_LOG_FUNCTION_NOARGS ();

  NS_LOG_FUNCTION_NOARGS ();





BridgeNetDevice::BridgeNetDevice ()
  : m_node (0),
    m_name (""),
    m_ifIndex (0),
    m_mtu (0xffff)
{

                                 uint16_t protocol, Mac48Address src, Mac48Address dst)
{
  NS_LOG_FUNCTION_NOARGS ();
  NS_LOG_DEBUG ("LearningBridgeForward (incomingPort=" << incomingPort->GetInstanceTypeId ().GetName ()
                << ", packet=" << packet << ", protocol="<<protocol
                << ", src=" << src << ", dst=" << dst << ")");


  Ptr<NetDevice> outPort = GetLearnedState (dst);
  if (outPort != NULL && outPort != incomingPort)
    {
      NS_LOG_LOGIC ("Learning bridge state says to use port `" << outPort->GetInstanceTypeId ().GetName () << "'");
      outPort->SendFrom (packet->Copy (), src, dst, protocol);
    }
  else

          Ptr<NetDevice> port = *iter;
          if (port != incomingPort)
            {
              NS_LOG_LOGIC ("LearningBridgeForward (" << src << " => " << dst << "): " 
                            << incomingPort->GetInstanceTypeId ().GetName ()
                            << " --> " << port->GetInstanceTypeId ().GetName ()
                            << " (UID " << packet->GetUid () << ").");
              port->SendFrom (packet->Copy (), src, dst, protocol);
            }

                                        uint16_t protocol, Mac48Address src, Mac48Address dst)
{
  NS_LOG_FUNCTION_NOARGS ();
  NS_LOG_DEBUG ("LearningBridgeForward (incomingPort=" << incomingPort->GetInstanceTypeId ().GetName ()
                << ", packet=" << packet << ", protocol="<<protocol
                << ", src=" << src << ", dst=" << dst << ")");
  Learn (src, incomingPort);

      Ptr<NetDevice> port = *iter;
      if (port != incomingPort)
        {
          NS_LOG_LOGIC ("LearningBridgeForward (" << src << " => " << dst << "): " 
                        << incomingPort->GetInstanceTypeId ().GetName ()
                        << " --> " << port->GetInstanceTypeId ().GetName ()
                        << " (UID " << packet->GetUid () << ").");
          port->SendFrom (packet->Copy (), src, dst, protocol);
        }

      m_address = Mac48Address::ConvertFrom (bridgePort->GetAddress ());
    }

  NS_LOG_DEBUG ("RegisterProtocolHandler for " << bridgePort->GetInstanceTypeId ().GetName ());
  m_node->RegisterProtocolHandler (MakeCallback (&BridgeNetDevice::ReceiveFromDevice, this),
                                   0, bridgePort, true);
  m_ports.push_back (bridgePort);

}

void 
BridgeNetDevice::SetName(const std::string name)
{
  NS_LOG_FUNCTION_NOARGS ();
  m_name = name;
}

std::string 
BridgeNetDevice::GetName(void) const
{
  NS_LOG_FUNCTION_NOARGS ();
  return m_name;
}

void 
BridgeNetDevice::SetIfIndex(const uint32_t index)
{
  NS_LOG_FUNCTION_NOARGS ();

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

Lines 88-95	Link Here

  Ptr<NetDevice> GetBridgePort (uint32_t n) const;

  Ptr<NetDevice> GetBridgePort (uint32_t n) const;

  // inherited from NetDevice base class.

  // inherited from NetDevice base class.

  virtual void SetName(const std::string name);

  virtual std::string GetName(void) const;

  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;

Lines 140-146	Link Here

140

  std::map<Mac48Address, LearnedState> m_learnState;

138

  std::map<Mac48Address, LearnedState> m_learnState;

141

  Ptr<Node> m_node;

139

  Ptr<Node> m_node;

142

  Ptr<BridgeChannel> m_channel;

140

  Ptr<BridgeChannel> m_channel;

143

  std::string m_name;

144

  std::vector< Ptr<NetDevice> > m_ports;

141

  std::vector< Ptr<NetDevice> > m_ports;

145

  uint32_t m_ifIndex;

142

  uint32_t m_ifIndex;

146

  uint16_t m_mtu;

143

  uint16_t m_mtu;

(-)a/src/devices/csma/csma-channel.cc (-1 / +1 lines)

Lines 51-57	Link Here

CsmaChannel::CsmaChannel ()

CsmaChannel::CsmaChannel ()

  Channel ("Csma Channel")

  Channel ()

  NS_LOG_FUNCTION_NOARGS ();

  NS_LOG_FUNCTION_NOARGS ();

  m_state = IDLE;

  m_state = IDLE;




}

CsmaNetDevice::CsmaNetDevice ()
 : m_linkUp (false)
    m_linkUp (false)
{
  NS_LOG_FUNCTION (this);
  m_txMachineState = READY;

}

  void 
CsmaNetDevice::SetName (const std::string name)
{
  NS_LOG_FUNCTION (name);
  m_name = name;
}

  std::string 
CsmaNetDevice::GetName (void) const
{
  NS_LOG_FUNCTION_NOARGS ();
  return m_name;
}

  void 
CsmaNetDevice::SetIfIndex (const uint32_t index)
{
  NS_LOG_FUNCTION (index);

  NS_LOG_FUNCTION (node);

  m_node = node;
  int count = -1;
  if (m_name.size () == 0)
    {
      for (uint32_t i = 0; i < node->GetNDevices (); i++)
        {
          Ptr<NetDevice> dev = node->GetDevice (i);
          if (dynamic_cast<CsmaNetDevice*> (PeekPointer (dev)))
            {
              count++;
              if (dev == this)
                {
                  break;
                }
            }
        }
      std::ostringstream s;
      s << "eth" << count;
      m_name = s.str ();
    }
}

  bool 




  //
  // The following methods are inherited from NetDevice base class.
  //
  virtual void SetName (const std::string name);
  virtual std::string GetName (void) const;
  virtual void SetIfIndex (const uint32_t index);
  virtual uint32_t GetIfIndex (void) const;
  virtual Ptr<Channel> GetChannel (void) const;

  uint32_t m_ifIndex;

  /**
   * The human readable name of this device.
   */
  std::string m_name;

  /**
   * Flag indicating whether or not the link is up.  In this case,
   * whether or not the device is connected to a channel.
   */




                   Mac48AddressValue (Mac48Address ("ff:ff:ff:ff:ff:ff")),
                   MakeMac48AddressAccessor (&EmuNetDevice::m_address),
                   MakeMac48AddressChecker ())
    .AddAttribute ("DeviceName", 
                   "The name of the underlying real device (e.g. eth1).",
                   StringValue ("eth1"),
                   MakeStringAccessor (&EmuNetDevice::m_deviceName),
                   MakeStringChecker ())
    .AddAttribute ("Start", 
                   "The simulation time at which to spin up the device thread.",
                   TimeValue (Seconds (0.)),

  m_sock (-1),
  m_readThread (0),
  m_ifIndex (std::numeric_limits<uint32_t>::max ()),  // absurdly large value
  m_sll_ifindex (-1)
  m_name ("Emu NetDevice")
{
  NS_LOG_FUNCTION (this);
  Start (m_tStart);

}

void 
EmuNetDevice::SetName(const std::string name)
{
  m_name = name;
}

std::string 
EmuNetDevice::GetName(void) const
{
  return m_name;
}

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




//
// Pure virtual methods inherited from NetDevice we must implement.
//
  virtual void SetName(const std::string name);
  virtual std::string GetName(void) const;

  virtual void SetIfIndex(const uint32_t index);
  virtual uint32_t GetIfIndex(void) const;


  int32_t m_sll_ifindex;

  /**
   * The human readable name of this device.
   */
  std::string m_name;

  /**
   * Flag indicating whether or not the link is up.  In this case,
   * whether or not the device is connected to a channel.
   */

(-)a/src/devices/point-to-point/point-to-point-channel.cc (-2 / +2 lines)

Lines 43-53	Link Here

//

//

// By default, you get a channel with the name "PointToPoint Channel" that

// By default, you get a channel that

// has an "infitely" fast transmission speed and zero delay.

// has an "infitely" fast transmission speed and zero delay.

PointToPointChannel::PointToPointChannel()

PointToPointChannel::PointToPointChannel()

  Channel ("PointToPoint Channel"),

  Channel (),

  m_delay (Seconds (0.)),

  m_delay (Seconds (0.)),

  m_nDevices (0)

  m_nDevices (0)

(-)a/src/devices/point-to-point/point-to-point-channel.h (-1 / +1 lines)

Lines 50-56	Link Here

/**

/**

   * \brief Create a PointToPointChannel

   * \brief Create a PointToPointChannel

   * By default, you get a channel with the name "PointToPoint Channel" that

   * By default, you get a channel that

   * has zero transmission delay.

   * has zero transmission delay.

*/

*/

  PointToPointChannel ();

  PointToPointChannel ();




: 
  m_txMachineState (READY),
  m_channel (0), 
  m_name (""),
  m_linkUp (false)
{
  NS_LOG_FUNCTION (this);

}

  void 
PointToPointNetDevice::SetName(const std::string name)
{
  m_name = name;
}

  std::string 
PointToPointNetDevice::GetName(void) const
{
  return m_name;
}

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




   */
  uint16_t GetFrameSize (void) const;

//
// Pure virtual methods inherited from NetDevice we must implement.
//
  virtual void SetName(const std::string name);
  virtual std::string GetName(void) const;

  virtual void SetIfIndex(const uint32_t index);
  virtual uint32_t GetIfIndex(void) const;


  NetDevice::ReceiveCallback m_rxCallback;
  NetDevice::PromiscReceiveCallback m_promiscCallback;
  uint32_t m_ifIndex;
  std::string m_name;
  bool m_linkUp;
  Callback<void> m_linkChangeCallback;





}

void 
WifiNetDevice::SetName(const std::string name)
{
  m_name = name;
}
std::string 
WifiNetDevice::GetName(void) const
{
  return m_name;
}
void 
WifiNetDevice::SetIfIndex(const uint32_t index)
{
  m_ifIndex = index;

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

Lines 75-82	Link Here

  // inherited from NetDevice base class.

  // inherited from NetDevice base class.

  virtual void SetName(const std::string name);

  virtual std::string GetName(void) const;

  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;

Lines 121-127	Link Here

121

  TracedCallback<Ptr<const Packet>, Mac48Address> m_rxLogger;

119

  TracedCallback<Ptr<const Packet>, Mac48Address> m_rxLogger;

122

  TracedCallback<Ptr<const Packet>, Mac48Address> m_txLogger;

120

  TracedCallback<Ptr<const Packet>, Mac48Address> m_txLogger;

123

  uint32_t m_ifIndex;

121

  uint32_t m_ifIndex;

124

  std::string m_name;

125

  bool m_linkUp;

122

  bool m_linkUp;

126

  Callback<void> m_linkChange;

123

  Callback<void> m_linkChange;

127

  mutable uint16_t m_mtu;

124

  mutable uint16_t m_mtu;




}

Channel::Channel ()
  : m_name("Channel")
{
  NS_LOG_FUNCTION_NOARGS ();
}

Channel::Channel (std::string name)
  : m_name(name)
{
  NS_LOG_FUNCTION (this << name);
}

Channel::~Channel ()
{
  NS_LOG_FUNCTION_NOARGS ();
}

  void
Channel::SetName(std::string name)
{
  NS_LOG_FUNCTION (this << name);
  m_name = name;
}

  std::string
Channel::GetName(void)
{
  NS_LOG_FUNCTION_NOARGS ();
  return m_name;
}

} // namespace ns3




  static TypeId GetTypeId (void);

  Channel ();
  Channel (std::string name);
  virtual ~Channel ();

  void SetName(std::string);
  std::string GetName(void);

  /**
   * \returns the number of NetDevices connected to this Channel.
   *

   */
  virtual Ptr<NetDevice> GetDevice (uint32_t i) const = 0;

private:
  std::string   m_name;
};

} // namespace ns3

#endif /* NS3_CHANNEL_H */




  virtual ~NetDevice();

  /**
   * \param name name of the device (e.g. "eth0")
   */
  virtual void SetName(const std::string name) = 0;
  /**
   * \return name name of the device (e.g. "eth0")
   */
  virtual std::string GetName(void) const = 0;
  /**
   * \param index ifIndex of the device 
   */
  virtual void SetIfIndex(const uint32_t index) = 0;




Node::PromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,
                                const Address &from, const Address &to, NetDevice::PacketType packetType)
{
  NS_LOG_FUNCTION(this);
  return ReceiveFromDevice (device, packet, protocol, from, to, packetType, true);
}


Node::NonPromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,
                                   const Address &from)
{
  NS_LOG_FUNCTION(this);
  return ReceiveFromDevice (device, packet, protocol, from, from, NetDevice::PacketType (0), false);
}


                         const Address &from, const Address &to, NetDevice::PacketType packetType, bool promiscuous)
{
  NS_LOG_DEBUG("Node " << GetId () << " ReceiveFromDevice:  dev "
               << device->GetIfIndex () << " (type=" << device->GetInstanceTypeId ().GetName ()
               << device->GetName () << " type " << device->GetInstanceTypeId ().GetName ()
               << ") Packet UID " << packet->GetUid ());
  bool found = false;





  : m_channel (0),
    m_node (0),
    m_mtu (0xffff),
    m_name (""),
    m_ifIndex (0)
{}


}

void 
SimpleNetDevice::SetName(const std::string name)
{
  m_name = name;
}
std::string 
SimpleNetDevice::GetName(void) const
{
  return m_name;
}
void 
SimpleNetDevice::SetIfIndex(const uint32_t index)
{
  m_ifIndex = index;

(-)a/src/node/simple-net-device.h (-3 lines)

Lines 46-53	Link Here

  void SetAddress (Mac48Address address);

  void SetAddress (Mac48Address address);

  // inherited from NetDevice base class.

  // inherited from NetDevice base class.

  virtual void SetName(const std::string name);

  virtual std::string GetName(void) const;

  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;

Lines 82-88	Link Here

  NetDevice::PromiscReceiveCallback m_promiscCallback;

  NetDevice::PromiscReceiveCallback m_promiscCallback;

  Ptr<Node> m_node;

  Ptr<Node> m_node;

  uint16_t m_mtu;

  uint16_t m_mtu;

  std::string m_name;

  uint32_t m_ifIndex;

  uint32_t m_ifIndex;

  Mac48Address m_address;

  Mac48Address m_address;

};

};

Return to bug 498