better progress

microsoft · Aug 24, 2023 · d0af2ea · d0af2ea
1 parent a9078aa
commit d0af2ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/core/library.c b/src/core/library.c
@@ -530,7 +530,7 @@ MsQuicLibraryUninitialize(
     //
     CXPLAT_DBG_ASSERT(PerfCounters[QUIC_PERF_COUNTER_CONN_ACTIVE] == 0);
     CXPLAT_DBG_ASSERT(PerfCounters[QUIC_PERF_COUNTER_CONN_CONNECTED] == 0);
-    // CXPLAT_DBG_ASSERT(PerfCounters[QUIC_PERF_COUNTER_STRM_ACTIVE] == 0); This is bad. Remember to uncomment once we fix the issue.
+    CXPLAT_DBG_ASSERT(PerfCounters[QUIC_PERF_COUNTER_STRM_ACTIVE] == 0);
     CXPLAT_DBG_ASSERT(PerfCounters[QUIC_PERF_COUNTER_CONN_QUEUE_DEPTH] == 0);
     CXPLAT_DBG_ASSERT(PerfCounters[QUIC_PERF_COUNTER_CONN_OPER_QUEUE_DEPTH] == 0);
     CXPLAT_DBG_ASSERT(PerfCounters[QUIC_PERF_COUNTER_WORK_OPER_QUEUE_DEPTH] == 0);

diff --git a/src/core/stream.h b/src/core/stream.h
@@ -142,6 +142,7 @@ typedef union QUIC_STREAM_FLAGS {
         BOOLEAN ReceiveDataPending      : 1;    // Data (or FIN) is queued and ready for delivery.
         BOOLEAN ReceiveCallPending      : 1;    // There is an uncompleted receive to the app.
         BOOLEAN ReceiveCallActive       : 1;    // There is an active receive to the app.
+        BOOLEAN ReceiveClosedReliable   : 1;    // We closed the stream on the Recv side from a Reliable reset frame.
         BOOLEAN SendDelayed             : 1;    // A delayed send is currently queued.
 
         BOOLEAN HandleSendShutdown      : 1;    // Send shutdown complete callback delivered.

diff --git a/src/core/stream_recv.c b/src/core/stream_recv.c
@@ -456,6 +456,19 @@ QuicStreamProcessStreamFrame(
         goto Error;
     }
 
+    if (Stream->Flags.RemoteCloseResetReliable && Frame->Offset >= Stream->RecvMaxLength) {
+        //
+        // Ignore additional frames once we have enough data.
+        //
+        if (!Stream->Flags.ReceiveClosedReliable) {
+            Stream->Flags.ReceiveClosedReliable = TRUE;
+            QuicStreamRecvShutdown(Stream, FALSE, QUIC_ERROR_NO_ERROR);
+            QuicStreamTryCompleteShutdown(Stream);
+        }
+        Status = QUIC_STATUS_SUCCESS;
+        goto Error;
+    }
+
     if (EndOffset > QUIC_VAR_INT_MAX) {
         //
         // Stream data cannot exceed VAR_INT_MAX because it's impossible