diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-11-08 07:31:36 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-11-08 16:43:55 +0000 |
| commit | a71844f27a0be91fcda25b19604d16122ccc3e73 (patch) | |
| tree | 4281bee16aada57738fd75aa136a3c1d50b06fef | |
| parent | 0ac1dd842a59217a4740e20c9766dfb6f9c0cbbf (diff) | |
IP load-balance; trace at the end of the node so the flow hash used is displayed
Change-Id: Idbce0393fc9e6e8dbb2765ed164ba7f90d1ffccc
Signed-off-by: Neale Ranns <nranns@cisco.com>
| -rw-r--r-- | src/vnet/ip/ip4_forward.c | 6 | ||||
| -rw-r--r-- | src/vnet/ip/ip6_forward.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c index 4fdedc11e9e..9911eb71b99 100644 --- a/src/vnet/ip/ip4_forward.c +++ b/src/vnet/ip/ip4_forward.c @@ -123,9 +123,6 @@ VLIB_NODE_FN (ip4_load_balance_node) (vlib_main_t * vm, n_left_from = frame->n_vectors; next = node->cached_next_index; - if (node->flags & VLIB_NODE_FLAG_TRACE) - ip4_forward_next_trace (vm, node, frame, VLIB_TX); - while (n_left_from > 0) { vlib_get_next_frame (vm, node, next, to_next, n_left_to_next); @@ -294,6 +291,9 @@ VLIB_NODE_FN (ip4_load_balance_node) (vlib_main_t * vm, vlib_put_next_frame (vm, node, next, n_left_to_next); } + if (node->flags & VLIB_NODE_FLAG_TRACE) + ip4_forward_next_trace (vm, node, frame, VLIB_TX); + return frame->n_vectors; } diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c index 54864ea5d08..303c4bbd8e4 100644 --- a/src/vnet/ip/ip6_forward.c +++ b/src/vnet/ip/ip6_forward.c @@ -536,9 +536,6 @@ ip6_load_balance (vlib_main_t * vm, n_left_from = frame->n_vectors; next = node->cached_next_index; - if (node->flags & VLIB_NODE_FLAG_TRACE) - ip6_forward_next_trace (vm, node, frame, VLIB_TX); - while (n_left_from > 0) { vlib_get_next_frame (vm, node, next, to_next, n_left_to_next); @@ -736,6 +733,9 @@ ip6_load_balance (vlib_main_t * vm, vlib_put_next_frame (vm, node, next, n_left_to_next); } + if (node->flags & VLIB_NODE_FLAG_TRACE) + ip6_forward_next_trace (vm, node, frame, VLIB_TX); + return frame->n_vectors; } |