Mercurial > hg > nginx

diff src/event/ngx_event_quic.c @ 8285:f85749b60e58 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed memory allocations from encryption code. + ngx_quic_encrypt(): - no longer accepts pool as argument - pkt is 1st arg - payload is passed as pkt->payload - performs encryption to the specified static buffer + ngx_quic_create_long/short_packet() functions: - single buffer for everything, allocated by caller - buffer layout is: [ ad | payload | TAG ] the result is in the beginning of buffer with proper length - nonce is calculated on stack - log is passed explicitly, pkt is 1st arg - no more allocations inside + ngx_quic_create_long_header(): - args changed: no need to pass str_t + added ngx_quic_create_short_header()
author Vladimir Homutov <vl@nginx.com>
date Thu, 26 Mar 2020 12:11:50 +0300
parents 2935a11c55b6
children c7185bc5b4d9
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -1365,8 +1365,9 @@ static ngx_int_t
 ngx_quic_send_packet(ngx_connection_t *c, ngx_quic_connection_t *qc,
     enum ssl_encryption_level_t level, ngx_str_t *payload)
 {
-    ngx_str_t         res;
-    ngx_quic_header_t pkt;
+    ngx_str_t          res;
+    ngx_quic_header_t  pkt;
+    static u_char      buf[65535];
 
     static ngx_str_t  initial_token = ngx_null_string;
 
@@ -1377,6 +1378,7 @@ ngx_quic_send_packet(ngx_connection_t *c
     pkt.level = level;
     pkt.dcid = qc->dcid;
     pkt.scid = qc->scid;
+    pkt.payload = *payload;
 
     if (level == ssl_encryption_initial) {
         pkt.number = &qc->initial_pn;
@@ -1394,9 +1396,12 @@ ngx_quic_send_packet(ngx_connection_t *c
         pkt.secret = &qc->secrets.server.ad;
     }
 
-    if (ngx_quic_encrypt(c->pool, c->ssl->connection, &pkt, payload, &res)
-        != NGX_OK)
-    {
+    // TODO: ensure header size + payload.len + crypto tail fits into packet
+    //       (i.e. limit payload while pushing frames to < 65k)
+
+    res.data = buf;
+
+    if (ngx_quic_encrypt(&pkt, c->ssl->connection, &res) != NGX_OK) {
         return NGX_ERROR;
     }