diff options
| author |   Nathan Skrzypczak <nathan.skrzypczak@gmail.com> | 2020-11-03 17:44:28 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2020-11-10 10:33:02 +0000 |
| commit | 212ec2af92b148cd3747e6ab424c0080d4a62968 (patch) | |
| tree | 8382c75cb6accfdc7d2a96cd26a9570c601ad86f /src/plugins/cnat/cnat_node_vip.c | |
| parent | 5f09efe70cc872a97c9db4c3a53455712548cad7 (diff) | |
cnat: Fix invalid adj_index
Type: fix
When using sNAT in combination with cnat translations
it might happen that the cnat_node_vip.c picks up a
translation on a session that has an invalid lb index,
thus resulting in a later crash in ip4-load-balance
Change-Id: I82607086b2d672a9dcf26bfb82ad7f83e6474562
Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
Diffstat (limited to 'src/plugins/cnat/cnat_node_vip.c')
| -rw-r--r-- | src/plugins/cnat/cnat_node_vip.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/cnat/cnat_node_vip.c b/src/plugins/cnat/cnat_node_vip.c index 8dd53ad6fb4..ffe5899c0cf 100644 --- a/src/plugins/cnat/cnat_node_vip.c +++ b/src/plugins/cnat/cnat_node_vip.c @@ -106,17 +106,15 @@ cnat_vip_node_fn (vlib_main_t * vm, goto trace; } - ct = cnat_find_translation (cc->parent_cci, - clib_host_to_net_u16 (udp0->dst_port), iproto); - if (!rv) { /* session table hit */ cnat_timestamp_update (session->value.cs_ts_index, ctx->now); - if (NULL != ct) + if (INDEX_INVALID != session->value.cs_lbi) { /* Translate & follow the translation given LB */ + ct = cnat_translation_get (session->value.ct_index); next0 = ct->ct_lb.dpoi_next_node; vnet_buffer (b)->ip.adj_index[VLIB_TX] = session->value.cs_lbi; } @@ -135,6 +133,9 @@ cnat_vip_node_fn (vlib_main_t * vm, } else { + ct = + cnat_find_translation (cc->parent_cci, + clib_host_to_net_u16 (udp0->dst_port), iproto); if (NULL == ct) { /* Dont translate & Follow the fib programming */ @@ -192,7 +193,7 @@ cnat_vip_node_fn (vlib_main_t * vm, session->value.cs_port[VLIB_RX] = clib_host_to_net_u16 (trk0->ct_ep[VLIB_RX].ce_port); - session->value.flags = 0; + session->value.ct_index = ct - cnat_translation_pool; session->value.cs_lbi = dpo0->dpoi_index; rv = cspm->vip_policy (vm, b, session, &rsession_flags, ct, ctx); |