diff options
| author |   Florin Coras <fcoras@cisco.com> | 2021-04-29 17:07:06 -0700 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2021-04-30 14:39:55 +0000 |
| commit | 10796899cf3005df2575fb55be4956792db2c5d8 (patch) | |
| tree | d065a8b63308a1efbcb5488b9969b252877e2c3e /src/plugins | |
| parent | 01fcd757a1ecbd555fb8a8c86238e128c894ad48 (diff) | |
quic: report number of packets sent on custom tx
A transport's custom_tx function must report the number of segments that
it enqueued.
Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ie088c4215e6f17df639159820b8adf46b96fbb46
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/quic/quic.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index 929d745274f..4a2020ca0e1 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -715,9 +715,7 @@ quic_send_packets (quic_ctx_t * ctx) quicly_conn_t *conn; size_t num_packets, i, max_packets; quicly_address_t dest, src; - - num_packets = QUIC_SEND_PACKET_VEC_SIZE; - + u32 n_sent = 0; int err = 0; /* We have sctx, get qctx */ @@ -731,19 +729,16 @@ quic_send_packets (quic_ctx_t * ctx) goto quicly_error; conn = ctx->conn; - if (!conn) return 0; - /* TODO : quicly can assert it can send min_packets up to 2 */ - if (quic_sendable_packet_count (udp_session) < 2) - goto stop_sending; - do { + /* TODO : quicly can assert it can send min_packets up to 2 */ max_packets = quic_sendable_packet_count (udp_session); if (max_packets < 2) break; + num_packets = max_packets; if ((err = quicly_send (conn, &dest, &src, packets, &num_packets, buf, sizeof (buf)))) @@ -757,23 +752,23 @@ quic_send_packets (quic_ctx_t * ctx) goto quicly_error; } + n_sent += num_packets; } while (num_packets > 0 && num_packets == max_packets); -stop_sending: quic_set_udp_tx_evt (udp_session); QUIC_DBG (3, "%u[TX] %u[RX]", svm_fifo_max_dequeue (udp_session->tx_fifo), svm_fifo_max_dequeue (udp_session->rx_fifo)); quic_update_timer (ctx); - return 0; + return n_sent; quicly_error: if (err && err != QUICLY_ERROR_PACKET_IGNORED && err != QUICLY_ERROR_FREE_CONNECTION) clib_warning ("Quic error '%U'.", quic_format_err, err); quic_connection_closed (ctx); - return 1; + return 0; } /* Quicly callbacks */ @@ -1993,7 +1988,7 @@ quic_custom_tx_callback (void *s, transport_send_params_t * sp) if (!quicly_sendstate_is_open (&stream->sendstate)) { QUIC_ERR ("Warning: tried to send on closed stream"); - return -1; + return 0; } stream_data = (quic_stream_data_t *) stream->data; @@ -2010,8 +2005,7 @@ quic_custom_tx_callback (void *s, transport_send_params_t * sp) QUIC_ASSERT (!rv); tx_end: - quic_send_packets (ctx); - return 0; + return quic_send_packets (ctx); } /* |