Merge branch 'main' into seera-main

Author: masa-koz

docs/Streams.md

@@ -167,6 +167,7 @@ There is no guarantee the `QUIC_BUFFER`s indicated in a receive notification wil
 
 The application is responsible for tracking the amount of data received and when a buffer it provided has been fully used.
 The application regains full ownership of a buffer after it get a receive notification for all bytes in the buffer and accept them by calling [StreamReceiveComplete](api/StreamReceiveComplete.md).
+MsQuic will not re-use a buffer for subsequent receives once it has been fully written, unless the app submits the same buffer again.
 If the application accepts all the buffer's bytes **inline** from the receive notification, by returning `QUIC_STATUS_SUCCESS` and setting `TotalBufferLength` appropriately,
 it can free or reuse the buffer while in the notification handler.
 

src/bin/CMakeLists.txt

@@ -20,6 +20,7 @@ if(BUILD_SHARED_LIBS)
     endif()
 else()
     add_library(msquic_static STATIC static/empty.c)
+    set_target_properties(msquic_static PROPERTIES OUTPUT_NAME "${QUIC_LIBRARY_NAME}${CMAKE_DEBUG_POSTFIX}")
     target_link_libraries(msquic_static PRIVATE core msquic_platform inc logging main_binary_link_args)
     target_compile_definitions(msquic_static PUBLIC QUIC_BUILD_STATIC)
     set_property(TARGET msquic_static PROPERTY FOLDER "${QUIC_FOLDER_PREFIX}libraries")

src/core/stream.c

