aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/event/quic/ngx_event_quic_connection.h3
-rw-r--r--src/event/quic/ngx_event_quic_migration.c20
2 files changed, 19 insertions, 4 deletions
diff --git a/src/event/quic/ngx_event_quic_connection.h b/src/event/quic/ngx_event_quic_connection.h
index abd0ebe6c..4ff0eae4a 100644
--- a/src/event/quic/ngx_event_quic_connection.h
+++ b/src/event/quic/ngx_event_quic_connection.h
@@ -111,7 +111,8 @@ struct ngx_quic_path_s {
uint64_t mtu_pnum[NGX_QUIC_PATH_RETRIES];
ngx_str_t addr_text;
u_char text[NGX_SOCKADDR_STRLEN];
- ngx_uint_t validated; /* unsigned validated:1; */
+ unsigned validated:1;
+ unsigned mtu_unvalidated:1;
};
diff --git a/src/event/quic/ngx_event_quic_migration.c b/src/event/quic/ngx_event_quic_migration.c
index 7819ae2f9..be8e0e304 100644
--- a/src/event/quic/ngx_event_quic_migration.c
+++ b/src/event/quic/ngx_event_quic_migration.c
@@ -169,6 +169,7 @@ valid:
path->mtu = prev->mtu;
path->max_mtu = prev->max_mtu;
+ path->mtu_unvalidated = 0;
}
}
@@ -182,6 +183,13 @@ valid:
qc->congestion.recovery_start = ngx_current_msec;
}
+ path->validated = 1;
+
+ if (path->mtu_unvalidated) {
+ path->mtu_unvalidated = 0;
+ return ngx_quic_validate_path(c, path);
+ }
+
/*
* RFC 9000, 9.3. Responding to Connection Migration
*
@@ -199,8 +207,6 @@ valid:
ngx_quic_path_dbg(c, "is validated", path);
- path->validated = 1;
-
ngx_quic_discover_path_mtu(c, path);
return NGX_OK;
@@ -578,7 +584,15 @@ ngx_quic_send_path_challenge(ngx_connection_t *c, ngx_quic_path_t *path)
* sending a datagram of this size.
*/
- min = (ngx_quic_path_limit(c, path, 1200) < 1200) ? 0 : 1200;
+ if (path->mtu_unvalidated
+ || ngx_quic_path_limit(c, path, 1200) < 1200)
+ {
+ min = 0;
+ path->mtu_unvalidated = 1;
+
+ } else {
+ min = 1200;
+ }
if (ngx_quic_frame_sendto(c, frame, min, path) == NGX_ERROR) {
return NGX_ERROR;