face/mgmt/fw/tools: add localUri to FaceStatus and FaceEventNotification
refs #1396
Change-Id: I6084745c62c44a409ecbd4a795cb712475e32416
diff --git a/daemon/face/face-counter.hpp b/daemon/face/face-counter.hpp
index ba3b98e..683e6e5 100644
--- a/daemon/face/face-counter.hpp
+++ b/daemon/face/face-counter.hpp
@@ -28,94 +28,94 @@
/// incoming Interest (total packets since Face establishment)
const FaceCounter&
- getInInterest() const;
+ getNInInterests() const;
FaceCounter&
- getInInterest();
+ getNInInterests();
/// incoming Data (total packets since Face establishment)
const FaceCounter&
- getInData() const;
+ getNInDatas() const;
FaceCounter&
- getInData();
+ getNInDatas();
/// outgoing Interest (total packets since Face establishment)
const FaceCounter&
- getOutInterest() const;
+ getNOutInterests() const;
FaceCounter&
- getOutInterest();
+ getNOutInterests();
/// outgoing Data (total packets since Face establishment)
const FaceCounter&
- getOutData() const;
+ getNOutDatas() const;
FaceCounter&
- getOutData();
+ getNOutDatas();
private:
- FaceCounter m_inInterest;
- FaceCounter m_inData;
- FaceCounter m_outInterest;
- FaceCounter m_outData;
+ FaceCounter m_nInInterests;
+ FaceCounter m_nInDatas;
+ FaceCounter m_outInterests;
+ FaceCounter m_outDatas;
};
inline
FaceCounters::FaceCounters()
- : m_inInterest(0)
- , m_inData(0)
- , m_outInterest(0)
- , m_outData(0)
+ : m_nInInterests(0)
+ , m_nInDatas(0)
+ , m_outInterests(0)
+ , m_outDatas(0)
{
}
inline const FaceCounter&
-FaceCounters::getInInterest() const
+FaceCounters::getNInInterests() const
{
- return m_inInterest;
+ return m_nInInterests;
}
inline FaceCounter&
-FaceCounters::getInInterest()
+FaceCounters::getNInInterests()
{
- return m_inInterest;
+ return m_nInInterests;
}
inline const FaceCounter&
-FaceCounters::getInData() const
+FaceCounters::getNInDatas() const
{
- return m_inData;
+ return m_nInDatas;
}
inline FaceCounter&
-FaceCounters::getInData()
+FaceCounters::getNInDatas()
{
- return m_inData;
+ return m_nInDatas;
}
inline const FaceCounter&
-FaceCounters::getOutInterest() const
+FaceCounters::getNOutInterests() const
{
- return m_outInterest;
+ return m_outInterests;
}
inline FaceCounter&
-FaceCounters::getOutInterest()
+FaceCounters::getNOutInterests()
{
- return m_outInterest;
+ return m_outInterests;
}
inline const FaceCounter&
-FaceCounters::getOutData() const
+FaceCounters::getNOutDatas() const
{
- return m_outData;
+ return m_outDatas;
}
inline FaceCounter&
-FaceCounters::getOutData()
+FaceCounters::getNOutDatas()
{
- return m_outData;
+ return m_outDatas;
}
diff --git a/daemon/face/face.cpp b/daemon/face/face.cpp
index c0241fc..517b230 100644
--- a/daemon/face/face.cpp
+++ b/daemon/face/face.cpp
@@ -24,10 +24,10 @@
, m_localUri(localUri)
, m_isOnDemand(false)
{
- onReceiveInterest += bind(&increaseCounter, boost::ref(m_counters.getInInterest()));
- onReceiveData += bind(&increaseCounter, boost::ref(m_counters.getInData()));
- onSendInterest += bind(&increaseCounter, boost::ref(m_counters.getOutInterest()));
- onSendData += bind(&increaseCounter, boost::ref(m_counters.getOutData()));
+ onReceiveInterest += bind(&increaseCounter, boost::ref(m_counters.getNInInterests()));
+ onReceiveData += bind(&increaseCounter, boost::ref(m_counters.getNInDatas()));
+ onSendInterest += bind(&increaseCounter, boost::ref(m_counters.getNOutInterests()));
+ onSendData += bind(&increaseCounter, boost::ref(m_counters.getNOutDatas()));
}
Face::~Face()
diff --git a/daemon/face/face.hpp b/daemon/face/face.hpp
index 3cb7160..2f555a6 100644
--- a/daemon/face/face.hpp
+++ b/daemon/face/face.hpp
@@ -120,11 +120,6 @@
const FaceCounters&
getCounters() const;
- /** \deprecated use getRemoteUri instead
- */
- const FaceUri&
- getUri() const;
-
/** \return a FaceUri that represents the remote endpoint
*/
const FaceUri&
@@ -183,12 +178,6 @@
}
inline const FaceUri&
-Face::getUri() const
-{
- return this->getRemoteUri();
-}
-
-inline const FaceUri&
Face::getRemoteUri() const
{
return m_remoteUri;
diff --git a/daemon/face/multicast-udp-face.cpp b/daemon/face/multicast-udp-face.cpp
index 7866603..d96c183 100644
--- a/daemon/face/multicast-udp-face.cpp
+++ b/daemon/face/multicast-udp-face.cpp
@@ -10,8 +10,8 @@
NFD_LOG_INIT("MulticastUdpFace");
-MulticastUdpFace::MulticastUdpFace(const shared_ptr<protocol::socket>& socket,
- const protocol::endpoint& localEndpoint)
+MulticastUdpFace::MulticastUdpFace(const shared_ptr<MulticastUdpFace::protocol::socket>& socket,
+ const MulticastUdpFace::protocol::endpoint& localEndpoint)
: DatagramFace<protocol>(FaceUri(socket->local_endpoint()),
FaceUri(localEndpoint),
socket, false)