[HICN-420] MAP-Me code refactoring & face manager changes in support of mobility

Change-Id: I78c37aa274a98089b994348e31e06418c7945d24
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>

2 files changed, 12 insertions, 0 deletions

diff --git a/hicn-light/src/hicn/core/mapme.c b/hicn-light/src/hicn/core/mapme.c
index 79c8a0771..af332ede2 100644
--- a/hicn-light/src/hicn/core/mapme.c
+++ b/hicn-light/src/hicn/core/mapme.c
@@ -338,6 +338,10 @@ static bool mapme_setFacePending(const MapMe *mapme, const Name *name,
   Dispatcher *dispatcher = forwarder_GetDispatcher(mapme->forwarder);
   PARCEventTimer *timer;
 
+  /* Safeguard during retransmissions */
+  if (!TFIB(fibEntry))
+      return true;
+
   /*
    * On the producer side, we have to clear the TFIB everytime we change the list
    * of adjacencies, otherwise retransmissions will occur to preserve them.
@@ -650,6 +654,9 @@ static bool mapme_onSpecialInterest(const MapMe *mapme,
 
   FibEntry *fibEntry = fib_Contains(fib, name);
   if (!fibEntry) {
+    INFO(mapme, "Ignored update with no FIB entry");
+    return 0;
+#if 0
     INFO(mapme,
          "[MAP-Me]   - Re-creating FIB entry with next hop on connection %d",
          conn_in_id);
@@ -688,6 +695,7 @@ static bool mapme_onSpecialInterest(const MapMe *mapme,
     for (size_t i = 0; i < numberSet_Length(lpm_nexthops); i++) {
         fibEntry_AddNexthop(fibEntry, numberSet_GetItem(lpm_nexthops, i));
     }
+#endif
 
   } else if (!TFIB(fibEntry)) {
     /* Create TFIB associated to FIB entry */
diff --git a/hicn-light/src/hicn/processor/fib.c b/hicn-light/src/hicn/processor/fib.c
index 6bb29c404..c67bc6773 100644
--- a/hicn-light/src/hicn/processor/fib.c
+++ b/hicn-light/src/hicn/processor/fib.c
@@ -424,8 +424,10 @@ void fib_Remove(FIB *fib, const Name *name, unsigned connId) {
   }
 
   fibEntry_RemoveNexthopByConnectionId(entry, connId);
+#ifndef WITH_MAPME
   if (fibEntry_NexthopCount(entry) == 0)
     _removeNode(fib, name);
+#endif /* WITH_MAPME */
 
 }
 
@@ -434,9 +436,11 @@ void _removeConnectionId(FibNode *n, unsigned connectionId,
   if(n != NULL){
     if(n->is_used){
       fibEntry_RemoveNexthopByConnectionId(n->entry, connectionId);
+#ifndef WITH_MAPME
       if (fibEntry_NexthopCount(n->entry) == 0) {
         fibEntryList_Append(list, n->entry);
       }
+#endif /* WITH_MAPME */
     }
     _removeConnectionId(n->right, connectionId, list);
     _removeConnectionId(n->left, connectionId, list);