Remove TapNetDevice::[GS]etName; a couple of bug fixes.
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Sat May 30 17:36:29 2009 +0100 (8 months ago)
changeset 4552118338cd9f61
parent 4551 dee7215f0334
child 4553 3048bd67e5cf
Remove TapNetDevice::[GS]etName; a couple of bug fixes.
src/devices/tap-net-device/tap-net-device.cc
src/devices/tap-net-device/tap-net-device.h
     1.1 --- a/src/devices/tap-net-device/tap-net-device.cc	Sun May 24 16:18:20 2009 +0100
     1.2 +++ b/src/devices/tap-net-device/tap-net-device.cc	Sat May 30 17:36:29 2009 +0100
     1.3 @@ -121,18 +121,6 @@
     1.4  
     1.5  
     1.6  void
     1.7 -TapNetDevice::SetName (const std::string name)
     1.8 -{
     1.9 -  m_name = name;
    1.10 -}
    1.11 -
    1.12 -std::string
    1.13 -TapNetDevice::GetName (void) const
    1.14 -{
    1.15 -  return m_name;
    1.16 -}
    1.17 -
    1.18 -void
    1.19  TapNetDevice::SetIfIndex (const uint32_t index)
    1.20  {
    1.21    m_index = index;
    1.22 @@ -176,7 +164,7 @@
    1.23  bool
    1.24  TapNetDevice::IsBroadcast (void) const
    1.25  {
    1.26 -  return m_needsArp;
    1.27 +  return true;
    1.28  }
    1.29  
    1.30  Address
    1.31 @@ -217,7 +205,6 @@
    1.32  bool
    1.33  TapNetDevice::SendFrom (Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber)
    1.34  {
    1.35 -  NS_FATAL_ERROR ("not implemented");
    1.36    if (m_sendCb (packet, source, dest, protocolNumber))
    1.37      {
    1.38        m_txTrace (packet);
     2.1 --- a/src/devices/tap-net-device/tap-net-device.h	Sun May 24 16:18:20 2009 +0100
     2.2 +++ b/src/devices/tap-net-device/tap-net-device.h	Sat May 30 17:36:29 2009 +0100
     2.3 @@ -116,8 +116,6 @@
     2.4  
     2.5  
     2.6    // inherited from NetDevice base class.
     2.7 -  virtual void SetName(const std::string name);
     2.8 -  virtual std::string GetName(void) const;
     2.9    virtual void SetIfIndex(const uint32_t index);
    2.10    virtual uint32_t GetIfIndex(void) const;
    2.11    virtual Ptr<Channel> GetChannel (void) const;