Mercurial > hg > nginx-quic
changeset 8729:fb41e37ddeb0 quic
QUIC: decoupled path state and limitation status.
The path validation status and anti-amplification limit status is actually
two different variables. It is possible that validating path should not
be limited (for example, when re-validating former path).
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Mon, 13 Dec 2021 09:48:33 +0300 |
parents | ddd5e5c0f87d |
children | 0433e69f5425 |
files | src/event/quic/ngx_event_quic.c src/event/quic/ngx_event_quic_connection.h src/event/quic/ngx_event_quic_migration.c src/event/quic/ngx_event_quic_output.c src/event/quic/ngx_event_quic_socket.c |
diffstat | 5 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/quic/ngx_event_quic.c +++ b/src/event/quic/ngx_event_quic.c @@ -1013,6 +1013,7 @@ ngx_quic_process_payload(ngx_connection_ if (qc->socket->path->state != NGX_QUIC_PATH_VALIDATED) { qc->socket->path->state = NGX_QUIC_PATH_VALIDATED; + qc->socket->path->limited = 0; ngx_post_event(&qc->push, &ngx_posted_events); } }
--- a/src/event/quic/ngx_event_quic_connection.h +++ b/src/event/quic/ngx_event_quic_connection.h @@ -85,6 +85,7 @@ struct ngx_quic_path_s { struct sockaddr *sockaddr; socklen_t socklen; ngx_uint_t state; + ngx_uint_t limited; /* unsigned limited:1; */ ngx_msec_t expires; ngx_msec_t last_seen; ngx_uint_t tries;
--- a/src/event/quic/ngx_event_quic_migration.c +++ b/src/event/quic/ngx_event_quic_migration.c @@ -158,6 +158,7 @@ valid: "quic path #%uL successfully validated", path->seqnum); path->state = NGX_QUIC_PATH_VALIDATED; + path->limited = 0; return NGX_OK; } @@ -215,6 +216,9 @@ ngx_quic_add_path(ngx_connection_t *c, s return NULL; } + path->state = NGX_QUIC_PATH_NEW; + path->limited = 1; + path->seqnum = qc->path_seqnum++; path->last_seen = ngx_current_msec; @@ -332,6 +336,7 @@ update: /* force limits/revalidation for paths that were not seen recently */ if (ngx_current_msec - path->last_seen > qc->tp.max_idle_timeout) { path->state = NGX_QUIC_PATH_NEW; + path->limited = 1; path->sent = 0; path->received = 0; } @@ -350,11 +355,11 @@ update: */ path->received += len; - ngx_log_debug6(NGX_LOG_DEBUG_EVENT, c->log, 0, + ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic packet via #%uL:%uL:%uL" - " size:%O path recvd:%O sent:%O", + " size:%O path recvd:%O sent:%O limited:%ui", qsock->sid.seqnum, qsock->cid->seqnum, path->seqnum, - len, path->received, path->sent); + len, path->received, path->sent, path->limited); return NGX_OK; } @@ -607,6 +612,7 @@ ngx_quic_path_validation_handler(ngx_eve /* found expired path */ path->state = NGX_QUIC_PATH_NEW; + path->limited = 1; /* * RFC 9000, 9.4. Loss Detection and Congestion Control
--- a/src/event/quic/ngx_event_quic_output.c +++ b/src/event/quic/ngx_event_quic_output.c @@ -160,7 +160,7 @@ ngx_quic_create_datagrams(ngx_connection len = ngx_min(qc->ctp.max_udp_payload_size, NGX_QUIC_MAX_UDP_PAYLOAD_SIZE); - if (path->state != NGX_QUIC_PATH_VALIDATED) { + if (path->limited) { max = path->received * 3; max = (path->sent >= max) ? 0 : max - path->sent; @@ -294,7 +294,7 @@ ngx_quic_allow_segmentation(ngx_connecti return 0; } - if (qsock->path->state != NGX_QUIC_PATH_VALIDATED) { + if (qsock->path->limited) { /* don't even try to be faster on non-validated paths */ return 0; } @@ -1229,7 +1229,7 @@ ngx_quic_frame_sendto(ngx_connection_t * ngx_quic_init_packet(c, ctx, qc->socket, &pkt); /* account for anti-amplification limit: expand to allowed size */ - if (path->state != NGX_QUIC_PATH_VALIDATED) { + if (path->limited) { max = path->received * 3; max = (path->sent >= max) ? 0 : max - path->sent; if ((off_t) min > max) {