interest+data: Add incomingFaceId into Interest and Data.

Change-Id: I872b578d1411d62deb5753cd4f5294849c5e4995
diff --git a/src/data.hpp b/src/data.hpp
index 29a38d6..dc6d9f0 100644
--- a/src/data.hpp
+++ b/src/data.hpp
@@ -127,6 +127,12 @@
 
   inline void
   setSignatureValue(const Block &value);
+
+  inline uint64_t
+  getIncomingFaceId() const;
+
+  inline void
+  setIncomingFaceId(uint64_t incomingFaceId);
   
 private:
   /**
@@ -142,6 +148,8 @@
   Signature signature_;
 
   mutable Block wire_;
+
+  uint64_t m_incomingFaceId;
 };
 
 inline
@@ -272,6 +280,17 @@
   signature_.setValue(value);
 }
 
+inline uint64_t
+Data::getIncomingFaceId() const
+{
+  return m_incomingFaceId;
+}
+
+inline void
+Data::setIncomingFaceId(uint64_t incomingFaceId)
+{
+  m_incomingFaceId = incomingFaceId;
+}
 
 inline void 
 Data::onChanged()
diff --git a/src/interest.hpp b/src/interest.hpp
index 8fe3119..29ce962 100644
--- a/src/interest.hpp
+++ b/src/interest.hpp
@@ -141,6 +141,9 @@
    */
   const uint32_t&
   getNonce() const;
+
+  uint64_t
+  getIncomingFaceId() const { return m_incomingFaceId; }
     
   void
   setName(const Name& name) { name_ = name; }
@@ -166,6 +169,9 @@
   void 
   setNonce(uint32_t nonce) { nonce_ = nonce; }
 
+  void
+  setIncomingFaceId(uint64_t incomingFaceId) { m_incomingFaceId = incomingFaceId; }
+
   inline bool
   hasSelectors() const;
 
@@ -206,6 +212,8 @@
   mutable uint32_t nonce_;
 
   mutable Block wire_;
+
+  uint64_t m_incomingFaceId;
 };
 
 std::ostream &