Attachment #1618 for bug #760

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




  return (addr);  // quiet compiler
}

Ipv4InterfaceAddress
Ipv4Interface::RemoveAddress(Ipv4Address address)
{
  NS_LOG_FUNCTION(this << address);

  if (address == address.GetLoopback())
    {
      NS_LOG_WARN ("Cannot remove loopback address.");
      return Ipv4InterfaceAddress();
    }

  for(Ipv4InterfaceAddressListI it = m_ifaddrs.begin(); it != m_ifaddrs.end(); it++)
    {
      if((*it).GetLocal() == address)
        {
          Ipv4InterfaceAddress ifAddr = *it;
          m_ifaddrs.erase(it);
          return ifAddr;
        }
    }
  return Ipv4InterfaceAddress();
}

} // namespace ns3


(-)a/src/internet/model/ipv4-interface.h (+9 lines)

Lines 152-157	Link Here

152

*/

152

*/

153

  Ipv4InterfaceAddress RemoveAddress (uint32_t index);

153

  Ipv4InterfaceAddress RemoveAddress (uint32_t index);

154

155

/**

156

   * \brief Remove the given Ipv4 address from the interface.

157

   * \param address The Ipv4 address to remove

158

   * \returns The removed Ipv4 interface address

159

   * \returns The null interface address if the interface did not contain the

160

   * address or if loopback address was passed as argument

161

*/

162

  Ipv4InterfaceAddress RemoveAddress (Ipv4Address address);

163

155

protected:

164

protected:

156

  virtual void DoDispose (void);

165

  virtual void DoDispose (void);

157

private:

166

private:




  return false;
}

bool
Ipv4L3Protocol::RemoveAddress (uint32_t i, Ipv4Address address)
{
  NS_LOG_FUNCTION (this << i << address);

  if (address == Ipv4Address::GetLoopback())
    {
      NS_LOG_WARN ("Cannot remove loopback address.");
      return false;
    }
  Ptr<Ipv4Interface> interface = GetInterface (i);
  Ipv4InterfaceAddress ifAddr = interface->RemoveAddress (address);
  if (ifAddr != Ipv4InterfaceAddress ())
    {
      if (m_routingProtocol != 0)
        {
          m_routingProtocol->NotifyRemoveAddress (i, ifAddr);
        }
      return true;
    }
  return false;
}

Ipv4Address 
Ipv4L3Protocol::SelectSourceAddress (Ptr<const NetDevice> device,
                                     Ipv4Address dst, Ipv4InterfaceAddress::InterfaceAddressScope_e scope)

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

Lines 194-199	Link Here

194

  Ipv4InterfaceAddress GetAddress (uint32_t interfaceIndex, uint32_t addressIndex) const;

194

  Ipv4InterfaceAddress GetAddress (uint32_t interfaceIndex, uint32_t addressIndex) const;

195

  uint32_t GetNAddresses (uint32_t interface) const;

195

  uint32_t GetNAddresses (uint32_t interface) const;

196

  bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);

196

  bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);

197

  bool RemoveAddress (uint32_t interface, Ipv4Address address);

197

  Ipv4Address SelectSourceAddress (Ptr<const NetDevice> device,

198

  Ipv4Address SelectSourceAddress (Ptr<const NetDevice> device,

198

                                   Ipv4Address dst, Ipv4InterfaceAddress::InterfaceAddressScope_e scope);

199

                                   Ipv4Address dst, Ipv4InterfaceAddress::InterfaceAddressScope_e scope);

199

200

(-)a/src/internet/model/ipv4.h (+9 lines)

Lines 248-253	Link Here

248

*/

248

*/

249

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

249

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

250

251

/**

252

   * \brief Remove the given address on named Ipv4 interface

253

254

   * \param interface Interface number of an Ipv4 interface

255

   * \param address The address to remove

256

   * \returns true if the operation succeeded

257

*/

258

  virtual bool RemoveAddress (uint32_t interface, Ipv4Address address) = 0;

259

251

/**

260

/**

252

   * \brief Return the first primary source address with scope less than

261

   * \brief Return the first primary source address with scope less than

253

   * or equal to the requested scope, to use in sending a packet to

262

   * or equal to the requested scope, to use in sending a packet to




  return addr;  /* quiet compiler */
}

