From 2a867ade8942cc55425893f2c73b1bcbeb7222be Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Sun, 30 Aug 2020 23:04:09 +0000 Subject: [PATCH] internet: clarify GlobalRouter error messages --- src/internet/model/global-router-interface.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/internet/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc index 9fa6b12c8..afb199487 100644 --- a/src/internet/model/global-router-interface.cc +++ b/src/internet/model/global-router-interface.cc @@ -850,7 +850,9 @@ GlobalRouter::ProcessSingleBroadcastLink (Ptr nd, GlobalRoutingLSA *p Ipv4Address networkHere = addrLocal.CombineMask (maskLocal); Ipv4Address networkThere = desigRtr.CombineMask (maskLocal); 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) { @@ -959,7 +961,9 @@ GlobalRouter::ProcessBridgedBroadcastLink (Ptr nd, GlobalRoutingLSA * Ipv4Address networkHere = addrLocal.CombineMask (maskLocal); Ipv4Address networkThere = desigRtrTemp.CombineMask (maskLocal); 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) {