]> git.kaiwu.me - nginx.git/commitdiff
QUIC: refactored ngx_quic_validate_path().
authorVladimir Homutov <vl@nginx.com>
Thu, 16 Dec 2021 08:49:08 +0000 (11:49 +0300)
committerVladimir Homutov <vl@nginx.com>
Thu, 16 Dec 2021 08:49:08 +0000 (11:49 +0300)
The function now accepts path argument, as suggested by the name. Socket is
not really needed inside.

src/event/quic/ngx_event_quic_migration.c

index 59267109303bbef39d0a92f79a21564b1a83d50b..ac787e31d4490ed98d8caca30113975305fb5757 100644 (file)
@@ -13,7 +13,7 @@
 static void ngx_quic_set_connection_path(ngx_connection_t *c,
     ngx_quic_path_t *path);
 static ngx_int_t ngx_quic_validate_path(ngx_connection_t *c,
-    ngx_quic_socket_t *qsock);
+    ngx_quic_path_t *path);
 static ngx_int_t ngx_quic_send_path_challenge(ngx_connection_t *c,
     ngx_quic_path_t *path);
 static ngx_int_t ngx_quic_path_restore(ngx_connection_t *c);
@@ -422,7 +422,7 @@ ngx_quic_handle_migration(ngx_connection_t *c, ngx_quic_header_t *pkt)
                    ngx_quic_path_state_str(next));
 
     if (next->state == NGX_QUIC_PATH_NEW) {
-        if (ngx_quic_validate_path(c, qsock) != NGX_OK) {
+        if (ngx_quic_validate_path(c, qsock->path) != NGX_OK) {
             return NGX_ERROR;
         }
     }
@@ -478,17 +478,14 @@ ngx_quic_handle_migration(ngx_connection_t *c, ngx_quic_header_t *pkt)
 
 
 static ngx_int_t
-ngx_quic_validate_path(ngx_connection_t *c, ngx_quic_socket_t *qsock)
+ngx_quic_validate_path(ngx_connection_t *c, ngx_quic_path_t *path)
 {
     ngx_msec_t              pto;
-    ngx_quic_path_t        *path;
     ngx_quic_send_ctx_t    *ctx;
     ngx_quic_connection_t  *qc;
 
     qc = ngx_quic_get_connection(c);
 
-    path = qsock->path;
-
     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
                    "quic initiated validation of new path #%uL",
                    path->seqnum);