merge with trunk

This commit is contained in:
Mathieu Lacage
2007-08-06 09:58:03 +02:00

View File

@@ -535,8 +535,7 @@ GlobalRouter::GetLSA (uint32_t n, GlobalRouterLSA &lsa) const
GlobalRouter::GetAdjacent(Ptr<NetDevice> nd, Ptr<Channel> ch) const
{
uint32_t nDevices = ch->GetNDevices();
NS_ASSERT_MSG(nDevices == 2,
NS_ASSERT_MSG(ch->GetNDevices() == 2,
"GlobalRouter::GetAdjacent (): Channel with other than two devices");
//
// This is a point to point channel with two endpoints. Get both of them.