return error if xdp not available

Author: ProjectsByJackHe

src/platform/datapath_winuser.c

@@ -1734,15 +1734,6 @@ SocketCreateUdp(
                         // expected if multiple server processes were configured to share
                         // the same UDP and/or TCP port.
                         //
-                        QuicTraceLogWarning(
-                            DatapathCibirWarning,
-                            "[data][%p] CIBIR detected,  %s",
-                            Socket,
-                            "ignoring port collision by assuming some \
-                             other MsQuic CIBIR process has reserved the OS port. \
-                             Let's continue with initialization and skip port reservation.");
-                        CxPlatRefInitializeEx(&Socket->RefCount, 1);
-                        Socket->SkipCreatingOsSockets = TRUE;
                         BOOLEAN XdpAvailable = Datapath->RawDataPath != NULL;
                         BOOLEAN XdpEnabled = Config->Flags & CXPLAT_SOCKET_FLAG_XDP;
                         if (!XdpAvailable || !XdpEnabled) {
@@ -1753,7 +1744,19 @@ SocketCreateUdp(
                                 !XdpAvailable ?
                                 "but XDP not available. NO TRAFFIC WILL FLOW ON THIS LISTENER." :
                                 "but XPD not enabled. NO TRAFFIC WILL FLOW ON THIS LISTENER.");
+                            Status = QUIC_STATUS_INVALID_STATE;
+                            goto Error;
                         }
+
+                        QuicTraceLogWarning(
+                            DatapathCibirWarning,
+                            "[data][%p] CIBIR detected,  %s",
+                            Socket,
+                            "ignoring port collision by assuming some \
+                            other MsQuic CIBIR process has reserved the OS port. \
+                            Let's continue with initialization and skip port reservation.");
+                        CxPlatRefInitializeEx(&Socket->RefCount, 1);
+                        Socket->SkipCreatingOsSockets = TRUE;
                         goto Skip;
                     }
 

src/platform/unittest/DataPathTest.cpp

@@ -862,7 +862,8 @@ TEST_P(DataPathTest, UdpDataShareCibirUdpPort) {
     //
     // Set CibirIdLength to some non-zero value to trigger the cibir path in the datapath code,
     // which should allow multiple cxplat sockets to be created on the same udp port so long as
-    // cibir is configured.
+    // cibir is configured. Now, since this test is executed without XDP being enabled, we should
+    // expect a QUIC_STATUS_INVALID_STATE instead of QUIC_STATUS_ADDRESS_IN_USE.
     //
     Server1.CibirIdLength = 8;
     Server1.CreateUdp(Datapath, &unspecAddress.SockAddr, nullptr, &RecvContext);
@@ -872,11 +873,21 @@ TEST_P(DataPathTest, UdpDataShareCibirUdpPort) {
     }
     VERIFY_QUIC_SUCCESS(Server1.GetInitStatus());
     ASSERT_NE(nullptr, Server1.Socket);
+
+    //
+    // Try creating a CIBIR-aware socket on the same port.
+    //
     CxPlatSocket Server2;
     Server2.CibirIdLength = 8;
     Server2.CreateUdp(Datapath, &unspecAddress.SockAddr, nullptr, &RecvContext);
-    VERIFY_QUIC_SUCCESS(Server2.GetInitStatus());
-    ASSERT_NE(nullptr, Server2.Socket);
+    ASSERT_EQ(QUIC_STATUS_INVALID_STATE, Server2.GetInitStatus());
+
+    //
+    // Try creating a non-CIBIR-aware socket on the same port.
+    //
+    CxPlatSocket Server3;
+    Server3.CreateUdp(Datapath, &unspecAddress.SockAddr, nullptr, &RecvContext);
+    ASSERT_EQ(QUIC_STATUS_ADDRESS_IN_USE, Server3.GetInitStatus());
 }
 
 TEST_P(DataPathTest, UdpDataPolling)