commit 79494164c3e48247b80cfc592454bc257893a952
author Junxiao Shi <git@mail1.yoursunny.com> Wed Apr 02 18:25:11 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Apr 02 18:43:01 2014 -0700
tree cdda289b9d2b15f60e766ff74b2cfaf3e84e39f5
parent e38b1c4e8feb20252dfa67ee1fda6b0f106aa78d

face: Face::getLocalUri

refs #1396

Change-Id: Icf02ae0a4136b6da3f6388cdce2f861bec44e940

daemon/face/face.cpp

diff --git a/daemon/face/face.cpp b/daemon/face/face.cpp
index 08853aa..c0241fc 100644
--- a/daemon/face/face.cpp
+++ b/daemon/face/face.cpp
@@ -11,23 +11,23 @@
 
 NFD_LOG_INIT("Face")
 
-template<class Packet>
 static inline void
-increaseCounter(const Packet& packet, FaceCounter& counter)
+increaseCounter(FaceCounter& counter)
 {
   ++counter;
 }
 
-Face::Face(const FaceUri& uri, bool isLocal)
+Face::Face(const FaceUri& remoteUri, const FaceUri& localUri, bool isLocal)
   : m_id(INVALID_FACEID)
   , m_isLocal(isLocal)
-  , m_uri(uri)
+  , m_remoteUri(remoteUri)
+  , m_localUri(localUri)
   , m_isOnDemand(false)
 {
-  onReceiveInterest += bind(&increaseCounter<Interest>, _1, boost::ref(m_counters.getInInterest()));
-  onReceiveData     += bind(&increaseCounter<Data>,     _1, boost::ref(m_counters.getInData()));
-  onSendInterest    += bind(&increaseCounter<Interest>, _1, boost::ref(m_counters.getOutInterest()));
-  onSendData        += bind(&increaseCounter<Data>,     _1, boost::ref(m_counters.getOutData()));
+  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()));
 }
 
 Face::~Face()