From e6a120973cca65ca464d1323a6f7f4308dcb4717 Mon Sep 17 00:00:00 2001 From: Alberto Compagno Date: Mon, 9 Mar 2020 11:39:59 +0100 Subject: [HICN-547] Removing punting through acl for interests Change-Id: I71767f732ec6ede1efc66e5a99f09c3207367dcb Signed-off-by: Alberto Compagno --- hicn-plugin/src/interest_pcslookup_node.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'hicn-plugin/src/interest_pcslookup_node.c') diff --git a/hicn-plugin/src/interest_pcslookup_node.c b/hicn-plugin/src/interest_pcslookup_node.c index 40d62510b..6ac2aa3a0 100644 --- a/hicn-plugin/src/interest_pcslookup_node.c +++ b/hicn-plugin/src/interest_pcslookup_node.c @@ -85,7 +85,7 @@ hicn_interest_pcslookup_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, hicn_name_t name; hicn_header_t *hicn0; u32 node_id0 = 0; - u8 dpo_ctx_id0 = 0; + index_t dpo_ctx_id0 = 0; u8 vft_id0 = 0; u8 is_cs0 = 0; u8 hash_entry_id = 0; @@ -113,9 +113,7 @@ hicn_interest_pcslookup_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, if (PREDICT_TRUE (ret == HICN_ERROR_NONE)) { - next0 = - isv6 ? HICN_INTEREST_PCSLOOKUP_NEXT_V6_LOOKUP : - HICN_INTEREST_PCSLOOKUP_NEXT_V4_LOOKUP; + next0 = HICN_INTEREST_PCSLOOKUP_NEXT_STRATEGY; } nameptr = (u8 *) (&name); stats.pkts_processed++; @@ -224,8 +222,7 @@ VLIB_REGISTER_NODE(hicn_interest_pcslookup_node) = .n_next_nodes = HICN_INTEREST_PCSLOOKUP_N_NEXT, .next_nodes = { - [HICN_INTEREST_PCSLOOKUP_NEXT_V4_LOOKUP] = "ip4-lookup", - [HICN_INTEREST_PCSLOOKUP_NEXT_V6_LOOKUP] = "ip6-lookup", + [HICN_INTEREST_PCSLOOKUP_NEXT_STRATEGY] = "hicn-strategy", [HICN_INTEREST_PCSLOOKUP_NEXT_INTEREST_HITPIT] = "hicn-interest-hitpit", [HICN_INTEREST_PCSLOOKUP_NEXT_INTEREST_HITCS] = "hicn-interest-hitcs", [HICN_INTEREST_PCSLOOKUP_NEXT_ERROR_DROP] = "error-drop", -- cgit 1.2.3-korg