diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2019-12-18 12:17:06 +0000 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2020-04-24 09:54:47 +0000 |
| commit | c99c0250a55ae6d4f02292e94d7b48589f8da4ce (patch) | |
| tree | 383826431a2f11bcb106d48d93a7723e8b0410ef /src/vnet/ip/reass/ip4_sv_reass.c | |
| parent | ec40a7d2bce4bba67af3b3d971547d40e90fdf97 (diff) | |
ip: reassembly: improve type safety
Type: refactor
Change-Id: Ib2d4a11ffa0e1e56ca05705ba8cdf84e6cc66427
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vnet/ip/reass/ip4_sv_reass.c')
| -rw-r--r-- | src/vnet/ip/reass/ip4_sv_reass.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/vnet/ip/reass/ip4_sv_reass.c b/src/vnet/ip/reass/ip4_sv_reass.c index 9b6116c9778..63debefbc98 100644 --- a/src/vnet/ip/reass/ip4_sv_reass.c +++ b/src/vnet/ip/reass/ip4_sv_reass.c @@ -307,8 +307,7 @@ ip4_sv_reass_find_or_create (vlib_main_t * vm, ip4_sv_reass_main_t * rm, ip4_sv_reass_t *reass = NULL; f64 now = vlib_time_now (rm->vlib_main); - if (!clib_bihash_search_16_8 - (&rm->hash, (clib_bihash_kv_16_8_t *) kv, (clib_bihash_kv_16_8_t *) kv)) + if (!clib_bihash_search_16_8 (&rm->hash, &kv->kv, &kv->kv)) { if (vm->thread_index != kv->v.thread_index) { @@ -356,13 +355,13 @@ ip4_sv_reass_find_or_create (vlib_main_t * vm, ip4_sv_reass_main_t * rm, rt->lru_first = rt->lru_last = reass - rt->pool; } - reass->key.as_u64[0] = ((clib_bihash_kv_16_8_t *) kv)->key[0]; - reass->key.as_u64[1] = ((clib_bihash_kv_16_8_t *) kv)->key[1]; + reass->key.as_u64[0] = kv->kv.key[0]; + reass->key.as_u64[1] = kv->kv.key[1]; kv->v.reass_index = (reass - rt->pool); kv->v.thread_index = vm->thread_index; reass->last_heard = now; - if (clib_bihash_add_del_16_8 (&rm->hash, (clib_bihash_kv_16_8_t *) kv, 1)) + if (clib_bihash_add_del_16_8 (&rm->hash, &kv->kv, 1)) { ip4_sv_reass_free (vm, rm, rt, reass); reass = NULL; |