Revert "tools: display EndpointId in 'nfdc fib list'"
This reverts commit 13839ac94aaa06a8df6d4bf2c3a76e043e86b4af.
Refs: #4973
Change-Id: If03e8f22ff4c8c65b20b486302fda0ffc8192662
diff --git a/tools/nfd-status-http-server-files/nfd-status.xsl b/tools/nfd-status-http-server-files/nfd-status.xsl
index f6cc338..d2015b1 100644
--- a/tools/nfd-status-http-server-files/nfd-status.xsl
+++ b/tools/nfd-status-http-server-files/nfd-status.xsl
@@ -252,12 +252,6 @@
</xsl:for-each>
</tr>
<tr>
- <th>EndpointId</th>
- <xsl:for-each select="nfd:nextHops/nfd:nextHop">
- <td><xsl:value-of select="nfd:endpointId"/></td>
- </xsl:for-each>
- </tr>
- <tr>
<th>Cost</th>
<xsl:for-each select="nfd:nextHops/nfd:nextHop">
<td><xsl:value-of select="nfd:cost"/></td>
diff --git a/tools/nfdc/fib-module.cpp b/tools/nfdc/fib-module.cpp
index 76af0aa..e040109 100644
--- a/tools/nfdc/fib-module.cpp
+++ b/tools/nfdc/fib-module.cpp
@@ -65,7 +65,6 @@
for (const NextHopRecord& nh : item.getNextHopRecords()) {
os << "<nextHop>"
<< "<faceId>" << nh.getFaceId() << "</faceId>"
- << "<endpointId>" << (nh.hasEndpointId() ? nh.getEndpointId() : 0) << "</endpointId>"
<< "<cost>" << nh.getCost() << "</cost>"
<< "</nextHop>";
}
@@ -91,13 +90,8 @@
text::Separator sep(", ");
for (const NextHopRecord& nh : item.getNextHopRecords()) {
os << sep
- << "face=" << nh.getFaceId();
-
- if (nh.hasEndpointId() && nh.getEndpointId() != 0) {
- os << ":" << nh.getEndpointId();
- }
-
- os << " (cost=" << nh.getCost() << ")";
+ << "faceid=" << nh.getFaceId()
+ << " (cost=" << nh.getCost() << ")";
}
os << "}";