face: reserved FaceIds and NullFace
refs #1620, #1622
Change-Id: I315ae262c7e0813a64b69d3e7d67de61b7b88c55
diff --git a/daemon/fw/face-table.cpp b/daemon/fw/face-table.cpp
index 10dbdfd..a95c562 100644
--- a/daemon/fw/face-table.cpp
+++ b/daemon/fw/face-table.cpp
@@ -1,11 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014 Regents of the University of California,
- * Arizona Board of Regents,
- * Colorado State University,
- * University Pierre & Marie Curie, Sorbonne University,
- * Washington University in St. Louis,
- * Beijing Institute of Technology
+ * Copyright (c) 2014, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -20,7 +21,7 @@
*
* You should have received a copy of the GNU General Public License along with
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
#include "face-table.hpp"
#include "forwarder.hpp"
@@ -32,7 +33,7 @@
FaceTable::FaceTable(Forwarder& forwarder)
: m_forwarder(forwarder)
- , m_lastFaceId(0)
+ , m_lastFaceId(FACEID_RESERVED_MAX)
{
}
@@ -44,18 +45,32 @@
void
FaceTable::add(shared_ptr<Face> face)
{
- if (face->getId() != INVALID_FACEID &&
- m_faces.count(face->getId()) > 0)
- {
- NFD_LOG_DEBUG("Trying to add existing face id=" << face->getId() << " to the face table");
- return;
- }
+ if (face->getId() != INVALID_FACEID && m_faces.count(face->getId()) > 0) {
+ NFD_LOG_WARN("Trying to add existing face id=" << face->getId() << " to the face table");
+ return;
+ }
FaceId faceId = ++m_lastFaceId;
+ BOOST_ASSERT(faceId > FACEID_RESERVED_MAX);
+ this->addImpl(face, faceId);
+}
+
+void
+FaceTable::addReserved(shared_ptr<Face> face, FaceId faceId)
+{
+ BOOST_ASSERT(face->getId() == INVALID_FACEID);
+ BOOST_ASSERT(m_faces.count(face->getId()) == 0);
+ BOOST_ASSERT(faceId <= FACEID_RESERVED_MAX);
+ this->addImpl(face, faceId);
+}
+
+void
+FaceTable::addImpl(shared_ptr<Face> face, FaceId faceId)
+{
face->setId(faceId);
m_faces[faceId] = face;
- NFD_LOG_INFO("Added face id=" << faceId << " remote=" << face->getRemoteUri() <<
- " local=" << face->getLocalUri());
+ NFD_LOG_INFO("Added face id=" << faceId << " remote=" << face->getRemoteUri()
+ << " local=" << face->getLocalUri());
face->onReceiveInterest += bind(&Forwarder::onInterest,
&m_forwarder, ref(*face), _1);
diff --git a/daemon/fw/face-table.hpp b/daemon/fw/face-table.hpp
index 8f7dcb2..a255cfe 100644
--- a/daemon/fw/face-table.hpp
+++ b/daemon/fw/face-table.hpp
@@ -1,11 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014 Regents of the University of California,
- * Arizona Board of Regents,
- * Colorado State University,
- * University Pierre & Marie Curie, Sorbonne University,
- * Washington University in St. Louis,
- * Beijing Institute of Technology
+ * Copyright (c) 2014, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis
*
* This file is part of NFD (Named Data Networking Forwarding Daemon).
* See AUTHORS.md for complete list of NFD authors and contributors.
@@ -20,7 +21,7 @@
*
* You should have received a copy of the GNU General Public License along with
* NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
#ifndef NFD_DAEMON_FW_FACE_TABLE_HPP
#define NFD_DAEMON_FW_FACE_TABLE_HPP
@@ -35,7 +36,7 @@
/** \brief container of all Faces
*/
-class FaceTable
+class FaceTable : noncopyable
{
public:
explicit
@@ -47,6 +48,10 @@
VIRTUAL_WITH_TESTS void
add(shared_ptr<Face> face);
+ /// add a special Face with a reserved FaceId
+ VIRTUAL_WITH_TESTS void
+ addReserved(shared_ptr<Face> face, FaceId faceId);
+
VIRTUAL_WITH_TESTS shared_ptr<Face>
get(FaceId id) const;
@@ -88,8 +93,11 @@
EventEmitter<shared_ptr<Face> > onRemove;
private:
+ void
+ addImpl(shared_ptr<Face> face, FaceId faceId);
+
// remove is private because it's a subscriber of face.onFail event.
- // face->close() closes a face and would trigger .remove(face)
+ // face->close() closes a face and triggers .remove(face)
void
remove(shared_ptr<Face> face);
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index a57a756..d3fb541 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -92,6 +92,7 @@
// CS lookup
const Data* csMatch = m_cs.find(interest);
if (csMatch != 0) {
+ const_cast<Data*>(csMatch)->setIncomingFaceId(FACEID_CONTENT_STORE);
// XXX should we lookup PIT for other Interests that also match csMatch?
// goto outgoing Data pipeline