Changes for latest code

Author: masa-koz

src/core/frame.h

@@ -174,8 +174,8 @@ typedef enum QUIC_FRAME_TYPE {
 } QUIC_FRAME_TYPE;
 
 CXPLAT_STATIC_ASSERT(
-    QUIC_FRAME_MAX_SUPPORTED <= (uint64_t)UINT16_MAX,
-    "Sent packet metadata 'Type' field above assumes frames types fit in 16-bits");
+    QUIC_FRAME_MAX_SUPPORTED <= (uint64_t)UINT32_MAX,
+    "Sent packet metadata 'Type' field above assumes frames types fit in 32-bits");
 
 CXPLAT_STATIC_ASSERT(
     QUIC_FRAME_MAX_SUPPORTED <= (uint64_t)UINT32_MAX,

src/core/packet_space.c

@@ -24,7 +24,7 @@ QuicPacketSpaceInitialize(
     )
 {
     QUIC_PACKET_SPACE* Packets =
-        CxPlatPoolAlloc(&Connection->Partition->PacketSpacePool);
+        CxPlatPoolAlloc(&PathID->Connection->Partition->PacketSpacePool);
     if (Packets == NULL) {
         QuicTraceEvent(
             AllocFailure,

src/core/pathid.c

@@ -793,6 +793,7 @@ QuicPathIDWriteNewConnectionIDFrame(
             SourceCid->CID.Length);
         CXPLAT_DBG_ASSERT(SourceCid->CID.Length == MsQuicLib.CidTotalLength);
         QuicLibraryGenerateStatelessResetToken(
+            PathID->Connection->Partition,
             SourceCid->CID.Data,
             Frame.Buffer + SourceCid->CID.Length);
 

src/core/pathid.h

@@ -220,7 +220,7 @@ QuicPathIDGenerateNewSourceCids(
 //
 _IRQL_requires_max_(DISPATCH_LEVEL)
 _Success_(return != NULL)
-inline
+QUIC_INLINE
 QUIC_CID_SLIST_ENTRY*
 QuicPathIDGetSourceCidFromSeq(
     _In_ QUIC_PATHID* PathID,
@@ -269,7 +269,7 @@ QuicPathIDGetSourceCidFromSeq(
 // Look up a source CID by data buffer.
 //
 _IRQL_requires_max_(DISPATCH_LEVEL)
-inline
+QUIC_INLINE
 QUIC_CID_SLIST_ENTRY*
 QuicPathIDGetSourceCidFromBuf(
     _In_ QUIC_PATHID* PathID,
@@ -344,7 +344,7 @@ QuicPathIDUpdateDestCid(
 // Look up a source CID by sequence number.
 //
 _IRQL_requires_max_(DISPATCH_LEVEL)
-inline
+QUIC_INLINE
 QUIC_CID_LIST_ENTRY*
 QuicPathIDGetDestCidFromSeq(
     _In_ QUIC_PATHID* PathID,
@@ -407,7 +407,7 @@ QuicPathIDWriteRetireConnectionIDFrame(
 // Adds a ref to a PathID.
 //
 _IRQL_requires_max_(DISPATCH_LEVEL)
-inline
+QUIC_INLINE
 void
 QuicPathIDAddRef(
     _In_ QUIC_PATHID* PathID,
@@ -432,7 +432,7 @@ QuicPathIDAddRef(
 #pragma warning(push)
 #pragma warning(disable:6014) // SAL doesn't understand ref counts
 _IRQL_requires_max_(DISPATCH_LEVEL)
-inline
+QUIC_INLINE
 BOOLEAN
 QuicPathIDRelease(
     _In_ __drv_freesMem(Mem) QUIC_PATHID* PathID,

src/generated/linux/connection.c.clog.h

@@ -1322,6 +1322,24 @@ tracepoint(CLOG_CONNECTION_C, IndicatePathAdded , arg1);\
 
 
 
+/*----------------------------------------------------------
+// Decoder Ring for IndicatePathRemoved
+// [conn][%p] Indicating QUIC_CONNECTION_EVENT_PATH_REMOVED
+// QuicTraceLogConnVerbose(
+                    IndicatePathRemoved,
+                    Connection,
+                    "Indicating QUIC_CONNECTION_EVENT_PATH_REMOVED");
+// arg1 = arg1 = Connection = arg1
+----------------------------------------------------------*/
+#ifndef _clog_3_ARGS_TRACE_IndicatePathRemoved
+#define _clog_3_ARGS_TRACE_IndicatePathRemoved(uniqueId, arg1, encoded_arg_string)\
+tracepoint(CLOG_CONNECTION_C, IndicatePathRemoved , arg1);\
+
+#endif
+
+
+
+
 /*----------------------------------------------------------
 // Decoder Ring for IndicatePathStatusChanged
 // [conn][%p] Indicating QUIC_CONNECTION_EVENT_PATH_STATUS_CHANGED
@@ -1398,24 +1416,6 @@ tracepoint(CLOG_CONNECTION_C, UdpRecvDeferred , arg1, arg3);\
 
 
 
-/*----------------------------------------------------------
-// Decoder Ring for IndicatePathRemoved
-// [conn][%p] Indicating QUIC_CONNECTION_EVENT_PATH_REMOVED
-// QuicTraceLogConnVerbose(
-            IndicatePathRemoved,
-            Connection,
-            "Indicating QUIC_CONNECTION_EVENT_PATH_REMOVED");
-// arg1 = arg1 = Connection = arg1
-----------------------------------------------------------*/
-#ifndef _clog_3_ARGS_TRACE_IndicatePathRemoved
-#define _clog_3_ARGS_TRACE_IndicatePathRemoved(uniqueId, arg1, encoded_arg_string)\
-tracepoint(CLOG_CONNECTION_C, IndicatePathRemoved , arg1);\
-
-#endif
-
-
-
-
 /*----------------------------------------------------------
 // Decoder Ring for DatagramReceiveEnableUpdated
 // [conn][%p] Updated datagram receive enabled to %hhu

src/generated/linux/connection.c.clog.h.lttng.h

@@ -1462,6 +1462,25 @@ TRACEPOINT_EVENT(CLOG_CONNECTION_C, IndicatePathAdded,
 
 
 
+/*----------------------------------------------------------
+// Decoder Ring for IndicatePathRemoved
+// [conn][%p] Indicating QUIC_CONNECTION_EVENT_PATH_REMOVED
+// QuicTraceLogConnVerbose(
+                    IndicatePathRemoved,
+                    Connection,
+                    "Indicating QUIC_CONNECTION_EVENT_PATH_REMOVED");
+// arg1 = arg1 = Connection = arg1
+----------------------------------------------------------*/
+TRACEPOINT_EVENT(CLOG_CONNECTION_C, IndicatePathRemoved,
+    TP_ARGS(
+        const void *, arg1), 
+    TP_FIELDS(
+        ctf_integer_hex(uint64_t, arg1, (uint64_t)arg1)
+    )
+)
+
+
+
 /*----------------------------------------------------------
 // Decoder Ring for IndicatePathStatusChanged
 // [conn][%p] Indicating QUIC_CONNECTION_EVENT_PATH_STATUS_CHANGED
@@ -1546,25 +1565,6 @@ TRACEPOINT_EVENT(CLOG_CONNECTION_C, UdpRecvDeferred,
 
 
 
-/*----------------------------------------------------------
-// Decoder Ring for IndicatePathRemoved
-// [conn][%p] Indicating QUIC_CONNECTION_EVENT_PATH_REMOVED
-// QuicTraceLogConnVerbose(
-            IndicatePathRemoved,
-            Connection,
-            "Indicating QUIC_CONNECTION_EVENT_PATH_REMOVED");
-// arg1 = arg1 = Connection = arg1
-----------------------------------------------------------*/
-TRACEPOINT_EVENT(CLOG_CONNECTION_C, IndicatePathRemoved,
-    TP_ARGS(
-        const void *, arg1), 
-    TP_FIELDS(
-        ctf_integer_hex(uint64_t, arg1, (uint64_t)arg1)
-    )
-)
-
-
-
 /*----------------------------------------------------------
 // Decoder Ring for DatagramReceiveEnableUpdated
 // [conn][%p] Updated datagram receive enabled to %hhu

src/inc/quic_crypt.h

@@ -289,7 +289,7 @@ QuicCryptoCombineIvAndPacketNumber(
     IvOut[11] = IvIn[11] ^ PacketNumber[0];
 }
 
-inline
+QUIC_INLINE
 void
 QuicCryptoCombineIvAndPathIDAndPacketNumber(
     _In_reads_bytes_(CXPLAT_IV_LENGTH)