Streams Hold References on Connections (#3931)

microsoft · Oct 24, 2023 · 102a491 · 102a491
1 parent d65bb1a
commit 102a491
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/core/connection.c b/src/core/connection.c
@@ -503,6 +503,8 @@ QuicConnUninitialize(
     QuicCryptoUninitialize(&Connection->Crypto);
     QuicTimerWheelRemoveConnection(&Connection->Worker->TimerWheel, Connection);
     QuicOperationQueueClear(Connection->Worker, &Connection->OperQ);
+    QuicLossDetectionUninitialize(&Connection->LossDetection);
+    QuicSendUninitialize(&Connection->Send);
 
     if (Connection->CloseReasonPhrase != NULL) {
         CXPLAT_FREE(Connection->CloseReasonPhrase, QUIC_POOL_CLOSE_REASON);

diff --git a/src/core/connection.h b/src/core/connection.h
@@ -224,6 +224,7 @@ typedef enum QUIC_CONNECTION_REF {
     QUIC_CONN_REF_LOOKUP_RESULT,        // For connections returned from lookups.
     QUIC_CONN_REF_WORKER,               // Worker is (queued for) processing.
     QUIC_CONN_REF_ROUTE,                // Route resolution is undergoing.
+    QUIC_CONN_REF_STREAM,               // A stream depends on the connection.
 
     QUIC_CONN_REF_COUNT
 

diff --git a/src/core/stream.c b/src/core/stream.c
@@ -128,6 +128,8 @@ QuicStreamInitialize(
     Stream->MaxAllowedRecvOffset = Stream->RecvBuffer.VirtualBufferLength;
     Stream->RecvWindowLastUpdate = CxPlatTimeUs64();
 
+    QuicConnAddRef(Connection, QUIC_CONN_REF_STREAM);
+
     Stream->Flags.Initialized = TRUE;
     *NewStream = Stream;
     Stream = NULL;
@@ -209,6 +211,8 @@ QuicStreamFree(
             Stream);
 #pragma warning(pop)
     }
+
+    QuicConnRelease(Connection, QUIC_CONN_REF_STREAM);
 }
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
@@ -929,8 +933,8 @@ QuicStreamParamGet(
         if (!Stream->Flags.RemoteCloseResetReliable) {
             Status = QUIC_STATUS_INVALID_STATE;
             break;
-        } 
-        
+        }
+
         *(uint64_t*)Buffer = Stream->RecvMaxLength;
         Status = QUIC_STATUS_SUCCESS;
         break;