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_types.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_types.c')
-rw-r--r-- | src/plugins/cnat/cnat_types.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/plugins/cnat/cnat_types.c b/src/plugins/cnat/cnat_types.c index 837f40082c3..9b164c6069d 100644 --- a/src/plugins/cnat/cnat_types.c +++ b/src/plugins/cnat/cnat_types.c @@ -103,16 +103,28 @@ unformat_cnat_ep (unformat_input_t * input, va_list * args) } uword +unformat_cnat_ep_flags (unformat_input_t *input, va_list *args) +{ + int *a = va_arg (*args, int *); + if (unformat (input, ":nonat")) + *a = CNAT_TRK_FLAG_NO_NAT; + return 1; +} + +uword unformat_cnat_ep_tuple (unformat_input_t * input, va_list * args) { cnat_endpoint_tuple_t *a = va_arg (*args, cnat_endpoint_tuple_t *); - if (unformat (input, "%U->%U", unformat_cnat_ep, &a->src_ep, - unformat_cnat_ep, &a->dst_ep)) - ; - else if (unformat (input, "->%U", unformat_cnat_ep, &a->dst_ep)) - ; - else if (unformat (input, "%U->", unformat_cnat_ep, &a->src_ep)) - ; + int flgs = 0; + if (unformat (input, "%U->%U%U", unformat_cnat_ep, &a->src_ep, + unformat_cnat_ep, &a->dst_ep, unformat_cnat_ep_flags, &flgs)) + a->ep_flags = flgs; + else if (unformat (input, "->%U%U", unformat_cnat_ep, &a->dst_ep, + unformat_cnat_ep_flags, &flgs)) + a->ep_flags = flgs; + else if (unformat (input, "%U->%U", unformat_cnat_ep, &a->src_ep, + unformat_cnat_ep_flags, &flgs)) + a->ep_flags = flgs; else return 0; return 1; |