Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tcp: fix severity info
[vpp.git]
/
src
/
vnet
/
tcp
/
tcp_input.c
diff --git
a/src/vnet/tcp/tcp_input.c
b/src/vnet/tcp/tcp_input.c
index
1e27b7d
..
6546a14
100644
(file)
--- a/
src/vnet/tcp/tcp_input.c
+++ b/
src/vnet/tcp/tcp_input.c
@@
-21,8
+21,8
@@
#include <vnet/session/session.h>
#include <math.h>
#include <vnet/session/session.h>
#include <math.h>
-static
char *tcp_error_string
s[] = {
-#define tcp_error(
n,s) s
,
+static
vlib_error_desc_t tcp_input_error_counter
s[] = {
+#define tcp_error(
f, n, s, d) { #n, d, VL_COUNTER_SEVERITY_##s }
,
#include <vnet/tcp/tcp_error.def>
#undef tcp_error
};
#include <vnet/tcp/tcp_error.def>
#undef tcp_error
};
@@
-1575,7
+1575,7
@@
VLIB_REGISTER_NODE (tcp4_established_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_ESTABLISHED_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_ESTABLISHED_N_NEXT,
.next_nodes =
{
@@
-1594,7
+1594,7
@@
VLIB_REGISTER_NODE (tcp6_established_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_ESTABLISHED_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_ESTABLISHED_N_NEXT,
.next_nodes =
{
@@
-1933,7
+1933,6
@@
tcp46_syn_sent_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
new_tc->rcv_nxt = vnet_buffer (b[0])->tcp.seq_end;
new_tc->irs = seq;
new_tc->timers[TCP_TIMER_RETRANSMIT_SYN] = TCP_TIMER_HANDLE_INVALID;
new_tc->rcv_nxt = vnet_buffer (b[0])->tcp.seq_end;
new_tc->irs = seq;
new_tc->timers[TCP_TIMER_RETRANSMIT_SYN] = TCP_TIMER_HANDLE_INVALID;
- new_tc->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_RX];
if (tcp_opts_tstamp (&new_tc->rcv_opts))
{
if (tcp_opts_tstamp (&new_tc->rcv_opts))
{
@@
-2070,7
+2069,7
@@
VLIB_REGISTER_NODE (tcp4_syn_sent_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_SYN_SENT_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_SYN_SENT_N_NEXT,
.next_nodes =
{
@@
-2089,7
+2088,7
@@
VLIB_REGISTER_NODE (tcp6_syn_sent_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_SYN_SENT_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_SYN_SENT_N_NEXT,
.next_nodes =
{
@@
-2535,7
+2534,7
@@
VLIB_REGISTER_NODE (tcp4_rcv_process_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_RCV_PROCESS_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_RCV_PROCESS_N_NEXT,
.next_nodes =
{
@@
-2554,7
+2553,7
@@
VLIB_REGISTER_NODE (tcp6_rcv_process_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_RCV_PROCESS_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_RCV_PROCESS_N_NEXT,
.next_nodes =
{
@@
-2725,7
+2724,7
@@
VLIB_REGISTER_NODE (tcp4_listen_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_LISTEN_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_LISTEN_N_NEXT,
.next_nodes =
{
@@
-2744,7
+2743,7
@@
VLIB_REGISTER_NODE (tcp6_listen_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_LISTEN_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_LISTEN_N_NEXT,
.next_nodes =
{
@@
-2999,7
+2998,7
@@
VLIB_REGISTER_NODE (tcp4_input_nolookup_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_INPUT_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_INPUT_N_NEXT,
.next_nodes =
{
@@
-3019,7
+3018,7
@@
VLIB_REGISTER_NODE (tcp6_input_nolookup_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_INPUT_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_INPUT_N_NEXT,
.next_nodes =
{
@@
-3053,7
+3052,7
@@
VLIB_REGISTER_NODE (tcp4_input_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_INPUT_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_INPUT_N_NEXT,
.next_nodes =
{
@@
-3073,7
+3072,7
@@
VLIB_REGISTER_NODE (tcp6_input_node) =
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.n_errors = TCP_N_ERROR,
- .error_
strings = tcp_error_string
s,
+ .error_
counters = tcp_input_error_counter
s,
.n_next_nodes = TCP_INPUT_N_NEXT,
.next_nodes =
{
.n_next_nodes = TCP_INPUT_N_NEXT,
.next_nodes =
{