diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-01-18 12:12:29 -0800 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2019-01-18 22:10:24 +0000 |
| commit | cbb4565c88253875db29dda99b77934e4a30833f (patch) | |
| tree | 0e9783269f47db58207c0973e945d90442b06ee9 /src/vnet/tcp | |
| parent | 48872780e8fd33509e19e7586d1503e48c8cfda2 (diff) | |
tcp: allow data in passive open ack (VPP-1545)
Change-Id: Iceb99d3f8b7029bd1b1e9ebafb1e0b3790c573e4
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit 865872ebdb2bbaf3f157e2a9889405b84114d2eb)
Diffstat (limited to 'src/vnet/tcp')
| -rw-r--r-- | src/vnet/tcp/tcp_input.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index 82ab817430f..6a376350595 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -359,6 +359,7 @@ tcp_segment_validate (tcp_worker_ctx_t * wrk, tcp_connection_t * tc0, /* 4th: check the SYN bit */ if (PREDICT_FALSE (tcp_syn (th0))) { + *error0 = tcp_ack (th0) ? TCP_ERROR_SYN_ACKS_RCVD : TCP_ERROR_SYNS_RCVD; /* TODO implement RFC 5961 */ if (tc0->state == TCP_STATE_SYN_RCVD) { @@ -2712,8 +2713,7 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } /* Make sure the ack is exactly right */ - if (tc0->rcv_nxt != vnet_buffer (b0)->tcp.seq_number || is_fin0 - || vnet_buffer (b0)->tcp.data_len) + if (tc0->rcv_nxt != vnet_buffer (b0)->tcp.seq_number || is_fin0) { tcp_connection_reset (tc0); error0 = TCP_ERROR_SEGMENT_INVALID; @@ -3144,6 +3144,7 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, child0->snd_wl2 = vnet_buffer (b0)->tcp.ack_number; tcp_connection_init_vars (child0); + child0->rto = TCP_RTO_MIN; TCP_EVT_DBG (TCP_EVT_SYN_RCVD, child0, 1); if (stream_session_accept (&child0->connection, lc0->c_s_index, |