From 9128637ee8f7b0d903551f165a1447d427e8dd19 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 5 Dec 2017 13:24:04 -0800 Subject: BIER in non-MPLS netowrks as decsribed in section 2.2 ihttps://tools.ietf.org/html/draft-ietf-bier-mpls-encapsulation-10 with BIFT encoding from: https://tools.ietf.org/html/draft-wijnandsxu-bier-non-mpls-bift-encoding-00 changes: 1 - introduce the new BIFT lookup table. BIER tables that have an associated MPLS label are added to the MPLS-FIB. Those that don't are added to the BIER table 2 - BIER routes that have no associated output MPLS label will add a BIFT label. 3 - The BIER FMask has a path-list as a member to resolve via any possible path. Change-Id: I1fd4d9dbd074f0e855c16e9329b81460ebe1efce Signed-off-by: Neale Ranns --- src/vnet/mpls/mpls_output.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/vnet/mpls/mpls_output.c') diff --git a/src/vnet/mpls/mpls_output.c b/src/vnet/mpls/mpls_output.c index e0874cd1aa1..0dc12b8d5bd 100644 --- a/src/vnet/mpls/mpls_output.c +++ b/src/vnet/mpls/mpls_output.c @@ -24,9 +24,6 @@ typedef struct { /* Adjacency taken. */ u32 adj_index; u32 flow_hash; - - /* Packet data, possibly *after* rewrite. */ - u8 packet_data[64 - 1*sizeof(u32)]; } mpls_output_trace_t; #define foreach_mpls_output_next \ @@ -45,16 +42,11 @@ format_mpls_output_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); mpls_output_trace_t * t = va_arg (*args, mpls_output_trace_t *); - u32 indent = format_get_indent (s); s = format (s, "adj-idx %d : %U flow hash: 0x%08x", t->adj_index, format_ip_adjacency, t->adj_index, FORMAT_IP_ADJACENCY_NONE, t->flow_hash); - s = format (s, "\n%U%U", - format_white_space, indent, - format_ip_adjacency_packet_data, - t->adj_index, t->packet_data, sizeof (t->packet_data)); return s; } @@ -206,9 +198,6 @@ mpls_output_inline (vlib_main_t * vm, p0, sizeof (*tr)); tr->adj_index = vnet_buffer(p0)->ip.adj_index[VLIB_TX]; tr->flow_hash = vnet_buffer(p0)->ip.flow_hash; - clib_memcpy (tr->packet_data, - vlib_buffer_get_current (p0), - sizeof (tr->packet_data)); } if (PREDICT_FALSE(p1->flags & VLIB_BUFFER_IS_TRACED)) { @@ -216,9 +205,6 @@ mpls_output_inline (vlib_main_t * vm, p1, sizeof (*tr)); tr->adj_index = vnet_buffer(p1)->ip.adj_index[VLIB_TX]; tr->flow_hash = vnet_buffer(p1)->ip.flow_hash; - clib_memcpy (tr->packet_data, - vlib_buffer_get_current (p1), - sizeof (tr->packet_data)); } vlib_validate_buffer_enqueue_x2 (vm, node, next_index, -- cgit 1.2.3-korg