summaryrefslogtreecommitdiffstats
path: root/src/plugins/nat/nat44-ed/nat44_ed_handoff.c
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2021-03-15 19:52:57 +0100
committerKlement Sekera <ksekera@cisco.com>2021-03-15 22:07:43 +0100
commit3a5bd85476311d4ad2b0cbbca3f98d53f13a3afb (patch)
tree2a17c25f10fe3227b12460f3bf82743856d18d47 /src/plugins/nat/nat44-ed/nat44_ed_handoff.c
parent7db75dd0d32d92674bbb7aa1b23341e8a349e05a (diff)
nat: get rid of worker selection callbacks
Make code easier to read and debug. Type: improvement Signed-off-by: Klement Sekera <ksekera@cisco.com> Change-Id: Ib52a4cdd3bcdcc475053aa32af3964c00859e1cd
Diffstat (limited to 'src/plugins/nat/nat44-ed/nat44_ed_handoff.c')
-rw-r--r--src/plugins/nat/nat44-ed/nat44_ed_handoff.c30
1 files changed, 20 insertions, 10 deletions
diff --git a/src/plugins/nat/nat44-ed/nat44_ed_handoff.c b/src/plugins/nat/nat44-ed/nat44_ed_handoff.c
index e286df93a6e..597a08c77b4 100644
--- a/src/plugins/nat/nat44-ed/nat44_ed_handoff.c
+++ b/src/plugins/nat/nat44-ed/nat44_ed_handoff.c
@@ -157,17 +157,25 @@ nat44_worker_handoff_fn_inline (vlib_main_t * vm,
if (is_in2out)
{
- ti[0] = sm->worker_in2out_cb (b[0], ip0, rx_fib_index0, is_output);
- ti[1] = sm->worker_in2out_cb (b[1], ip1, rx_fib_index1, is_output);
- ti[2] = sm->worker_in2out_cb (b[2], ip2, rx_fib_index2, is_output);
- ti[3] = sm->worker_in2out_cb (b[3], ip3, rx_fib_index3, is_output);
+ ti[0] = nat44_ed_get_in2out_worker_index (b[0], ip0, rx_fib_index0,
+ is_output);
+ ti[1] = nat44_ed_get_in2out_worker_index (b[1], ip1, rx_fib_index1,
+ is_output);
+ ti[2] = nat44_ed_get_in2out_worker_index (b[2], ip2, rx_fib_index2,
+ is_output);
+ ti[3] = nat44_ed_get_in2out_worker_index (b[3], ip3, rx_fib_index3,
+ is_output);
}
else
{
- ti[0] = sm->worker_out2in_cb (b[0], ip0, rx_fib_index0, is_output);
- ti[1] = sm->worker_out2in_cb (b[1], ip1, rx_fib_index1, is_output);
- ti[2] = sm->worker_out2in_cb (b[2], ip2, rx_fib_index2, is_output);
- ti[3] = sm->worker_out2in_cb (b[3], ip3, rx_fib_index3, is_output);
+ ti[0] = nat44_ed_get_out2in_worker_index (b[0], ip0, rx_fib_index0,
+ is_output);
+ ti[1] = nat44_ed_get_out2in_worker_index (b[1], ip1, rx_fib_index1,
+ is_output);
+ ti[2] = nat44_ed_get_out2in_worker_index (b[2], ip2, rx_fib_index2,
+ is_output);
+ ti[3] = nat44_ed_get_out2in_worker_index (b[3], ip3, rx_fib_index3,
+ is_output);
}
if (ti[0] == thread_index)
@@ -218,11 +226,13 @@ nat44_worker_handoff_fn_inline (vlib_main_t * vm,
if (is_in2out)
{
- ti[0] = sm->worker_in2out_cb (b[0], ip0, rx_fib_index0, is_output);
+ ti[0] = nat44_ed_get_in2out_worker_index (b[0], ip0, rx_fib_index0,
+ is_output);
}
else
{
- ti[0] = sm->worker_out2in_cb (b[0], ip0, rx_fib_index0, is_output);
+ ti[0] = nat44_ed_get_out2in_worker_index (b[0], ip0, rx_fib_index0,
+ is_output);
}
if (ti[0] == thread_index)