face/mgmt/fw/tools: add localUri to FaceStatus and FaceEventNotification
refs #1396
Change-Id: I6084745c62c44a409ecbd4a795cb712475e32416
diff --git a/tools/nfd-autoreg.cpp b/tools/nfd-autoreg.cpp
index ca7d1e6..79859a1 100644
--- a/tools/nfd-autoreg.cpp
+++ b/tools/nfd-autoreg.cpp
@@ -79,7 +79,7 @@
void
processCreateFace(const FaceEventNotification& notification)
{
- FaceUri uri(notification.getUri());
+ FaceUri uri(notification.getRemoteUri());
if (isFiltered(uri))
{
@@ -111,7 +111,7 @@
// process
FaceEventNotification notification(data.getContent().blockFromValue());
- if (notification.getEventKind() == FACE_EVENT_CREATED &&
+ if (notification.getKind() == FACE_EVENT_CREATED &&
!notification.isLocal() &&
notification.isOnDemand())
{
diff --git a/tools/nfd-status.cpp b/tools/nfd-status.cpp
index f1e5afd..efe1283 100644
--- a/tools/nfd-status.cpp
+++ b/tools/nfd-status.cpp
@@ -158,12 +158,13 @@
nfd::FaceStatus faceStatus(block);
std::cout << " faceid=" << faceStatus.getFaceId()
- << " uri=" << faceStatus.getUri()
+ << " remote=" << faceStatus.getRemoteUri()
+ << " local=" << faceStatus.getLocalUri()
<< " counters={"
- << "in={" << faceStatus.getInInterest() << "i "
- << faceStatus.getInData() << "d}"
- << " out={" << faceStatus.getOutInterest() << "i "
- << faceStatus.getOutData() << "d}"
+ << "in={" << faceStatus.getNInInterests() << "i "
+ << faceStatus.getNInDatas() << "d}"
+ << " out={" << faceStatus.getNOutInterests() << "i "
+ << faceStatus.getNOutDatas() << "d}"
<< "}" << std::endl;
}