commit 483efd16685a19da9969ccef9e6357af860c7c0c
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 14 10:51:18 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 14 10:51:18 2014 -0700
tree 35b76d4b99f0996760c29d236fac2319df87f609
parent cbb490a6deedd5ce5df412fa68d81c07d93eb9f7

rib: Disable FaceId check for self-registrations

Change-Id: I9e022d3067c5c4ecb3ec0a10a4446e9af49c68eb
Refs: #1852

rib/rib-manager.cpp

diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp
index d4be75d..80a3fa2 100644
--- a/rib/rib-manager.cpp
+++ b/rib/rib-manager.cpp
@@ -253,13 +253,15 @@
       return;
     }
 
-  if (!parameters.hasFaceId() || parameters.getFaceId() == 0)
+  bool isSelfRegistration = (!parameters.hasFaceId() || parameters.getFaceId() == 0);
+  if (isSelfRegistration)
     {
       parameters.setFaceId(request->getIncomingFaceId());
     }
 
   // Is the face valid?
-  if (activeFaces.find(parameters.getFaceId()) == activeFaces.end())
+  // Issue 1852: There is no need to check (and it can easily fail) for self-registrations
+  if (!isSelfRegistration && activeFaces.find(parameters.getFaceId()) == activeFaces.end())
     {
       NFD_LOG_DEBUG("register result: FAIL reason: unknown faceId");
 
@@ -327,13 +329,15 @@
       return;
     }
 
-  if (!parameters.hasFaceId() || parameters.getFaceId() == 0)
+  bool isSelfRegistration = (!parameters.hasFaceId() || parameters.getFaceId() == 0);
+  if (isSelfRegistration)
     {
       parameters.setFaceId(request->getIncomingFaceId());
     }
 
   // Is the face valid?
-  if (activeFaces.find(parameters.getFaceId()) == activeFaces.end())
+  // Issue 1852: There is no need to check (and it can easily fail) for self-registrations
+  if (!isSelfRegistration && activeFaces.find(parameters.getFaceId()) == activeFaces.end())
     {
       NFD_LOG_DEBUG("register result: FAIL reason: unknown faceId");