Attachment #465 for bug #588

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




  return m_ifaddrs.size();
}

bool
Ipv4Interface::AddAddress (Ipv4InterfaceAddress addr)
{
  NS_LOG_FUNCTION_NOARGS ();
  uint32_t index = m_ifaddrs.size ();
  m_ifaddrs.push_back (addr);
  return true;
}

Ipv4InterfaceAddress

  return (addr);  // quiet compiler
}

Ipv4InterfaceAddress
Ipv4Interface::RemoveAddress (uint32_t index)
{
  NS_LOG_FUNCTION_NOARGS ();

    {
      if (tmp  == index)
        {
          Ipv4InterfaceAddress addr = *i;
          m_ifaddrs.erase (i);
          return addr;
        }
       ++tmp;
    }
  NS_ASSERT_MSG (false, "Address " << index << " not found");
  Ipv4InterfaceAddress addr;
  return (addr);  // quiet compiler
}

}; // namespace ns3





  /**
   * \param address The Ipv4InterfaceAddress to add to the interface
   * \returns true if succeeded
   */
  bool AddAddress (Ipv4InterfaceAddress address);

  /**
   * \param index Index of Ipv4InterfaceAddress to return

  uint32_t GetNAddresses (void) const;

  /**
   * \param index Index of Ipv4InterfaceAddress to remove
   * \returns The Ipv4InterfaceAddress address whose index is index 
   */
  Ipv4InterfaceAddress RemoveAddress (uint32_t index);

protected:
  virtual void DoDispose (void);




    }
}

bool
Ipv4L3Protocol::AddAddress (uint32_t i, Ipv4InterfaceAddress address)
{
  NS_LOG_FUNCTION (this << i << address);
  Ptr<Ipv4Interface> interface = GetInterface (i);
  bool retVal = interface->AddAddress (address);
  if (m_routingProtocol != 0)
    {
      m_routingProtocol->NotifyAddAddress (i, address);
    }
  return retVal;
}

Ipv4InterfaceAddress 

  NS_LOG_FUNCTION (this << interface);
  Ptr<Ipv4Interface> iface = GetInterface (interface);
  return iface->GetNAddresses ();
}

bool
Ipv4L3Protocol::RemoveAddress (uint32_t i, uint32_t addressIndex)
{
  NS_LOG_FUNCTION (this << i << addressIndex);
  Ptr<Ipv4Interface> interface = GetInterface (i);
  Ipv4InterfaceAddress address = interface->RemoveAddress (addressIndex);
  if (address != Ipv4InterfaceAddress ())
    {
      if (m_routingProtocol != 0)
        {
          m_routingProtocol->NotifyRemoveAddress (i, address);
        }
      return true;
    }
  return false;
}

void 

(-)a/src/internet-stack/ipv4-l3-protocol.h (-1 / +2 lines)

Lines 142-150 public:	Link Here

142

  int32_t GetInterfaceForPrefix (Ipv4Address addr, Ipv4Mask mask) const;

142

  int32_t GetInterfaceForPrefix (Ipv4Address addr, Ipv4Mask mask) const;

143

  int32_t GetInterfaceForDevice (Ptr<const NetDevice> device) const;

143

  int32_t GetInterfaceForDevice (Ptr<const NetDevice> device) const;

144

145

  uint32_t AddAddress (uint32_t i, Ipv4InterfaceAddress address);

145

  bool AddAddress (uint32_t i, Ipv4InterfaceAddress address);

146

  Ipv4InterfaceAddress GetAddress (uint32_t interfaceIndex, uint32_t addressIndex) const;

146

  Ipv4InterfaceAddress GetAddress (uint32_t interfaceIndex, uint32_t addressIndex) const;

147

  uint32_t GetNAddresses (uint32_t interface) const;

147

  uint32_t GetNAddresses (uint32_t interface) const;

148

  bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);

148

149

  void SetMetric (uint32_t i, uint16_t metric);

150

  void SetMetric (uint32_t i, uint16_t metric);

150

  uint16_t GetMetric (uint32_t i) const;

151

  uint16_t GetMetric (uint32_t i) const;

(-)a/src/node/ipv4-interface-address.h (+15 lines)

