commit ae0a047c4191b7bb7b7e4a988f38135d7e404dfc
author Nick Gordon <nmgordon@memphis.edu> Mon Oct 23 15:51:23 2017 -0500
committer Nick Gordon <nmgordon@memphis.edu> Thu Nov 02 13:55:56 2017 -0500
tree 3331cbeb42aca470b45a3fc0facec3c9e8729c32
parent 5bcb39e2556ea3bb6e7b8860f83fc203f2817b32

lsa: improved printing and logging

refs: #4354

Change-Id: I27cc99c6d01ba22668f4f56ad57b6f34f24f8af2

src/lsa.cpp

diff --git a/src/lsa.cpp b/src/lsa.cpp
index 45cd33e..8b389f0 100644
--- a/src/lsa.cpp
+++ b/src/lsa.cpp
@@ -121,21 +121,9 @@
 }
 
 void
-NameLsa::writeLog()
+NameLsa::writeLog() const
 {
-  NLSR_LOG_DEBUG("Name Lsa: ");
-  NLSR_LOG_DEBUG("  Origination Router: " << m_origRouter);
-  NLSR_LOG_DEBUG("  Ls Type: " << getType());
-  NLSR_LOG_DEBUG("  Ls Seq No: " << m_lsSeqNo);
-  NLSR_LOG_DEBUG("  Ls Lifetime: " << m_expirationTimePoint);
-  NLSR_LOG_DEBUG("  Names: ");
-  int i = 1;
-  std::list<ndn::Name> nl = m_npl.getNames();
-  for (std::list<ndn::Name>::iterator it = nl.begin(); it != nl.end(); it++)
-  {
-    NLSR_LOG_DEBUG("    Name " << i << ": " << (*it));
-  }
-  NLSR_LOG_DEBUG("name_lsa_end");
+  NLSR_LOG_DEBUG(*this);
 }
 
 CoordinateLsa::CoordinateLsa(const ndn::Name& origR, uint32_t lsn,
@@ -203,18 +191,9 @@
 }
 
 void
-CoordinateLsa::writeLog()
+CoordinateLsa::writeLog() const
 {
-  NLSR_LOG_DEBUG("Cor Lsa: ");
-  NLSR_LOG_DEBUG("  Origination Router: " << m_origRouter);
-  NLSR_LOG_DEBUG("  Ls Type: " << getType());
-  NLSR_LOG_DEBUG("  Ls Seq No: " << m_lsSeqNo);
-  NLSR_LOG_DEBUG("  Ls Lifetime: " << m_expirationTimePoint);
-  NLSR_LOG_DEBUG("    Hyperbolic Radius: " << m_corRad);
-  int i = 0;
-  for(auto const& value: m_angles) {
-    NLSR_LOG_DEBUG("    Hyperbolic Theta " << i++ << ": "<< value);
-  }
+  NLSR_LOG_DEBUG(*this);
 }
 
 AdjLsa::AdjLsa(const ndn::Name& origR, uint32_t lsn,
@@ -302,28 +281,24 @@
 }
 
 void
-AdjLsa::writeLog()
+AdjLsa::writeLog() const
 {
   NLSR_LOG_DEBUG(*this);
 }
 
 std::ostream&
-operator<<(std::ostream& os, const AdjLsa& adjLsa)
+operator<<(std::ostream& os, const AdjLsa& lsa)
 {
-  os << "Adj Lsa:\n"
-     << "  Origination Router: " << adjLsa.getOrigRouter() << "\n"
-     << "  Ls Type: " << adjLsa.getType() << "\n"
-     << "  Ls Seq No: " << adjLsa.getLsSeqNo() << "\n"
-     << "  Ls Lifetime: " << adjLsa.getExpirationTimePoint() << "\n"
-     << "  Adjacents: \n";
+  os << lsa.toString();
+  os << "-Adjacents:";
 
   int adjacencyIndex = 1;
 
-  for (const Adjacent& adjacency : adjLsa) {
-  os << "    Adjacent " << adjacencyIndex++ << ":\n"
-     << "      Adjacent Name: " << adjacency.getName() << "\n"
-     << "      Connecting FaceUri: " << adjacency.getFaceUri() << "\n"
-     << "      Link Cost: " << adjacency.getLinkCost() << "\n";
+  for (const Adjacent& adjacency : lsa.m_adl) {
+  os << "--Adjacent" << adjacencyIndex++ << ":\n"
+     << "---Adjacent Name: " << adjacency.getName() << "\n"
+     << "---Connecting FaceUri: " << adjacency.getFaceUri() << "\n"
+     << "---Link Cost: " << adjacency.getLinkCost() << "\n";
   }
   os << "adj_lsa_end";
 
@@ -331,6 +306,35 @@
 }
 
 std::ostream&
+operator<<(std::ostream& os, const CoordinateLsa& lsa)
+{
+  os << lsa.toString();
+  os << "--Hyperbolic Radius: " << lsa.m_corRad << "\n";
+  int i = 0;
+  for (const auto& value : lsa.m_angles) {
+    os << "---Hyperbolic Theta: " << i++ << ": " << value << "\n";
+  }
+  os << "cor_lsa_end";
+
+  return os;
+}
+
+std::ostream&
+operator<<(std::ostream& os, const NameLsa& lsa)
+{
+  os << lsa.toString();
+  os << "--Names:\n";
+  int i = 0;
+  auto names = lsa.m_npl.getNames();
+  for (const auto& name : names) {
+    os << "---Name " << i++ << ": " << name << "\n";
+  }
+  os << "name_lsa_end";
+
+  return os;
+}
+
+std::ostream&
 operator<<(std::ostream& os, const Lsa::Type& type)
 {
   os << std::to_string(type);
@@ -357,6 +361,16 @@
   return is;
 }
 
+std::string
+Lsa::toString() const
+{
+  std::ostringstream os;
+  os << "LSA of type " << getType() << ":\n-Origin Router: " << getOrigRouter()
+     << "\n-Sequence Number: " << getLsSeqNo() << "\n-Expiration Point: "
+     << getExpirationTimePoint() << "\n";
+  return os.str();
+}
+
 } // namespace nlsr
 
 namespace std {