diff options
| author |   Neale Ranns <nranns@cisco.com> | 2017-05-26 03:48:53 -0700 |
|---|---|---|
| committer | Neale Ranns <nranns@cisco.com> | 2017-05-30 01:39:33 -0700 |
| commit | 0a796ae9932c8b827329ffe1ba10433c49c2c2e4 (patch) | |
| tree | 764c786130cc8eec4b38cd75bb16687b8092db84 /src/vnet/dpo | |
| parent | e3b7ad7adebf25af1651a217da8534ada89c369b (diff) | |
MPLS lookup DPO does not pop the label (nor does it handle replicate)
Change-Id: I7de6b96631d1645d0eadd38525860d84d78e316d
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/dpo')
| -rw-r--r-- | src/vnet/dpo/lookup_dpo.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/src/vnet/dpo/lookup_dpo.c b/src/vnet/dpo/lookup_dpo.c index 96fedd27ce9..a96e9dbb42a 100644 --- a/src/vnet/dpo/lookup_dpo.c +++ b/src/vnet/dpo/lookup_dpo.c @@ -15,8 +15,8 @@ #include <vnet/ip/ip.h> #include <vnet/dpo/lookup_dpo.h> -#include <vnet/dpo/load_balance.h> -#include <vnet/mpls/mpls.h> +#include <vnet/dpo/load_balance_map.h> +#include <vnet/mpls/mpls_lookup.h> #include <vnet/fib/fib_table.h> #include <vnet/fib/ip4_fib.h> #include <vnet/fib/ip6_fib.h> @@ -961,7 +961,7 @@ lookup_dpo_mpls_inline (vlib_main_t * vm, while (n_left_from > 0 && n_left_to_next > 0) { - u32 bi0, lkdi0, lbi0, fib_index0, next0; + u32 bi0, lkdi0, lbi0, fib_index0, next0, hash0; const mpls_unicast_header_t * hdr0; const load_balance_t *lb0; const lookup_dpo_t * lkd0; @@ -1000,15 +1000,32 @@ lookup_dpo_mpls_inline (vlib_main_t * vm, /* do lookup */ lbi0 = mpls_fib_table_forwarding_lookup (fib_index0, hdr0); lb0 = load_balance_get(lbi0); - dpo0 = load_balance_get_bucket_i(lb0, 0); + if (PREDICT_FALSE(lb0->lb_n_buckets > 1)) + { + hash0 = vnet_buffer (b0)->ip.flow_hash = + mpls_compute_flow_hash(hdr0, lb0->lb_hash_config); + dpo0 = load_balance_get_bucket_i + (lb0, + (hash0 & (lb0->lb_n_buckets_minus_1))); + } + else + { + dpo0 = load_balance_get_bucket_i (lb0, 0); + } next0 = dpo0->dpoi_next_node; - vnet_buffer(b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index; + + vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpo0->dpoi_index; vlib_increment_combined_counter (cm, cpu_index, lbi0, 1, vlib_buffer_length_in_chain (vm, b0)); + vnet_buffer (b0)->mpls.ttl = ((char*)hdr0)[3]; + vnet_buffer (b0)->mpls.exp = (((char*)hdr0)[2] & 0xe) >> 1; + vnet_buffer (b0)->mpls.first = 1; + vlib_buffer_advance(b0, sizeof(*hdr0)); + if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) { lookup_trace_t *tr = vlib_add_trace (vm, node, |