Mercurial > hg > nginx

changeset 8731:d62a16fff3a4 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QUIC: do not reallocate c->sockaddr. When a connection is created, enough memory is allocated to accomodate any future address change.
author Roman Arutyunyan <arut@nginx.com>
date Thu, 11 Mar 2021 15:22:18 +0300
parents 90ae21799f67
children db58c7ef1d7c
files src/event/ngx_event_udp.c
diffstat 1 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_udp.c
+++ b/src/event/ngx_event_udp.c
@@ -24,6 +24,7 @@ static ngx_connection_t *ngx_lookup_udp_
 void
 ngx_event_recvmsg(ngx_event_t *ev)
 {
+    size_t             len;
     ssize_t            n;
     ngx_str_t          key;
     ngx_buf_t          buf;
@@ -302,7 +303,15 @@ ngx_event_recvmsg(ngx_event_t *ev)
             return;
         }
 
-        c->sockaddr = ngx_palloc(c->pool, socklen);
+        len = socklen;
+
+#if (NGX_QUIC)
+        if (ls->quic) {
+            len = NGX_SOCKADDRLEN;
+        }
+#endif
+
+        c->sockaddr = ngx_palloc(c->pool, len);
         if (c->sockaddr == NULL) {
             ngx_close_accepted_udp_connection(c);
             return;
@@ -704,13 +713,6 @@ ngx_lookup_udp_connection(ngx_listening_
                     }
 #endif
 
-                    if (c->socklen < socklen) {
-                        c->sockaddr = ngx_palloc(c->pool, socklen);
-                        if (c->sockaddr == NULL) {
-                            return c;
-                        }
-                    }
-
                     ngx_memcpy(c->sockaddr, sockaddr, socklen);
                     c->socklen = socklen;
                 }