diff options
Diffstat (limited to 'hicn-light')
-rw-r--r-- | hicn-light/src/hicn/config/configuration.c | 11 | ||||
-rw-r--r-- | hicn-light/src/hicn/content_store/contentStoreLRU.c | 5 | ||||
-rw-r--r-- | hicn-light/src/hicn/core/mapme.c | 45 | ||||
-rw-r--r-- | hicn-light/src/hicn/processor/fib.c | 4 | ||||
-rw-r--r-- | hicn-light/src/hicn/strategies/loadBalancer.c | 29 |
5 files changed, 61 insertions, 33 deletions
diff --git a/hicn-light/src/hicn/config/configuration.c b/hicn-light/src/hicn/config/configuration.c index 52dbf7a47..8f97af3b1 100644 --- a/hicn-light/src/hicn/config/configuration.c +++ b/hicn-light/src/hicn/config/configuration.c @@ -275,6 +275,7 @@ struct iovec *configuration_ProcessRegistrationList(Configuration *config, FibEntryList *fibList = forwarder_GetFibEntries(config->forwarder); size_t payloadSize = fibEntryList_Length(fibList); + size_t effective_payloadSize = 0; size_t pointerLocation = 0; struct sockaddr_in tmpAddr; struct sockaddr_in6 tmpAddr6; @@ -288,6 +289,9 @@ struct iovec *configuration_ProcessRegistrationList(Configuration *config, NameBitvector *prefix = name_GetContentName(fibEntry_GetPrefix(entry)); const NumberSet *nexthops = fibEntry_GetNexthops(entry); + if (numberSet_Length(nexthops) == 0) + continue; + if (numberSet_Length(nexthops) > 1) { // payload extended, need reallocate, further entries via nexthops payloadSize = payloadSize + numberSet_Length(nexthops) - 1; @@ -316,6 +320,7 @@ struct iovec *configuration_ProcessRegistrationList(Configuration *config, listRouteCommand->cost = 1; // cost pointerLocation++; + effective_payloadSize++; addressDestroy(&addressEntry); } } @@ -323,7 +328,7 @@ struct iovec *configuration_ProcessRegistrationList(Configuration *config, // send response header_control_message *header = request[0].iov_base; header->messageType = RESPONSE_LIGHT; - header->length = (unsigned)payloadSize; + header->length = (unsigned)effective_payloadSize; struct iovec *response = parcMemory_AllocateAndClear(sizeof(struct iovec) * 2); @@ -331,7 +336,7 @@ struct iovec *configuration_ProcessRegistrationList(Configuration *config, response[0].iov_base = header; response[0].iov_len = sizeof(header_control_message); response[1].iov_base = payloadResponse; - response[1].iov_len = sizeof(list_routes_command) * payloadSize; + response[1].iov_len = sizeof(list_routes_command) * effective_payloadSize; fibEntryList_Destroy(&fibList); return response; @@ -364,7 +369,7 @@ struct iovec *configuration_ProcessCreateTunnel(Configuration *config, if (symbolicNameTable_Exists(config->symbolicNameTable, symbolicName)) { logger_Log(config->logger, LoggerFacility_Config, PARCLogLevel_Error, - __func__, "Listener symbolic name already exists"); + __func__, "Connection symbolic name already exists"); goto ERR; } diff --git a/hicn-light/src/hicn/content_store/contentStoreLRU.c b/hicn-light/src/hicn/content_store/contentStoreLRU.c index 847d7a90e..76a2c8659 100644 --- a/hicn-light/src/hicn/content_store/contentStoreLRU.c +++ b/hicn-light/src/hicn/content_store/contentStoreLRU.c @@ -240,6 +240,11 @@ static bool _contentStoreLRU_PutContent(ContentStoreInterface *storeImpl, return false; } + ContentStoreEntry *storeEntry = parcHashCodeTable_Get(store->storageByName, content); + if(storeEntry){ + _contentStoreLRU_PurgeStoreEntry(store, storeEntry); + } + uint64_t expiryTimeTicks = contentStoreEntry_MaxExpiryTime; if (message_HasContentExpiryTime(content)) { diff --git a/hicn-light/src/hicn/core/mapme.c b/hicn-light/src/hicn/core/mapme.c index d5475f229..a0a34e8ce 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. @@ -347,28 +351,30 @@ static bool mapme_setFacePending(const MapMe *mapme, const Name *name, * It is likely we cannot iterator and remove elements from the hashmap at * the same time, so we proceed in two steps */ - NumberSet * conns = numberSet_Create(); + if (parcHashMap_Size(TFIB(fibEntry)->nexthops) > 0) { - PARCIterator *it = parcHashMap_CreateKeyIterator(TFIB(fibEntry)->nexthops); - while (parcIterator_HasNext(it)) { - PARCUnsigned *cid = parcIterator_Next(it); - unsigned conn_id = parcUnsigned_GetUnsigned(cid); - numberSet_Add(conns, conn_id); - } - parcIterator_Release(&it); + NumberSet * conns = numberSet_Create(); - for (size_t i = 0; i < numberSet_Length(conns); i++) { - unsigned conn_id = numberSet_GetItem(conns, i); - PARCEventTimer *oldTimer = (PARCEventTimer *)mapmeTFIB_Get(TFIB(fibEntry), conn_id); - if (oldTimer) + PARCIterator *it = parcHashMap_CreateKeyIterator(TFIB(fibEntry)->nexthops); + while (parcIterator_HasNext(it)) { + PARCUnsigned *cid = parcIterator_Next(it); + unsigned conn_id = parcUnsigned_GetUnsigned(cid); + numberSet_Add(conns, conn_id); + } + parcIterator_Release(&it); + + for (size_t i = 0; i < numberSet_Length(conns); i++) { + unsigned conn_id = numberSet_GetItem(conns, i); + PARCEventTimer *oldTimer = (PARCEventTimer *)mapmeTFIB_Get(TFIB(fibEntry), conn_id); + if (oldTimer) parcEventTimer_Stop(oldTimer); - mapmeTFIB_Remove(TFIB(fibEntry), conn_id); - } + mapmeTFIB_Remove(TFIB(fibEntry), conn_id); + } - numberSet_Release(&conns); + numberSet_Release(&conns); + } } - // NOTE // - at producer, send always true, we always send something reliably so we // set the timer. @@ -566,6 +572,9 @@ mapme_onConnectionEvent(const MapMe *mapme, const Connection *conn_added, connec FibEntry *fibEntry = (FibEntry *)fibEntryList_Get(fiblist, i); mapme_reconsiderFibEntry(mapme, fibEntry); } + + fibEntryList_Destroy(&fiblist); + INFO(mapme, "[MAP-Me] Done"); } @@ -647,6 +656,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); @@ -685,6 +697,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); diff --git a/hicn-light/src/hicn/strategies/loadBalancer.c b/hicn-light/src/hicn/strategies/loadBalancer.c index e3f377791..35d64e763 100644 --- a/hicn-light/src/hicn/strategies/loadBalancer.c +++ b/hicn-light/src/hicn/strategies/loadBalancer.c @@ -344,22 +344,23 @@ static void _strategyLoadBalancer_ImplDestroy(StrategyImpl **strategyPtr) { StrategyImpl *impl = *strategyPtr; StrategyLoadBalancer *strategy = (StrategyLoadBalancer *)impl->context; + if (parcHashMap_Size(strategy->strategy_state) > 0) { + PARCIterator *it = parcHashMap_CreateKeyIterator(strategy->strategy_state); + while (parcIterator_HasNext(it)) { + PARCUnsigned *cid = parcIterator_Next(it); + StrategyNexthopState *state = + (StrategyNexthopState *) parcHashMap_Get(strategy->strategy_state, cid); + parcObject_Release((void **) &state); + } + parcIterator_Release(&it); - PARCIterator *it = parcHashMap_CreateKeyIterator(strategy->strategy_state); - while (parcIterator_HasNext(it)) { - PARCUnsigned *cid = parcIterator_Next(it); - StrategyNexthopState *state = - (StrategyNexthopState *)parcHashMap_Get(strategy->strategy_state, cid); - parcObject_Release((void**)&state); - } - parcIterator_Release(&it); - - parcHashMap_Release(&(strategy->strategy_state)); + parcHashMap_Release(&(strategy->strategy_state)); #ifndef WITH_POLICY - numberSet_Release(&(strategy->nexthops)); + numberSet_Release(&(strategy->nexthops)); #endif /* ! WITH_POLICY */ - parcMemory_Deallocate((void **)&strategy); - parcMemory_Deallocate((void **)&impl); - *strategyPtr = NULL; + parcMemory_Deallocate((void **) &strategy); + parcMemory_Deallocate((void **) &impl); + *strategyPtr = NULL; + } } |