diff options
author | 2019-03-01 13:00:58 -0800 | |
---|---|---|
committer | 2019-03-02 23:40:04 +0000 | |
commit | 31c9955a4e83578422b3328ef0d7b2b248536644 (patch) | |
tree | 51dbc9de2cac22ca190ec394d6bf29e4ebb72d54 /src/vnet/tcp/tcp_output.c | |
parent | f6c4313b6aa7746fe97afd398ce68c2efbef0600 (diff) |
session: cleanup/rename functions
- remove unused functions
- rename old "stream" functions
Change-Id: Icbb03daa9f9f1c58b5be5c38aa8a9cbcf9159b47
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/tcp/tcp_output.c')
-rw-r--r-- | src/vnet/tcp/tcp_output.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index 4de479c344b..2e9fc58cefb 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -1340,8 +1340,8 @@ tcp_prepare_segment (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, return 0; *b = vlib_get_buffer (vm, bi); data = tcp_init_buffer (vm, *b); - n_bytes = stream_session_peek_bytes (&tc->connection, data, offset, - max_deq_bytes); + n_bytes = session_tx_fifo_peek_bytes (&tc->connection, data, offset, + max_deq_bytes); ASSERT (n_bytes == max_deq_bytes); b[0]->current_length = n_bytes; tcp_push_hdr_i (tc, *b, tc->state, /* compute opts */ 0, /* burst */ 0); @@ -1370,9 +1370,9 @@ tcp_prepare_segment (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, *b = vlib_get_buffer (vm, wrk->tx_buffers[--n_bufs]); data = tcp_init_buffer (vm, *b); - n_bytes = stream_session_peek_bytes (&tc->connection, data, offset, - bytes_per_buffer - - TRANSPORT_MAX_HDRS_LEN); + n_bytes = session_tx_fifo_peek_bytes (&tc->connection, data, offset, + bytes_per_buffer - + TRANSPORT_MAX_HDRS_LEN); b[0]->current_length = n_bytes; b[0]->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID; b[0]->total_length_not_including_first_buffer = 0; @@ -1387,8 +1387,9 @@ tcp_prepare_segment (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, chain_b = vlib_get_buffer (vm, chain_bi); chain_b->current_data = 0; data = vlib_buffer_get_current (chain_b); - n_peeked = stream_session_peek_bytes (&tc->connection, data, - offset + n_bytes, len_to_deq); + n_peeked = session_tx_fifo_peek_bytes (&tc->connection, data, + offset + n_bytes, + len_to_deq); ASSERT (n_peeked == len_to_deq); n_bytes += n_peeked; chain_b->current_length = n_peeked; @@ -1439,7 +1440,7 @@ tcp_prepare_retransmit_segment (tcp_worker_ctx_t * wrk, /* * Make sure we can retransmit something */ - available_bytes = session_tx_fifo_max_dequeue (&tc->connection); + available_bytes = transport_max_tx_dequeue (&tc->connection); ASSERT (available_bytes >= offset); available_bytes -= offset; if (!available_bytes) @@ -1716,7 +1717,7 @@ tcp_timer_persist_handler (u32 index) || tc->snd_wnd > tc->snd_mss) return; - available_bytes = session_tx_fifo_max_dequeue (&tc->connection); + available_bytes = transport_max_tx_dequeue (&tc->connection); offset = tc->snd_una_max - tc->snd_una; /* Reprogram persist if no new bytes available to send. We may have data @@ -1753,7 +1754,7 @@ tcp_timer_persist_handler (u32 index) max_snd_bytes = clib_min (tc->snd_mss, tm->bytes_per_buffer - TRANSPORT_MAX_HDRS_LEN); n_bytes = - stream_session_peek_bytes (&tc->connection, data, offset, max_snd_bytes); + session_tx_fifo_peek_bytes (&tc->connection, data, offset, max_snd_bytes); b->current_length = n_bytes; ASSERT (n_bytes != 0 && (tcp_timer_is_active (tc, TCP_TIMER_RETRANSMIT) || tc->snd_nxt == tc->snd_una_max @@ -1855,7 +1856,7 @@ tcp_fast_retransmit_sack (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, sb = &tc->sack_sb; hole = scoreboard_get_hole (sb, sb->cur_rxt_hole); - max_deq = session_tx_fifo_max_dequeue (&tc->connection); + max_deq = transport_max_tx_dequeue (&tc->connection); max_deq -= tc->snd_una_max - tc->snd_una; while (snd_space > 0 && n_segs < burst_size) @@ -1982,7 +1983,7 @@ send_unsent: if (snd_space < tc->snd_mss || tc->snd_mss == 0) goto done; - max_deq = session_tx_fifo_max_dequeue (&tc->connection); + max_deq = transport_max_tx_dequeue (&tc->connection); max_deq -= tc->snd_una_max - tc->snd_una; if (max_deq) { |