From 229385955109b866a23c4ac2aa03d4d11044c39d Mon Sep 17 00:00:00 2001 From: "Enrico Loparco (eloparco)" Date: Thu, 24 Jun 2021 09:15:41 +0200 Subject: [HICN-708] Rebase with master Signed-off-by: Enrico Loparco (eloparco) Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159 --- hicn-light/src/hicn/core/fib_entry.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'hicn-light/src/hicn/core/fib_entry.c') diff --git a/hicn-light/src/hicn/core/fib_entry.c b/hicn-light/src/hicn/core/fib_entry.c index 5c6e28d5b..59e5f7e7c 100644 --- a/hicn-light/src/hicn/core/fib_entry.c +++ b/hicn-light/src/hicn/core/fib_entry.c @@ -20,7 +20,6 @@ //#include #include #include -#include #ifdef WITH_MAPME #include @@ -122,7 +121,7 @@ fib_entry_filter_nexthops(fib_entry_t * entry, nexthops_t * nexthops, unsigned nexthop, i; uint_fast32_t flags; - policy_t policy = fib_entry_get_policy(entry); + hicn_policy_t policy = fib_entry_get_policy(entry); nexthops_enumerate(nexthops, i, nexthop, { conn = connection_table_at(table, nexthop); @@ -325,14 +324,14 @@ fib_entry_get_available_nexthops(fib_entry_t * entry, unsigned ingress_id, nexth return fib_entry_filter_nexthops(entry, fib_entry_get_nexthops(entry), ingress_id, true); } -policy_t +hicn_policy_t fib_entry_get_policy(const fib_entry_t * entry) { return entry->policy; } void -fib_entry_set_policy(fib_entry_t * entry, policy_t policy) +fib_entry_set_policy(fib_entry_t * entry, hicn_policy_t policy) { entry->policy = policy; @@ -406,7 +405,7 @@ fib_entry_get_nexthops_from_strategy(fib_entry_t * entry, * If multipath is disabled, we don't offer much choice to the forwarding * strategy, but still go through it for accounting purposes. */ - policy_t policy = fib_entry_get_policy(entry); + hicn_policy_t policy = fib_entry_get_policy(entry); if ((policy.tags[POLICY_TAG_MULTIPATH].state == POLICY_STATE_PROHIBIT) || (policy.tags[POLICY_TAG_MULTIPATH].state != POLICY_STATE_AVOID)) { nexthops_select_one(nexthops); -- cgit 1.2.3-korg