commit 27d570a089569dcf4fee18c94ba24f226fa0f13e
author Chengyu Fan <chengy.fan@gmail.com> Thu Oct 09 11:52:17 2014 -0600
committer Chengyu Fan <chengy.fan@gmail.com> Sat Oct 11 10:32:30 2014 -0600
tree e909b2cc0fa2e060e445349c77bd19ad92597f2e
parent 6687aabbc265fe658c621aa36bafc0fee10d004d

tools: Display face attribute fields instead of FaceFlags

refs #1991

Change-Id: I413db0afd77ceaa1549fcd11d6cb832fff02020b

tools/nfd-status.cpp

diff --git a/tools/nfd-status.cpp b/tools/nfd-status.cpp
index 68ffb73..42a35be 100644
--- a/tools/nfd-status.cpp
+++ b/tools/nfd-status.cpp
@@ -399,6 +399,13 @@
                         << "</expirationPeriod>";
             }
 
+            std::cout << "<faceScope>" << faceStatus.getFaceScope()
+                      << "</faceScope>";
+            std::cout << "<facePersistency>" << faceStatus.getFacePersistency()
+                      << "</facePersistency>";
+            std::cout << "<linkType>" << faceStatus.getLinkType()
+                      << "</linkType>";
+
             std::cout << "<packetCounters>";
             std::cout << "<incomingPackets>";
             std::cout << "<nInterests>"       << faceStatus.getNInInterests()
@@ -421,16 +428,6 @@
                       << "</outgoingBytes>";
             std::cout << "</byteCounters>";
 
-            if (faceStatus.getFlags() != 0) {
-              std::cout << "<flags>";
-              if (faceStatus.isLocal()) {
-                std::cout << "<local/>";
-              }
-              if (faceStatus.isOnDemand()) {
-                std::cout << "<on-demand/>";
-              }
-              std::cout << "</flags>";
-            }
             std::cout << "</face>";
           }
         std::cout << "</faces>";
@@ -470,10 +467,9 @@
                       << faceStatus.getNOutDatas() << "d "
                       << faceStatus.getNOutBytes() << "B}"
                       << "}";
-            if (faceStatus.isLocal())
-              std::cout << " local";
-            if (faceStatus.isOnDemand())
-              std::cout << " on-demand";
+            std::cout << " " << faceStatus.getFaceScope()
+                      << " " << faceStatus.getFacePersistency()
+                      << " " << faceStatus.getLinkType();
             std::cout << std::endl;
           }
        }