diff options
| author |   Matus Fabian <matfabia@cisco.com> | 2017-09-10 22:17:47 -0700 |
|---|---|---|
| committer | Matus Fabian <matfabia@cisco.com> | 2017-09-10 22:17:47 -0700 |
| commit | b2d2fc7f581101261f59708eaf7a8ad5272a56cb (patch) | |
| tree | fde30cee7ddb8097cd884b53e2a5953942009b56 /src/plugins/nat | |
| parent | 56dd5438b04b869065d8e901c315496bb6777455 (diff) | |
NAT: fixed hairpinning for in2out translation as an output feature (VPP-976)
Test whether the hairpinning flag is set only for packets from NAT inside interface.
Change-Id: I4a4fdd2084a76a70ce9dfe3e2b8332c02fa2eccd
Signed-off-by: Matus Fabian <matfabia@cisco.com>
Diffstat (limited to 'src/plugins/nat')
| -rw-r--r-- | src/plugins/nat/in2out.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/plugins/nat/in2out.c b/src/plugins/nat/in2out.c index c51d4fb4717..efb3856bfa1 100644 --- a/src/plugins/nat/in2out.c +++ b/src/plugins/nat/in2out.c @@ -3412,6 +3412,8 @@ snat_hairpin_src_fn (vlib_main_t * vm, u32 bi0; vlib_buffer_t * b0; u32 next0; + snat_interface_t *i; + u32 sw_if_index0; /* speculatively enqueue b0 to the current next frame */ bi0 = from[0]; @@ -3422,15 +3424,25 @@ snat_hairpin_src_fn (vlib_main_t * vm, n_left_to_next -= 1; b0 = vlib_get_buffer (vm, bi0); + sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX]; next0 = SNAT_HAIRPIN_SRC_NEXT_INTERFACE_OUTPUT; - if (PREDICT_FALSE ((vnet_buffer (b0)->snat.flags) & SNAT_FLAG_HAIRPINNING)) - { - if (PREDICT_TRUE (sm->num_workers > 1)) - next0 = SNAT_HAIRPIN_SRC_NEXT_SNAT_IN2OUT_WH; - else - next0 = SNAT_HAIRPIN_SRC_NEXT_SNAT_IN2OUT; - } + pool_foreach (i, sm->output_feature_interfaces, + ({ + /* Only packets from NAT inside interface */ + if ((i->is_inside == 1) && (sw_if_index0 == i->sw_if_index)) + { + if (PREDICT_FALSE ((vnet_buffer (b0)->snat.flags) & + SNAT_FLAG_HAIRPINNING)) + { + if (PREDICT_TRUE (sm->num_workers > 1)) + next0 = SNAT_HAIRPIN_SRC_NEXT_SNAT_IN2OUT_WH; + else + next0 = SNAT_HAIRPIN_SRC_NEXT_SNAT_IN2OUT; + } + break; + } + })); pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP; |