Ipv6InterfaceAddress 
Ipv6Interface::RemoveAddress(Ipv6Address address)
{
  NS_LOG_FUNCTION(this << address);

  if (address == address.GetLoopback())
    {
      NS_LOG_WARN ("Cannot remove loopback address.");
      return Ipv6InterfaceAddress();
    }

  for (Ipv6InterfaceAddressListI it = m_addresses.begin (); it != m_addresses.end (); ++it)
    {
      if((*it).GetAddress() == address)
        {
          Ipv6InterfaceAddress iface = (*it);
          m_addresses.erase(it);
          return iface;
        }
    }
  return Ipv6InterfaceAddress();
}

Ipv6InterfaceAddress Ipv6Interface::GetAddressMatchingDestination (Ipv6Address dst)
{
  NS_LOG_FUNCTION (this << dst);

(-)a/src/internet/model/ipv6-interface.h (+9 lines)

Lines 228-233	Link Here

228

  Ipv6InterfaceAddress RemoveAddress (uint32_t index);

228

  Ipv6InterfaceAddress RemoveAddress (uint32_t index);

229

230

/**

230

/**

231

   * \brief Remove the given Ipv6 address from the interface.

232

   * \param address The Ipv6 address to remove

233

   * \returns The removed Ipv6 interface address

234

   * \returns The null interface address if the interface did not contain the

235

   * address or if loopback address was passed as argument

236

*/

237

  Ipv6InterfaceAddress RemoveAddress (Ipv6Address address);

238

239

/**

231

   * \brief Update state of an interface address.

240

   * \brief Update state of an interface address.

232

   * \param address IPv6 address

241

   * \param address IPv6 address

233

   * \param state new state

242

   * \param state new state




  return false;
}

bool 
Ipv6L3Protocol::RemoveAddress (uint32_t i, Ipv6Address address)
{
  NS_LOG_FUNCTION (this << i << address);

  if (address == Ipv6Address::GetLoopback())
    {
      NS_LOG_WARN ("Cannot remove loopback address.");
      return false;
    }
  Ptr<Ipv6Interface> interface = GetInterface (i);
  Ipv6InterfaceAddress ifAddr = interface->RemoveAddress (address);
  if (ifAddr != Ipv6InterfaceAddress ())
  {
    if (m_routingProtocol != 0)
    {
      m_routingProtocol->NotifyRemoveAddress (i, ifAddr);
    }
    return true;
  }
  return false;
}

void Ipv6L3Protocol::SetMetric (uint32_t i, uint16_t metric)
{
  NS_LOG_FUNCTION (this << i << metric);

(-)a/src/internet/model/ipv6-l3-protocol.h (+8 lines)

Lines 249-254	Link Here

249

  bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);

249

  bool RemoveAddress (uint32_t interfaceIndex, uint32_t addressIndex);

250

251

/**

251

/**

252

   * \brief Remove a specified Ipv6 address from an interface.

253

   * \param interfaceIndex interface index

254

   * \param address Ipv6Address to be removed from the interface

255

   * \returns true if the operation succeeded

256

*/

257

  bool RemoveAddress (uint32_t interface, Ipv6Address address);

258

259

/**

252

   * \brief Set metric for an interface.

260

   * \brief Set metric for an interface.

253

   * \param i index

261

   * \param i index

254

   * \param metric

262

   * \param metric

(-)a/src/internet/model/ipv6.h (+9 lines)

Lines 218-223	Link Here

218

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

218

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

219

220

/**

220

/**

221

   * \brief Remove the given address on named Ipv6 interface

222

223

   * \param interface Interface number of an IPv6 interface

224

   * \param address the address to remove

225

   * \returns true if the operation succeeded

226

*/

227

  virtual bool RemoveAddress (uint32_t interface, Ipv6Address address) = 0;

228

229

/**

221

   * \brief Set metric on specified Ipv6 interface.

230

   * \brief Set metric on specified Ipv6 interface.

222

231

223

   * \param interface The interface number of an IPv6 interface

232

   * \param interface The interface number of an IPv6 interface




  Ipv4InterfaceAddress output = interface->GetAddress (2);
  NS_TEST_ASSERT_MSG_EQ (ifaceAddr4, output,
                         "The addresses should be identical");

  /* Test Ipv4Interface()::RemoveAddress(address) */
  output = interface->RemoveAddress (Ipv4Address ("250.0.0.1"));
  NS_TEST_ASSERT_MSG_EQ (ifaceAddr4, output,
                         "Wrong Interface Address Removed??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 2, "Should find 2 interfaces??");
  
  /* Remove a non-existent Address */
  output = interface->RemoveAddress (Ipv4Address ("253.123.9.81"));
  NS_TEST_ASSERT_MSG_EQ (Ipv4InterfaceAddress (), output,
                         "Removed non-existent address??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 2, "Should find 2 interfaces??");
  
  /* Remove a Loopback Address */
  output = interface->RemoveAddress (Ipv4Address::GetLoopback ());
  NS_TEST_ASSERT_MSG_EQ (Ipv4InterfaceAddress (), output,
                         "Able to remove loopback address??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 2, "Should find 2 interfaces??");

  /* Test Ipv4Address::RemoveAddress(i, addresss) */
  bool result = ipv4->RemoveAddress (index, Ipv4Address
("192.168.0.2"));
  NS_TEST_ASSERT_MSG_EQ (true, result, "Unable to remove Address??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Should find 1 interfaces??");

  /* Remove a non-existent Address */
  result = ipv4->RemoveAddress (index, Ipv4Address ("189.0.0.1"));
  NS_TEST_ASSERT_MSG_EQ (false, result,
                         "Removed non-existent address??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Should find 1 interfaces??");

  /* Remove a loopback Address */
  result = ipv4->RemoveAddress (index, Ipv4Address::GetLoopback ());
  NS_TEST_ASSERT_MSG_EQ (false, result,
                         "Able to remove loopback address??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Should find 1 interfaces??");

  Simulator::Destroy ();
}

  
static class IPv4L3ProtocolTestSuite : public TestSuite
{
public:





  index = ipv6->GetInterfaceForAddress ("2001:ffff:5678:9000::1"); /* address we just remove */
  NS_TEST_ASSERT_MSG_EQ (index, (uint32_t) -1, "Address should not be found??");

  /* Test Ipv6Interface()::RemoveAddress(address) */
  output = interface->RemoveAddress (Ipv6Address ("2001:1234:5678:9000::1"));
  NS_TEST_ASSERT_MSG_EQ (ifaceAddr1, output, "Wrong Interface Address Removed??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
  
  /* Remove a non-existent Address */
  output = interface->RemoveAddress (Ipv6Address ("2001:1234:5678:9000::1"));
  NS_TEST_ASSERT_MSG_EQ (Ipv6InterfaceAddress (), output, 
                         "Removed non-existent address??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");

  /* Remove a loopback Address */
  output = interface->RemoveAddress (Ipv6Address::GetLoopback ());
  NS_TEST_ASSERT_MSG_EQ (Ipv6InterfaceAddress (), output, 
                         "Able to remove loopback address??");
  num = interface->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");

  /* Test Ipv6Address::RemoveAddress(index, addresss) */
  index = ipv6->GetInterfaceForAddress ("2001:ffff:5678:9001::2");
  bool result = ipv6->RemoveAddress (index, Ipv6Address 
                                     ("2001:ffff:5678:9001::2"));
  NS_TEST_ASSERT_MSG_EQ (result, true, "Unable to remove Address??");
  num = interface2->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");

  /* Remove a non-existent Address */
  result = ipv6->RemoveAddress (index, Ipv6Address  
                                ("2001:ffff:5678:9001::2"));
  NS_TEST_ASSERT_MSG_EQ (result, false, "Removed Non-existent address??");
  num = interface2->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
 
  /* Remove a loopback Address */
  result = ipv6->RemoveAddress (index, Ipv6Address::GetLoopback ());
  NS_TEST_ASSERT_MSG_EQ (result, false, "Able to remove loopback address??");
  num = interface2->GetNAddresses ();
  NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");

  Simulator::Destroy ();
} //end DoRun
static class IPv6L3ProtocolTestSuite : public TestSuite

Return to bug 760