summaryrefslogtreecommitdiffstats
path: root/hicn-light
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2020-01-09 13:24:07 +0000
committerGerrit Code Review <gerrit@fd.io>2020-01-09 13:24:07 +0000
commit41e72f60c2da1586d5330365f065e8908e3b9b07 (patch)
tree7de1a28838f43f573981da4fc9c8e702032e9ab9 /hicn-light
parent00078ca97880ac0ccd5cc70954248dbdcd8e48e1 (diff)
parent9d938ccdb0e3602d725db0319e90c6ad63c1da81 (diff)
Merge "[HICN-467] Priority settings on interfaces yet to be created should be cached for further application"
Diffstat (limited to 'hicn-light')
-rw-r--r--hicn-light/src/hicn/config/controlAdd.c4
-rw-r--r--hicn-light/src/hicn/processor/fibEntry.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/hicn-light/src/hicn/config/controlAdd.c b/hicn-light/src/hicn/config/controlAdd.c
index 519e11e40..e10b56e99 100644
--- a/hicn-light/src/hicn/config/controlAdd.c
+++ b/hicn-light/src/hicn/config/controlAdd.c
@@ -72,9 +72,9 @@ static CommandReturn _controlAdd_HelpExecute(CommandParser *parser,
printf(" %s\n", ops_add_route->command);
printf(" %s\n", ops_add_punting->command);
printf(" %s\n", ops_add_listener->command);
-#ifdef WITH_POLICIES
+#ifdef WITH_POLICY
printf(" %s\n", ops_add_policy->command);
-#endif /* WITH_POLICIES */
+#endif /* WITH_POLICY */
printf("\n");
commandOps_Destroy(&ops_add_connection);
diff --git a/hicn-light/src/hicn/processor/fibEntry.c b/hicn-light/src/hicn/processor/fibEntry.c
index 46917a9d2..fe32ada8d 100644
--- a/hicn-light/src/hicn/processor/fibEntry.c
+++ b/hicn-light/src/hicn/processor/fibEntry.c
@@ -249,10 +249,12 @@ fibEntry_GetAvailableNextHops(const FibEntry *fibEntry, unsigned in_connection)
numberSet_Add(available_nexthops, conn_id);
}
+ /* Terminate selection if there are any local face available */
if (numberSet_Length(available_nexthops) > 0){
if(dealloc_nexthops){
numberSet_Release(&nexthops);
}
+ /* No filtering as all local faces are considered equivalent */
return available_nexthops;
}
}