ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session tcp: fix packet tracing

Browse Source 
Type: fix

Change-Id: Ib823d016c64998779fb1d00b8aad3acb5e8340be
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit 30928f87a3c9d98e288d1364d50c032e052e69ab)
This commit is contained in:
Florin Coras 2020-01-27 19:21:28 -08:00 committed by Andrew Yourtchenko
parent 06c104f4e3
commit 18b3c002bf
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vnet/session/session_node.c
View File

@ -496,7 +496,7 @@ format_session_queue_trace (u8 * s, va_list * args)
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
session_queue_trace_t *t = va_arg (*args, session_queue_trace_t *);
s = format (s, "SESSION_QUEUE: session index %d, server thread index %d",
s = format (s, "session index %d thread index %d",
t->session_index, t->server_thread_index);
return s;
}
@ -538,7 +538,7 @@ session_tx_trace_frame (vlib_main_t * vm, vlib_node_runtime_t * node,
for (i = 0; i < clib_min (n_trace, n_segs); i++)
{
b = vlib_get_buffer (vm, to_next[i - n_segs]);
b = vlib_get_buffer (vm, to_next[i]);
vlib_trace_buffer (vm, node, next_index, b, 1 /* follow_chain */ );
t = vlib_add_trace (vm, node, b, sizeof (*t));
t->session_index = s->session_index;

2
src/vnet/tcp/tcp.c
View File

@ -1032,7 +1032,7 @@ format_tcp_vars (u8 * s, va_list * args)
return s;
}
static u8 *
u8 *
format_tcp_connection_id (u8 * s, va_list * args)
{
tcp_connection_t *tc = va_arg (*args, tcp_connection_t *);

1
src/vnet/tcp/tcp.h
View File

@ -758,6 +758,7 @@ int tcp_configure_v6_source_address_range (vlib_main_t * vm,
ip6_address_t * end, u32 table_id);
void tcp_api_reference (void);
u8 *format_tcp_connection (u8 * s, va_list * args);
u8 *format_tcp_connection_id (u8 * s, va_list * args);
always_inline tcp_connection_t *
tcp_listener_get (u32 tli)

8
src/vnet/tcp/tcp_input.c
View File

@ -2050,12 +2050,12 @@ format_tcp_rx_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 *);
tcp_rx_trace_t *t = va_arg (*args, tcp_rx_trace_t *);
tcp_connection_t *tc = &t->tcp_connection;
u32 indent = format_get_indent (s);
s = format (s, "%U\n%U%U",
format_tcp_header, &t->tcp_header, 128,
format_white_space, indent,
format_tcp_connection, &t->tcp_connection, 1);
s = format (s, "%U state %U\n%U%U", format_tcp_connection_id, tc,
format_tcp_state, tc->state, format_white_space, indent,
format_tcp_header, &t->tcp_header, 128);
return s;
}

13
src/vnet/tcp/tcp_output.c
View File

@ -55,12 +55,12 @@ format_tcp_tx_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 *);
tcp_tx_trace_t *t = va_arg (*args, tcp_tx_trace_t *);
tcp_connection_t *tc = &t->tcp_connection;
u32 indent = format_get_indent (s);
s = format (s, "%U\n%U%U",
format_tcp_header, &t->tcp_header, 128,
format_white_space, indent,
format_tcp_connection, &t->tcp_connection, 1);
s = format (s, "%U state %U\n%U%U", format_tcp_connection_id, tc,
format_tcp_state, tc->state, format_white_space, indent,
format_tcp_header, &t->tcp_header, 128);
return s;
}
@ -2246,16 +2246,17 @@ static void
tcp46_output_trace_frame (vlib_main_t * vm, vlib_node_runtime_t * node,
u32 * to_next, u32 n_bufs)
{
u32 n_trace = vlib_get_trace_count (vm, node);
tcp_connection_t *tc;
tcp_tx_trace_t *t;
vlib_buffer_t *b;
tcp_header_t *th;
int i;
for (i = 0; i < clib_min (n_trace, n_bufs); i++)
for (i = 0; i < n_bufs; i++)
{
b = vlib_get_buffer (vm, to_next[i]);
if (!(b->flags & VLIB_BUFFER_IS_TRACED))
continue;
th = vlib_buffer_get_current (b);
tc = tcp_connection_get (vnet_buffer (b)->tcp.connection_index,
vm->thread_index);