Lines 77-86 private:	Link Here

  InterfaceAddressScope_e m_scope;

  InterfaceAddressScope_e m_scope;

  bool m_secondary;        // For use in multihoming

  bool m_secondary;        // For use in multihoming

  friend bool operator == (Ipv4InterfaceAddress const &a, Ipv4InterfaceAddress const &b);

  friend bool operator != (Ipv4InterfaceAddress const &a, Ipv4InterfaceAddress const &b);

};

};

std::ostream& operator<< (std::ostream& os, const Ipv4InterfaceAddress &addr);

std::ostream& operator<< (std::ostream& os, const Ipv4InterfaceAddress &addr);

inline bool operator == (const Ipv4InterfaceAddress &a, const Ipv4InterfaceAddress &b)

  return (a.m_local == b.m_local && a.m_mask == b.m_mask &&

    a.m_broadcast == b.m_broadcast && a.m_scope == b.m_scope && a.m_secondary == b.m_secondary);

inline bool operator != (const Ipv4InterfaceAddress &a, const Ipv4InterfaceAddress &b)

  return (a.m_local != b.m_local || a.m_mask != b.m_mask ||

    a.m_broadcast != b.m_broadcast || a.m_scope != b.m_scope || a.m_secondary != b.m_secondary);

} // namespace ns3

} // namespace ns3

100

#endif /* IPV4_ADDRESS_H */

101

#endif /* IPV4_ADDRESS_H */

(-)a/src/node/ipv4.h (-2 / +17 lines)

Lines 159-167 public:	Link Here

159

/**

159

/**

160

   * \param interface Interface number of an Ipv4 interface

160

   * \param interface Interface number of an Ipv4 interface

161

   * \param address Ipv4InterfaceAddress address to associate with the underlying Ipv4 interface

161

   * \param address Ipv4InterfaceAddress address to associate with the underlying Ipv4 interface

162

   * \returns The address index of the newly-added address

162

   * \returns true if the operation succeeded

163

*/

163

*/

164

  virtual uint32_t AddAddress (uint32_t interface, Ipv4InterfaceAddress address) = 0;

164

  virtual bool AddAddress (uint32_t interface, Ipv4InterfaceAddress address) = 0;

165

166

/**

166

/**

167

   * \param interface Interface number of an Ipv4 interface

167

   * \param interface Interface number of an Ipv4 interface

Lines 170-180 public:	Link Here

170

  virtual uint32_t GetNAddresses (uint32_t interface) const = 0;

170

  virtual uint32_t GetNAddresses (uint32_t interface) const = 0;

171

172

/**

172

/**

173

   * Because addresses can be removed, the addressIndex is not guaranteed

174

   * to be static across calls to this method.

175

173

   * \param interface Interface number of an Ipv4 interface

176

   * \param interface Interface number of an Ipv4 interface

174

   * \param addressIndex index of Ipv4InterfaceAddress

177

   * \param addressIndex index of Ipv4InterfaceAddress

175

   * \returns the Ipv4InterfaceAddress associated to the interface and addresIndex

178

   * \returns the Ipv4InterfaceAddress associated to the interface and addresIndex

176

*/

179

*/

177

  virtual Ipv4InterfaceAddress GetAddress (uint32_t interface, uint32_t addressIndex) const = 0;

180

  virtual Ipv4InterfaceAddress GetAddress (uint32_t interface, uint32_t addressIndex) const = 0;

181

182

/**

183

   * Remove the address at addressIndex on named interface.  The addressIndex

184

   * for all higher indices will decrement by one after this method is called;

185

   * so, for example, to remove 5 addresses from an interface i, one could

186

   * call RemoveAddress (i, 0); 5 times.

187

188

   * \param interface Interface number of an Ipv4 interface

189

   * \param addressIndex index of Ipv4InterfaceAddress to remove

190

   * \returns true if the operation succeeded

191

*/

192

  virtual bool RemoveAddress (uint32_t interface, uint32_t addressIndex) = 0;

178

193

179

/**

194

/**

180

   * \param interface The interface number of an Ipv4 interface

195

   * \param interface The interface number of an Ipv4 interface

Return to bug 588