mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 06:46:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

QUIC: removed path->limited flag.

Browse Source 
Its value is the opposite of path->validated.
This commit is contained in:
Roman Arutyunyan 2023-07-06 17:49:01 +04:00
parent 4f3707c5c7
commit 3990aaaa55
6 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/event/quic/ngx_event_quic.c
View File

@ -1013,7 +1013,6 @@ ngx_quic_handle_payload(ngx_connection_t *c, ngx_quic_header_t *pkt)
if (!qc->path->validated) { if (!qc->path->validated) {
qc->path->validated = 1; qc->path->validated = 1;
qc->path->limited = 0;
ngx_quic_path_dbg(c, "in handshake", qc->path); ngx_quic_path_dbg(c, "in handshake", qc->path);
ngx_post_event(&qc->push, &ngx_posted_events); ngx_post_event(&qc->push, &ngx_posted_events);
} }

1
src/event/quic/ngx_event_quic_connection.h
View File

@ -101,7 +101,6 @@ struct ngx_quic_path_s {
u_char text[NGX_SOCKADDR_STRLEN]; u_char text[NGX_SOCKADDR_STRLEN];
unsigned validated:1; unsigned validated:1;
unsigned validating:1; unsigned validating:1;
unsigned limited:1;
}; };

4
src/event/quic/ngx_event_quic_migration.c
View File

@ -168,7 +168,6 @@ valid:
path->validated = 1; path->validated = 1;
path->validating = 0; path->validating = 0;
path->limited = 0;
ngx_quic_set_path_timer(c); ngx_quic_set_path_timer(c);
@ -208,8 +207,6 @@ ngx_quic_new_path(ngx_connection_t *c,
path->cid = cid; path->cid = cid;
cid->used = 1; cid->used = 1;
path->limited = 1;
path->seqnum = qc->path_seqnum++; path->seqnum = qc->path_seqnum++;
path->sockaddr = &path->sa.sockaddr; path->sockaddr = &path->sa.sockaddr;
@ -665,7 +662,6 @@ ngx_quic_path_validation_handler(ngx_event_t *ev)
path->validated = 0; path->validated = 0;
path->validating = 0; path->validating = 0;
path->limited = 1;
/* RFC 9000, 9.3.2. On-Path Address Spoofing /* RFC 9000, 9.3.2. On-Path Address Spoofing

7
src/event/quic/ngx_event_quic_migration.h
View File

@ -18,11 +18,10 @@
#define NGX_QUIC_PATH_BACKUP 2 #define NGX_QUIC_PATH_BACKUP 2
#define ngx_quic_path_dbg(c, msg, path) \ #define ngx_quic_path_dbg(c, msg, path) \
ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0, \ ngx_log_debug6(NGX_LOG_DEBUG_EVENT, c->log, 0, \
"quic path seq:%uL %s sent:%O recvd:%O state:%s%s%s", \ "quic path seq:%uL %s sent:%O recvd:%O state:%s%s", \
path->seqnum, msg, path->sent, path->received, \ path->seqnum, msg, path->sent, path->received, \
path->limited ? "L" : "", path->validated ? "V": "N", \ path->validated ? "V": "N", path->validating ? "R": "");
path->validating ? "R": "");
ngx_int_t ngx_quic_handle_path_challenge_frame(ngx_connection_t *c, ngx_int_t ngx_quic_handle_path_challenge_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_path_challenge_frame_t *f); ngx_quic_header_t *pkt, ngx_quic_path_challenge_frame_t *f);

4
src/event/quic/ngx_event_quic_output.c
View File

@ -281,7 +281,7 @@ ngx_quic_allow_segmentation(ngx_connection_t *c)
return 0; return 0;
} }
if (qc->path->limited) { if (!qc->path->validated) {
/* don't even try to be faster on non-validated paths */ /* don't even try to be faster on non-validated paths */
return 0; return 0;
} }
@ -1275,7 +1275,7 @@ ngx_quic_path_limit(ngx_connection_t *c, ngx_quic_path_t *path, size_t size)
{ {
off_t max; off_t max;
if (path->limited) { if (!path->validated) {
max = path->received * 3; max = path->received * 3;
max = (path->sent >= max) ? 0 : max - path->sent; max = (path->sent >= max) ? 0 : max - path->sent;

1
src/event/quic/ngx_event_quic_socket.c
View File

@ -82,7 +82,6 @@ ngx_quic_open_sockets(ngx_connection_t *c, ngx_quic_connection_t *qc,
if (pkt->validated) { if (pkt->validated) {
qc->path->validated = 1; qc->path->validated = 1;
qc->path->limited = 0;
} }
ngx_quic_path_dbg(c, "set active", qc->path); ngx_quic_path_dbg(c, "set active", qc->path);