diff options
| author |   Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2021-03-05 17:16:40 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2021-03-15 17:36:23 +0000 |
| commit | 418abe2a259bc8c04c3b8839099204d56ae504ba (patch) | |
| tree | ef5cb4dacc94843b38fe7286e01afa263d5dff4e /src/plugins/cnat/cnat_node_feature.c | |
| parent | 592dbd0ad3b464d14aba7ccec918d5ed7f9429fc (diff) | |
cnat: maglev fixes
This fixes cnat_feature node LB
- use siblings instead of direct next_nodes
- only do the lookup if we have NO_NAT
- fix behavior in v6
Type: fix
Change-Id: Ie80c9912946bf55c30eadeb51340f4aec9bb297e
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Diffstat (limited to 'src/plugins/cnat/cnat_node_feature.c')
| -rw-r--r-- | src/plugins/cnat/cnat_node_feature.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/cnat/cnat_node_feature.c b/src/plugins/cnat/cnat_node_feature.c index 4585fcb5dd6..f9b6fa2a40d 100644 --- a/src/plugins/cnat/cnat_node_feature.c +++ b/src/plugins/cnat/cnat_node_feature.c @@ -126,19 +126,19 @@ cnat_input_feature_fn (vlib_main_t *vm, vlib_node_runtime_t *node, clib_host_to_net_u16 (trk0->ct_ep[VLIB_TX].ce_port); session->value.cs_port[VLIB_RX] = udp0->src_port; - const dpo_id_t *dpo0; - const load_balance_t *lb1; - fib_entry_t *fib_entry; - fib_entry = fib_entry_get (trk0->ct_fei); - - lb1 = load_balance_get (fib_entry->fe_lb /*[fct] */.dpoi_index); - dpo0 = load_balance_get_bucket_i (lb1, 0); + if (trk0->ct_flags & CNAT_TRK_FLAG_NO_NAT) + { + const dpo_id_t *dpo0; + const load_balance_t *lb1; - session->value.dpoi_next_node = dpo0->dpoi_next_node; - session->value.cs_lbi = dpo0->dpoi_index; + lb1 = load_balance_get (trk0->ct_dpo.dpoi_index); + /* Assume backend has exactly one item in LB */ + dpo0 = load_balance_get_bucket_i (lb1, 0); - if (trk0->ct_flags & CNAT_TRK_FLAG_NO_NAT) - session->value.flags |= CNAT_SESSION_FLAG_NO_NAT; + session->value.dpoi_next_node = dpo0->dpoi_next_node; + session->value.cs_lbi = dpo0->dpoi_index; + session->value.flags = CNAT_SESSION_FLAG_NO_NAT; + } /* refcnt session in current client */ cnat_client_cnt_session (cc); @@ -146,11 +146,13 @@ cnat_input_feature_fn (vlib_main_t *vm, vlib_node_runtime_t *node, trace_flags |= CNAT_TRACE_SESSION_CREATED; } - next0 = session->value.dpoi_next_node; - vnet_buffer (b)->ip.adj_index[VLIB_TX] = session->value.cs_lbi; - if (session->value.flags & CNAT_SESSION_FLAG_NO_NAT) - goto trace; + { + /* If we don't translate, directly do the lookup & bypass arc */ + next0 = session->value.dpoi_next_node; + vnet_buffer (b)->ip.adj_index[VLIB_TX] = session->value.cs_lbi; + goto trace; + } if (AF_IP4 == ctx->af) cnat_translation_ip4 (session, ip4, udp0); @@ -190,8 +192,7 @@ VLIB_REGISTER_NODE (cnat_input_feature_ip4_node) = { .type = VLIB_NODE_TYPE_INTERNAL, .n_errors = CNAT_N_ERROR, .error_strings = cnat_error_strings, - .n_next_nodes = IP_LOOKUP_N_NEXT, - .next_nodes = IP4_LOOKUP_NEXT_NODES, + .sibling_of = "ip4-lookup", }; VNET_FEATURE_INIT (cnat_in_ip4_feature, static) = { @@ -217,8 +218,7 @@ VLIB_REGISTER_NODE (cnat_input_feature_ip6_node) = { .type = VLIB_NODE_TYPE_INTERNAL, .n_errors = CNAT_N_ERROR, .error_strings = cnat_error_strings, - .n_next_nodes = IP6_LOOKUP_N_NEXT, - .next_nodes = IP6_LOOKUP_NEXT_NODES, + .sibling_of = "ip6-lookup", }; VNET_FEATURE_INIT (cnat_in_ip6_feature, static) = { |