From 3a5bd85476311d4ad2b0cbbca3f98d53f13a3afb Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Mon, 15 Mar 2021 19:52:57 +0100 Subject: nat: get rid of worker selection callbacks Make code easier to read and debug. Type: improvement Signed-off-by: Klement Sekera Change-Id: Ib52a4cdd3bcdcc475053aa32af3964c00859e1cd --- src/plugins/nat/nat44-ei/nat44_ei.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/nat/nat44-ei/nat44_ei.c') diff --git a/src/plugins/nat/nat44-ei/nat44_ei.c b/src/plugins/nat/nat44-ei/nat44_ei.c index 67757015b1d..d7e74bbc725 100644 --- a/src/plugins/nat/nat44-ei/nat44_ei.c +++ b/src/plugins/nat/nat44-ei/nat44_ei.c @@ -322,8 +322,6 @@ nat44_ei_init (vlib_main_t *vm) nm->fq_out2in_index = ~0; nm->fq_in2out_index = ~0; nm->fq_in2out_output_index = ~0; - nm->worker_in2out_cb = nat44_ei_get_in2out_worker_index; - nm->worker_out2in_cb = nat44_ei_get_out2in_worker_index; nm->log_level = NAT_LOG_ERROR; @@ -1751,8 +1749,9 @@ nat44_ei_del_session (nat44_ei_main_t *nm, ip4_address_t *addr, u16 port, ip.dst_address.as_u32 = ip.src_address.as_u32 = addr->as_u32; if (nm->num_workers > 1) - tnm = vec_elt_at_index (nm->per_thread_data, - nm->worker_in2out_cb (&ip, fib_index, 0)); + tnm = + vec_elt_at_index (nm->per_thread_data, + nat44_ei_get_in2out_worker_index (&ip, fib_index, 0)); else tnm = vec_elt_at_index (nm->per_thread_data, nm->num_workers); @@ -2036,7 +2035,8 @@ nat44_ei_add_del_static_mapping (ip4_address_t l_addr, ip4_address_t e_addr, ip4_header_t ip = { .src_address = m->local_addr, }; - vec_add1 (m->workers, nm->worker_in2out_cb (&ip, m->fib_index, 0)); + vec_add1 (m->workers, + nat44_ei_get_in2out_worker_index (&ip, m->fib_index, 0)); tnm = vec_elt_at_index (nm->per_thread_data, m->workers[0]); } else -- cgit 1.2.3-korg