QUIC: fixed handling of initial source connection id.

This was broken in 1e2f4e9c8195.

While there, adjusted formatting of debug message with socket seqnum.

diff --git a/src/event/quic/ngx_event_quic_migration.c b/src/event/quic/ngx_event_quic_migration.c
index d1a5cf7a0e66c0a9eda5d450bd560b43781e0a16..ca43347ebb9b4604fa8e15c04efc2024ab8256d6 100644 (file)
--- a/src/event/quic/ngx_event_quic_migration.c
+++ b/src/event/quic/ngx_event_quic_migration.c
@@ -346,8 +346,8 @@ update:
     path->received += len;
 
     ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "quic packet len:%O via sock#%uL path#%uL",
-                   len, qsock->sid.seqnum, path->seqnum);
+                   "quic packet len:%O via sock#%L path#%uL",
+                   len, (int64_t) qsock->sid.seqnum, path->seqnum);
     ngx_quic_path_dbg(c, "status", path);
 
     return NGX_OK;

diff --git a/src/event/quic/ngx_event_quic_output.c b/src/event/quic/ngx_event_quic_output.c
index 0f7eff26d4f78cb95e2015aaf9f092f3d10c7c2d..67e527462cc4c1affa6511b4a3b497078f7bab93 100644 (file)
--- a/src/event/quic/ngx_event_quic_output.c
+++ b/src/event/quic/ngx_event_quic_output.c
@@ -673,13 +673,10 @@ static void
 ngx_quic_init_packet(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
     ngx_quic_header_t *pkt, ngx_quic_path_t *path)
 {
-    ngx_quic_socket_t      *qsock;
     ngx_quic_connection_t  *qc;
 
     qc = ngx_quic_get_connection(c);
 
-    qsock = ngx_quic_get_socket(c);
-
     ngx_memzero(pkt, sizeof(ngx_quic_header_t));
 
     pkt->flags = NGX_QUIC_PKT_FIXED_BIT;
@@ -699,8 +696,7 @@ ngx_quic_init_packet(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
     pkt->dcid.data = path->cid->id;
     pkt->dcid.len = path->cid->len;
 
-    pkt->scid.data = qsock->sid.id;
-    pkt->scid.len = qsock->sid.len;
+    pkt->scid = qc->tp.initial_scid;
 
     pkt->version = qc->version;
     pkt->log = c->log;