From 707a14c46b1a5ba66e1abf7f7a9f0aed16f67501 Mon Sep 17 00:00:00 2001
From: michele papalini <micpapal@cisco.com>
Date: Thu, 22 Aug 2019 17:54:24 +0200
Subject: HICN-266 fix strategy creation with policies

Change-Id: I285389e02742768ec65304cd088312492ddcb281
Signed-off-by: michele papalini <micpapal@cisco.com>
---
 hicn-light/src/hicn/processor/messageProcessor.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'hicn-light/src/hicn/processor/messageProcessor.c')

diff --git a/hicn-light/src/hicn/processor/messageProcessor.c b/hicn-light/src/hicn/processor/messageProcessor.c
index 7e0ece257..420863e26 100644
--- a/hicn-light/src/hicn/processor/messageProcessor.c
+++ b/hicn-light/src/hicn/processor/messageProcessor.c
@@ -34,9 +34,7 @@
 #include <hicn/content_store/contentStoreLRU.h>
 
 #include <hicn/strategies/loadBalancer.h>
-#ifndef WITH_POLICY
 #include <hicn/strategies/loadBalancerWithPD.h>
-#endif /* ! WITH_POLICY */
 #include <hicn/strategies/rnd.h>
 #include <hicn/strategies/rndSegment.h>
 #include <hicn/strategies/strategyImpl.h>
@@ -311,16 +309,14 @@ bool messageProcessor_AddOrUpdateRoute(MessageProcessor *processor,
   Name *prefix = name_CreateFromAddress(control->addressType, control->address,
                                         control->len);
   FibEntry *entry = fib_Contains(processor->fib, prefix);
-#ifndef WITH_POLICY
   bool newEntry = false;
-#endif /* ! WITH_POLICY */
   if (entry != NULL) {
     fibEntry_AddNexthop(entry, ifidx);
   } else {
+    newEntry = true;
 #ifdef WITH_POLICY
     entry = fibEntry_Create(prefix, fwdStrategy, processor->forwarder);
 #else
-    newEntry = true;
     entry = fibEntry_Create(prefix, fwdStrategy);
 #endif /* WITH_POLICY */
     fibEntry_AddNexthop(entry, ifidx);
@@ -329,7 +325,6 @@ bool messageProcessor_AddOrUpdateRoute(MessageProcessor *processor,
 
   name_Release(&prefix);
 
-#ifndef WITH_POLICY
   /* For policy implementation, we need access to the ConnectionTable in all
    * Forwarding Strategies, so it is setup during FIB Entry creation */
   if (newEntry && (fwdStrategy == SET_STRATEGY_LOADBALANCER_WITH_DELAY)) {
@@ -337,7 +332,6 @@ bool messageProcessor_AddOrUpdateRoute(MessageProcessor *processor,
         fibEntry_GetFwdStrategy(entry),
         forwarder_GetConnectionTable(processor->forwarder));
   }
-#endif /* ! WITH_POLICY */
 
   return true;
 }
-- 
cgit 1.2.3-korg