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

internet: clarify GlobalRouter error messages

Browse Source
This commit is contained in:
Tommaso Pecorella
2020-08-30 23:04:09 +00:00
parent 2b06089792
commit 2a867ade89
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/internet/model/global-router-interface.cc
View File

@@ -850,7 +850,9 @@ GlobalRouter::ProcessSingleBroadcastLink (Ptr<NetDevice> nd, GlobalRoutingLSA *p
Ipv4Address networkHere = addrLocal.CombineMask (maskLocal); Ipv4Address networkHere = addrLocal.CombineMask (maskLocal);
Ipv4Address networkThere = desigRtr.CombineMask (maskLocal); Ipv4Address networkThere = desigRtr.CombineMask (maskLocal);
NS_ABORT_MSG_UNLESS (networkHere == networkThere, NS_ABORT_MSG_UNLESS (networkHere == networkThere,
"GlobalRouter::ProcessSingleBroadcastLink(): Network number confusion"); "GlobalRouter::ProcessSingleBroadcastLink(): Network number confusion (" <<
addrLocal << "/" << maskLocal.GetPrefixLength () << ", " <<
desigRtrTemp << "/" << maskLocal.GetPrefixLength () << ")");
} }
if (desigRtr == addrLocal) if (desigRtr == addrLocal)
{ {
@@ -959,7 +961,9 @@ GlobalRouter::ProcessBridgedBroadcastLink (Ptr<NetDevice> nd, GlobalRoutingLSA *
Ipv4Address networkHere = addrLocal.CombineMask (maskLocal); Ipv4Address networkHere = addrLocal.CombineMask (maskLocal);
Ipv4Address networkThere = desigRtrTemp.CombineMask (maskLocal); Ipv4Address networkThere = desigRtrTemp.CombineMask (maskLocal);
NS_ABORT_MSG_UNLESS (networkHere == networkThere, NS_ABORT_MSG_UNLESS (networkHere == networkThere,
"GlobalRouter::ProcessSingleBroadcastLink(): Network number confusion"); "GlobalRouter::ProcessSingleBroadcastLink(): Network number confusion (" <<
addrLocal << "/" << maskLocal.GetPrefixLength () << ", " <<
desigRtr << "/" << maskLocal.GetPrefixLength () << ")");
} }
if (desigRtrTemp < desigRtr) if (desigRtrTemp < desigRtr)
{ {