F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 1821 - Setting an interface to Down state will cause various asserts in IPv6

Browse Source
This commit is contained in:
Tommaso Pecorella
2013-12-31 19:48:09 +01:00
parent 58235a7b39
commit e22f63ffe4
4 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES
View File

@@ -29,6 +29,7 @@ New user-visible features
Bugs fixed
----------
- Bug 1821 - Setting an interface to Down state will cause various asserts in IPv6
Release 3.19

29
src/internet/model/ipv4-static-routing.cc
View File

@@ -627,17 +627,16 @@ Ipv4StaticRouting::NotifyInterfaceDown (uint32_t i)
{
NS_LOG_FUNCTION (this << i);
// Remove all static routes that are going through this interface
uint32_t j = 0;
while (j < GetNRoutes ())
for (NetworkRoutesI it = m_networkRoutes.begin (); it != m_networkRoutes.end (); )
{
Ipv4RoutingTableEntry route = GetRoute (j);
if (route.GetInterface () == i)
if (it->first->GetInterface () == i)
{
RemoveRoute (j);
delete it->first;
it = m_networkRoutes.erase (it);
}
else
{
j++;
it++;
}
}
}
@@ -672,15 +671,19 @@ Ipv4StaticRouting::NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress
Ipv4Mask networkMask = address.GetMask ();
// Remove all static routes that are going through this interface
// which reference this network
for (uint32_t j = 0; j < GetNRoutes (); j++)
for (NetworkRoutesI it = m_networkRoutes.begin (); it != m_networkRoutes.end (); )
{
Ipv4RoutingTableEntry route = GetRoute (j);
if (route.GetInterface () == interface &&
route.IsNetwork () &&
route.GetDestNetwork () == networkAddress &&
route.GetDestNetworkMask () == networkMask)
if (it->first->GetInterface () == interface
&& it->first->IsNetwork ()
&& it->first->GetDestNetwork () == networkAddress
&& it->first->GetDestNetworkMask () == networkMask)
{
RemoveRoute (j);
delete it->first;
it = m_networkRoutes.erase (it);
}
else
{
it++;
}
}
}

1
src/internet/model/ipv6-interface.cc
View File

@@ -183,6 +183,7 @@ void Ipv6Interface::SetDown ()
NS_LOG_FUNCTION_NOARGS ();
m_ifup = false;
m_addresses.clear ();
m_ndCache->Flush ();
}
bool Ipv6Interface::IsForwarding () const

32
src/internet/model/ipv6-static-routing.cc
View File

@@ -684,21 +684,18 @@ void Ipv6StaticRouting::NotifyInterfaceUp (uint32_t i)
void Ipv6StaticRouting::NotifyInterfaceDown (uint32_t i)
{
NS_LOG_FUNCTION (this << i);
uint32_t j = 0;
uint32_t max = GetNRoutes ();
/* remove all static routes that are going through this interface */
while (j < max)
for (NetworkRoutesI it = m_networkRoutes.begin (); it != m_networkRoutes.end (); )
{
Ipv6RoutingTableEntry route = GetRoute (j);
if (route.GetInterface () == i)
if (it->first->GetInterface () == i)
{
RemoveRoute (j);
delete it->first;
it = m_networkRoutes.erase (it);
}
else
{
j++;
it++;
}
}
}
@@ -731,16 +728,19 @@ void Ipv6StaticRouting::NotifyRemoveAddress (uint32_t interface, Ipv6InterfaceAd
// Remove all static routes that are going through this interface
// which reference this network
for (uint32_t j = 0; j < GetNRoutes (); j++)
for (NetworkRoutesI it = m_networkRoutes.begin (); it != m_networkRoutes.end (); )
{
Ipv6RoutingTableEntry route = GetRoute (j);
if (route.GetInterface () == interface
&& route.IsNetwork ()
&& route.GetDestNetwork () == networkAddress
&& route.GetDestNetworkPrefix () == networkMask)
if (it->first->GetInterface () == interface
&& it->first->IsNetwork ()
&& it->first->GetDestNetwork () == networkAddress
&& it->first->GetDestNetworkPrefix () == networkMask)
{
RemoveRoute (j);
delete it->first;
it = m_networkRoutes.erase (it);
}
else
{
it++;
}
}
}