summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/acl/public_inlines.h6
-rw-r--r--src/plugins/acl/session_inlines.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/acl/public_inlines.h b/src/plugins/acl/public_inlines.h
index 3e6c95ad6d9..e7b085271f6 100644
--- a/src/plugins/acl/public_inlines.h
+++ b/src/plugins/acl/public_inlines.h
@@ -270,10 +270,8 @@ acl_fill_5tuple (acl_main_t * am, vlib_buffer_t * b0, int is_ip6,
}
else
{
- p5tuple_pkt->kv.key[0] = 0;
- p5tuple_pkt->kv.key[1] = 0;
- p5tuple_pkt->kv.key[2] = 0;
- p5tuple_pkt->kv.key[3] = 0;
+ ip46_address_mask_ip4(&p5tuple_pkt->addr[0]);
+ ip46_address_mask_ip4(&p5tuple_pkt->addr[1]);
clib_memcpy (&p5tuple_pkt->addr[0].ip4,
get_ptr_to_offset (b0,
offsetof (ip4_header_t,
diff --git a/src/plugins/acl/session_inlines.h b/src/plugins/acl/session_inlines.h
index d43e550bef9..1fc49818e95 100644
--- a/src/plugins/acl/session_inlines.h
+++ b/src/plugins/acl/session_inlines.h
@@ -447,7 +447,7 @@ always_inline int
acl_fa_find_session (acl_main_t * am, u32 sw_if_index0, fa_5tuple_t * p5tuple,
clib_bihash_kv_40_8_t * pvalue_sess)
{
- return (clib_bihash_search_40_8
+ return (clib_bihash_search_inline_2_40_8
(&am->fa_sessions_hash, &p5tuple->kv, pvalue_sess) == 0);
}