@@ -977,6 +977,15 @@ QuicStreamSwitchToAppOwnedBuffers(
     _In_ QUIC_STREAM* Stream
     )
 {
+    //
+    // Preserve the initial receive window size: it should not have changed
+    // since the stream's creation.
+    //
+    const uint32_t InitialControlFlow = Stream->RecvBuffer.VirtualBufferLength;
+    CXPLAT_DBG_ASSERT(
+        InitialControlFlow == Stream->Connection->Settings.StreamRecvWindowBidiRemoteDefault ||
+        InitialControlFlow == Stream->Connection->Settings.StreamRecvWindowUnidiDefault);
+
     //
     // Reset the current receive buffer
     //
@@ -988,7 +997,7 @@ QuicStreamSwitchToAppOwnedBuffers(
     (void)QuicRecvBufferInitialize(
         &Stream->RecvBuffer,
         0,
-        0,
+        InitialControlFlow,
         QUIC_RECV_BUF_MODE_APP_OWNED,
         NULL);
     Stream->Flags.UseAppOwnedRecvBuffers = TRUE;

src/platform/datapath_winuser.c

@@ -2667,8 +2667,13 @@ CxPlatDataPathSocketProcessAcceptCompletion(
             0,
             "AcceptEx Completed!");
 
-
+        //
+        // Mark IO Started before taking a rundown reference,
+        // otherwise the cleanup might not wait for the rundown.
+        //
+        AcceptSocketProc->IoStarted = TRUE;
         if (!CxPlatRundownAcquire(&AcceptSocketProc->RundownRef)) {
+            AcceptSocketProc = NULL;
             goto Error;
         }
 
@@ -2736,8 +2741,6 @@ CxPlatDataPathSocketProcessAcceptCompletion(
         }
 
         ListenerSocketProc->AcceptSocket = NULL;
-
-        AcceptSocketProc->IoStarted = TRUE;
         CxPlatDataPathStartReceiveAsync(AcceptSocketProc);
 
     } else {

src/test/MsQuicTests.h

@@ -9,6 +9,8 @@
 
 --*/
 
+#pragma once
+
 //
 // For official releases, disable tests for preview features:
 // the official release test binary for a version is used for down-level compatibility testing
@@ -43,6 +45,14 @@ extern "C" {
 void QuicTestInitialize();
 void QuicTestUninitialize();
 
+//
+// Parameter structures used by many tests
+//
+
+struct FamilyArgs {
+    int Family;
+};
+
 //
 // Parameter Validation Tests
 //
@@ -52,7 +62,7 @@ void QuicTestValidateRegistration();
 void QuicTestValidateConfiguration();
 void QuicTestValidateListener();
 void QuicTestValidateConnection();
-void QuicTestValidateStream(bool Connect);
+void QuicTestValidateStream(const bool& Connect);
 void QuicTestCloseConnBeforeStreamFlush();
 void QuicTestGlobalParam();
 void QuicTestCommonParam();
@@ -61,7 +71,7 @@ void QuicTestConfigurationParam();
 void QuicTestListenerParam();
 void QuicTestConnectionParam();
 void QuicTestTlsParam();
-void QuicTestTlsHandshakeInfo(_In_ bool EnableResumption);
+void QuicTestTlsHandshakeInfo(const bool& EnableResumption);
 void QuicTestStreamParam();
 void QuicTestGetPerfCounters();
 void QuicTestVersionSettings();
@@ -84,7 +94,7 @@ void QuicTestConnectionCloseBeforeStreamClose();
 //
 // Rejection Tests
 //
-void QuicTestConnectionRejection(bool RejectByClosing);
+void QuicTestConnectionRejection(const bool& RejectByClosing);
 
 //
 // Event Validation Tests
@@ -104,15 +114,15 @@ void QuicTestRegistrationOpenClose();
 void QuicTestCreateListener();
 void QuicTestStartListener();
 void QuicTestStartListenerMultiAlpns();
-void QuicTestStartListenerImplicit(_In_ int Family);
+void QuicTestStartListenerImplicit(const FamilyArgs& Params);
 void QuicTestStartTwoListeners();
 void QuicTestStartTwoListenersSameALPN();
-void QuicTestStartListenerExplicit(_In_ int Family);
+void QuicTestStartListenerExplicit(const FamilyArgs& Params);
 void QuicTestCreateConnection();
-void QuicTestBindConnectionImplicit(_In_ int Family);
-void QuicTestBindConnectionExplicit(_In_ int Family);
+void QuicTestBindConnectionImplicit(const FamilyArgs& Params);
+void QuicTestBindConnectionExplicit(const FamilyArgs& Params);
 void QuicTestConnectionCloseFromCallback();
-void QuicTestAddrFunctions(_In_ int Family);
+void QuicTestAddrFunctions(const FamilyArgs& Params);
 
 //
 // MTU tests
@@ -131,7 +141,7 @@ QuicTestMtuDiscovery(
 //
 void
 QuicTestLocalPathChanges(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 //
@@ -169,17 +179,17 @@ QuicTestConnect(
 #ifdef QUIC_API_ENABLE_PREVIEW_FEATURES
 void
 QuicTestVersionNegotiation(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestVersionNegotiationRetry(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestCompatibleVersionNegotiationRetry(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
@@ -205,12 +215,12 @@ QuicTestCompatibleVersionNegotiationDefaultServer(
 
 void
 QuicTestIncompatibleVersionNegotiation(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestFailedVersionNegotiation(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
@@ -258,22 +268,22 @@ QuicTestInvalidAlpnLengths(
 
 void
 QuicTestLoadBalancedHandshake(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestClientSharedLocalPort(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestInterfaceBinding(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestRetryMemoryLimitConnect(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 #ifdef QUIC_API_ENABLE_PREVIEW_FEATURES
@@ -311,7 +321,7 @@ QuicTestShutdownDuringHandshake(
 
 void
 QuicTestConnectUnreachable(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
@@ -320,17 +330,17 @@ QuicTestConnectInvalidAddress(
 
 void
 QuicTestConnectBadAlpn(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestConnectBadSni(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestConnectServerRejected(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
@@ -355,7 +365,7 @@ QuicTestConnectExpiredClientCertificate(
 
 void
 QuicTestClientBlockedSourcePort(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 #ifdef QUIC_API_ENABLE_PREVIEW_FEATURES
@@ -437,12 +447,12 @@ QuicTestNatAddrRebind(
 
 void
 QuicTestPathValidationTimeout(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestChangeMaxStreamID(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 //
@@ -474,7 +484,7 @@ QuicTestConnectAndPing(
 
 void
 QuicTestConnectAndIdle(
-    _In_ bool EnableKeepAlive
+    const bool& EnableKeepAlive
     );
 
 void
@@ -489,7 +499,7 @@ QuicTestServerDisconnect(
 
 void
 QuicTestClientDisconnect(
-    bool StopListenerFirst
+    const bool& StopListenerFirst
     );
 
 void
@@ -499,12 +509,12 @@ QuicTestStatelessResetKey(
 
 void
 QuicTestForceKeyUpdate(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestKeyUpdate(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
@@ -579,13 +589,9 @@ QuicTestReceiveResumeNoData(
     _In_ QUIC_RECEIVE_RESUME_SHUTDOWN_TYPE ShutdownType
     );
 
-struct FamilyArgs2 {
-    int Family;
-};
-
 void
 QuicTestAckSendDelay(
-    const FamilyArgs2& Params
+    const FamilyArgs& Params
     );
 
 typedef enum QUIC_ABORT_RECEIVE_TYPE {
@@ -662,13 +668,44 @@ QuicTestConnectionStreamStartSendPriority(
 
 void
 QuicTestEcn(
-    _In_ int Family
+    const FamilyArgs& Params
+    );
+
+struct AppProvidedBuffersConfig {
+    uint32_t StreamStartBuffersNum;
+    uint32_t StreamStartBuffersSize;
+    uint32_t AdditionalBuffersNum;
+    uint32_t AdditionalBuffersSize;
+};
+
+void
+QuicTestStreamAppProvidedBuffers_ClientSend(
+    const AppProvidedBuffersConfig& BufferConfig
+    );
+
+void
+QuicTestStreamAppProvidedBuffers_ServerSend(
+    const AppProvidedBuffersConfig& BufferConfig
+    );
+
+void
+QuicTestStreamAppProvidedBuffersOutOfSpace_ClientSend_AbortStream(
+    const AppProvidedBuffersConfig& BufferConfig
+    );
+
+void
+QuicTestStreamAppProvidedBuffersOutOfSpace_ClientSend_ProvideMoreBuffer(
+    const AppProvidedBuffersConfig& BufferConfig
     );
 
-void QuicTestStreamAppProvidedBuffers(
+void
+QuicTestStreamAppProvidedBuffersOutOfSpace_ServerSend_AbortStream(
+    const AppProvidedBuffersConfig& BufferConfig
     );
 
-void QuicTestStreamAppProvidedBuffersOutOfSpace(
+void
+QuicTestStreamAppProvidedBuffersOutOfSpace_ServerSend_ProvideMoreBuffer(
+    const AppProvidedBuffersConfig& BufferConfig
     );
 
 //
@@ -713,12 +750,12 @@ QuicTestDatagramNegotiation(
 
 void
 QuicTestDatagramSend(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 void
 QuicTestDatagramDrop(
-    _In_ int Family
+    const FamilyArgs& Params
     );
 
 //