From ab720fb768a2602f940cb7296c34021b5bb6c7e6 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Thu, 29 Sep 2022 10:32:02 -0600 Subject: [PATCH] core: Fix ListenQUIC listener key conflict Reported on commit e3e8aabbcf65d37516bb97f9dc0f77df52f8cf55 Abused this change in some bash for loops to rapidly reload config while making requests and didn't observe any memory or resource leaks. --- listeners.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/listeners.go b/listeners.go index aad6b691..ea03ca42 100644 --- a/listeners.go +++ b/listeners.go @@ -436,7 +436,7 @@ func ListenPacket(network, addr string) (net.PacketConn, error) { // // TODO: See if we can find a more elegant solution closer to the new NetworkAddress.Listen API. func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) (quic.EarlyListener, error) { - lnKey := listenerKey(ln.LocalAddr().Network(), ln.LocalAddr().String()) + lnKey := listenerKey("quic+"+ln.LocalAddr().Network(), ln.LocalAddr().String()) sharedEarlyListener, _, err := listenerPool.LoadOrNew(lnKey, func() (Destructor, error) { earlyLn, err := quic.ListenEarly(ln, http3.ConfigureTLSConfig(tlsConf), &quic.Config{ @@ -451,7 +451,6 @@ func ListenQUIC(ln net.PacketConn, tlsConf *tls.Config, activeRequests *int64) ( if err != nil { return nil, err } - return &sharedQuicListener{EarlyListener: earlyLn, key: lnKey}, nil }) if err != nil {