diff --git a/src/core/binding.c b/src/core/binding.c
index 8ebac72702..fccd42ba56 100644
--- a/src/core/binding.c
+++ b/src/core/binding.c
@@ -165,7 +165,7 @@ QuicBindingInitialize(
QuicBindingGetRemoteAddress(Binding, &DatapathRemoteAddr);
QuicTraceEvent(
BindingCreated,
- "[bind][%p] Created, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
+ "[bind][%p] Created, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
Binding,
Binding->Socket,
CASTED_CLOG_BYTEARRAY(sizeof(DatapathLocalAddr), &DatapathLocalAddr),
@@ -262,7 +262,7 @@ QuicBindingTraceRundown(
QuicBindingGetRemoteAddress(Binding, &DatapathRemoteAddr);
QuicTraceEvent(
BindingRundown,
- "[bind][%p] Rundown, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
+ "[bind][%p] Rundown, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
Binding,
Binding->Socket,
CASTED_CLOG_BYTEARRAY(sizeof(DatapathLocalAddr), &DatapathLocalAddr),
diff --git a/src/core/library.c b/src/core/library.c
index f7a938cc2c..8fc1d01458 100644
--- a/src/core/library.c
+++ b/src/core/library.c
@@ -877,7 +877,7 @@ QuicLibraryLazyInitialize(
BOOLEAN AcquireLock
)
{
- const CXPLAT_UDP_DATAPATH_CALLBACKS DatapathCallbacks = {
+ const CXPLAT_DATAPATH_DGRAM_CALLBACKS DatapathCallbacks = {
QuicBindingReceive,
QuicBindingUnreachable,
};
diff --git a/src/generated/linux/binding.c.clog.h b/src/generated/linux/binding.c.clog.h
index f186ccca91..b74b98498f 100644
--- a/src/generated/linux/binding.c.clog.h
+++ b/src/generated/linux/binding.c.clog.h
@@ -176,10 +176,10 @@ tracepoint(CLOG_BINDING_C, BindingErrorStatus , arg2, arg3, arg4);\
/*----------------------------------------------------------
// Decoder Ring for BindingCreated
-// [bind][%p] Created, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!
+// [bind][%p] Created, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!
// QuicTraceEvent(
BindingCreated,
- "[bind][%p] Created, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
+ "[bind][%p] Created, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
Binding,
Binding->Socket,
CASTED_CLOG_BYTEARRAY(sizeof(DatapathLocalAddr), &DatapathLocalAddr),
@@ -236,10 +236,10 @@ tracepoint(CLOG_BINDING_C, BindingDestroyed , arg2);\
/*----------------------------------------------------------
// Decoder Ring for BindingRundown
-// [bind][%p] Rundown, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!
+// [bind][%p] Rundown, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!
// QuicTraceEvent(
BindingRundown,
- "[bind][%p] Rundown, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
+ "[bind][%p] Rundown, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
Binding,
Binding->Socket,
CASTED_CLOG_BYTEARRAY(sizeof(DatapathLocalAddr), &DatapathLocalAddr),
diff --git a/src/generated/linux/binding.c.clog.h.lttng.h b/src/generated/linux/binding.c.clog.h.lttng.h
index 0bc310011a..38b4d64d51 100644
--- a/src/generated/linux/binding.c.clog.h.lttng.h
+++ b/src/generated/linux/binding.c.clog.h.lttng.h
@@ -170,10 +170,10 @@ TRACEPOINT_EVENT(CLOG_BINDING_C, BindingErrorStatus,
/*----------------------------------------------------------
// Decoder Ring for BindingCreated
-// [bind][%p] Created, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!
+// [bind][%p] Created, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!
// QuicTraceEvent(
BindingCreated,
- "[bind][%p] Created, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
+ "[bind][%p] Created, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
Binding,
Binding->Socket,
CASTED_CLOG_BYTEARRAY(sizeof(DatapathLocalAddr), &DatapathLocalAddr),
@@ -243,10 +243,10 @@ TRACEPOINT_EVENT(CLOG_BINDING_C, BindingDestroyed,
/*----------------------------------------------------------
// Decoder Ring for BindingRundown
-// [bind][%p] Rundown, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!
+// [bind][%p] Rundown, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!
// QuicTraceEvent(
BindingRundown,
- "[bind][%p] Rundown, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
+ "[bind][%p] Rundown, Socket=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
Binding,
Binding->Socket,
CASTED_CLOG_BYTEARRAY(sizeof(DatapathLocalAddr), &DatapathLocalAddr),
diff --git a/src/inc/quic_datapath.h b/src/inc/quic_datapath.h
index f98bef52ec..b17f49cc8b 100644
--- a/src/inc/quic_datapath.h
+++ b/src/inc/quic_datapath.h
@@ -405,24 +405,24 @@ typedef CXPLAT_DATAPATH_UNREACHABLE_CALLBACK *CXPLAT_DATAPATH_UNREACHABLE_CALLBA
//
// UDP Callback function pointers used by the datapath.
//
-typedef struct CXPLAT_UDP_DATAPATH_CALLBACKS {
+typedef struct CXPLAT_DATAPATH_DGRAM_CALLBACKS {
CXPLAT_DATAPATH_RECEIVE_CALLBACK_HANDLER Receive;
CXPLAT_DATAPATH_UNREACHABLE_CALLBACK_HANDLER Unreachable;
-} CXPLAT_UDP_DATAPATH_CALLBACKS;
+} CXPLAT_DATAPATH_DGRAM_CALLBACKS;
//
// TCP Callback function pointers used by the datapath.
//
-typedef struct CXPLAT_TCP_DATAPATH_CALLBACKS {
+typedef struct CXPLAT_DATAPATH_CONN_CALLBACKS {
CXPLAT_DATAPATH_ACCEPT_CALLBACK_HANDLER Accept;
CXPLAT_DATAPATH_CONNECT_CALLBACK_HANDLER Connect;
CXPLAT_DATAPATH_RECEIVE_CALLBACK_HANDLER Receive;
CXPLAT_DATAPATH_SEND_COMPLETE_CALLBACK_HANDLER SendComplete;
-} CXPLAT_TCP_DATAPATH_CALLBACKS;
+} CXPLAT_DATAPATH_CONN_CALLBACKS;
typedef enum CXPLAT_DATAPATH_FEATURES {
CXPLAT_DATAPATH_FEATURE_NONE = 0x00000000,
@@ -485,8 +485,8 @@ _IRQL_requires_max_(PASSIVE_LEVEL)
QUIC_STATUS
CxPlatDataPathInitialize(
_In_ uint32_t ClientRecvContextLength,
- _In_opt_ const CXPLAT_UDP_DATAPATH_CALLBACKS* UdpCallbacks,
- _In_opt_ const CXPLAT_TCP_DATAPATH_CALLBACKS* TcpCallbacks,
+ _In_opt_ const CXPLAT_DATAPATH_DGRAM_CALLBACKS* UdpCallbacks,
+ _In_opt_ const CXPLAT_DATAPATH_CONN_CALLBACKS* TcpCallbacks,
_In_ CXPLAT_WORKER_POOL* WorkerPool,
_In_ CXPLAT_DATAPATH_INIT_CONFIG* InitConfig,
_Out_ CXPLAT_DATAPATH** NewDatapath
diff --git a/src/manifest/MsQuicEtw.man b/src/manifest/MsQuicEtw.man
index 5087dec9e6..ee718ace6d 100644
--- a/src/manifest/MsQuicEtw.man
+++ b/src/manifest/MsQuicEtw.man
@@ -4417,11 +4417,11 @@
/>
{
}
- const CXPLAT_UDP_DATAPATH_CALLBACKS EmptyUdpCallbacks = {
+ const CXPLAT_DATAPATH_DGRAM_CALLBACKS EmptyUdpCallbacks = {
EmptyReceiveCallback,
EmptyUnreachableCallback,
};
- const CXPLAT_UDP_DATAPATH_CALLBACKS UdpRecvCallbacks = {
+ const CXPLAT_DATAPATH_DGRAM_CALLBACKS UdpRecvCallbacks = {
UdpDataRecvCallback,
EmptyUnreachableCallback,
};
- const CXPLAT_TCP_DATAPATH_CALLBACKS EmptyTcpCallbacks = {
+ const CXPLAT_DATAPATH_CONN_CALLBACKS EmptyTcpCallbacks = {
EmptyAcceptCallback,
EmptyConnectCallback,
EmptyReceiveCallback,
TcpEmptySendCompleteCallback
};
- const CXPLAT_TCP_DATAPATH_CALLBACKS TcpRecvCallbacks = {
+ const CXPLAT_DATAPATH_CONN_CALLBACKS TcpRecvCallbacks = {
TcpAcceptCallback,
TcpConnectCallback,
TcpDataRecvCallback,
@@ -457,8 +457,8 @@ struct CxPlatDataPath {
CXPLAT_DATAPATH* Datapath {nullptr};
QUIC_STATUS InitStatus;
CxPlatDataPath(
- _In_opt_ const CXPLAT_UDP_DATAPATH_CALLBACKS* UdpCallbacks,
- _In_opt_ const CXPLAT_TCP_DATAPATH_CALLBACKS* TcpCallbacks = nullptr,
+ _In_opt_ const CXPLAT_DATAPATH_DGRAM_CALLBACKS* UdpCallbacks,
+ _In_opt_ const CXPLAT_DATAPATH_CONN_CALLBACKS* TcpCallbacks = nullptr,
_In_ uint32_t ClientRecvContextLength = 0,
_In_opt_ QUIC_GLOBAL_EXECUTION_CONFIG* Config = nullptr
) noexcept
@@ -729,13 +729,13 @@ TEST_F(DataPathTest, InitializeInvalid)
{
ASSERT_EQ(QUIC_STATUS_INVALID_PARAMETER, CxPlatDataPathInitialize(0, nullptr, nullptr, nullptr, nullptr, nullptr));
{
- const CXPLAT_UDP_DATAPATH_CALLBACKS InvalidUdpCallbacks = { nullptr, EmptyUnreachableCallback };
+ const CXPLAT_DATAPATH_DGRAM_CALLBACKS InvalidUdpCallbacks = { nullptr, EmptyUnreachableCallback };
CxPlatDataPath Datapath(&InvalidUdpCallbacks);
ASSERT_EQ(QUIC_STATUS_INVALID_PARAMETER, Datapath.GetInitStatus());
ASSERT_EQ(nullptr, Datapath.Datapath);
}
{
- const CXPLAT_UDP_DATAPATH_CALLBACKS InvalidUdpCallbacks = { EmptyReceiveCallback, nullptr };
+ const CXPLAT_DATAPATH_DGRAM_CALLBACKS InvalidUdpCallbacks = { EmptyReceiveCallback, nullptr };
CxPlatDataPath Datapath(&InvalidUdpCallbacks);
ASSERT_EQ(QUIC_STATUS_INVALID_PARAMETER, Datapath.GetInitStatus());
ASSERT_EQ(nullptr, Datapath.Datapath);
diff --git a/src/test/lib/QuicDrill.cpp b/src/test/lib/QuicDrill.cpp
index b9cf89310f..ced40aa625 100644
--- a/src/test/lib/QuicDrill.cpp
+++ b/src/test/lib/QuicDrill.cpp
@@ -138,7 +138,7 @@ struct DrillSender {
_In_ uint16_t NetworkPort
)
{
- const CXPLAT_UDP_DATAPATH_CALLBACKS DatapathCallbacks = {
+ const CXPLAT_DATAPATH_DGRAM_CALLBACKS DatapathCallbacks = {
DrillUdpRecvCallback,
DrillUdpUnreachCallback,
};
diff --git a/src/tools/attack/attack.cpp b/src/tools/attack/attack.cpp
index 5c83b12410..9d453804c2 100644
--- a/src/tools/attack/attack.cpp
+++ b/src/tools/attack/attack.cpp
@@ -431,7 +431,7 @@ main(
(AttackType <= 0 || AttackType > 4)) {
PrintUsage();
} else {
- const CXPLAT_UDP_DATAPATH_CALLBACKS DatapathCallbacks = {
+ const CXPLAT_DATAPATH_DGRAM_CALLBACKS DatapathCallbacks = {
UdpRecvCallback,
UdpUnreachCallback,
};
diff --git a/src/tools/lb/loadbalancer.cpp b/src/tools/lb/loadbalancer.cpp
index d5322f3285..2eaa7a9ea5 100644
--- a/src/tools/lb/loadbalancer.cpp
+++ b/src/tools/lb/loadbalancer.cpp
@@ -215,7 +215,7 @@ main(int argc, char **argv)
CxPlatInitialize();
CXPLAT_WORKER_POOL* WorkerPool = CxPlatWorkerPoolCreate(nullptr, CXPLAT_WORKER_POOL_REF_TOOL);
- CXPLAT_UDP_DATAPATH_CALLBACKS LbUdpCallbacks { LbReceive, NoOpUnreachable };
+ CXPLAT_DATAPATH_DGRAM_CALLBACKS LbUdpCallbacks { LbReceive, NoOpUnreachable };
CXPLAT_DATAPATH_INIT_CONFIG DataPathInitConfig = {0};
CxPlatDataPathInitialize(0, &LbUdpCallbacks, nullptr, WorkerPool, &DataPathInitConfig, &Datapath);
PublicInterface = new LbPublicInterface(&PublicAddr);
diff --git a/src/tools/recvfuzz/recvfuzz.cpp b/src/tools/recvfuzz/recvfuzz.cpp
index 03b1cf1577..6c609b96fd 100644
--- a/src/tools/recvfuzz/recvfuzz.cpp
+++ b/src/tools/recvfuzz/recvfuzz.cpp
@@ -1661,7 +1661,7 @@ void SetupAndFuzz() {
CxPlatInitialize();
CXPLAT_DATAPATH* Datapath;
- const CXPLAT_UDP_DATAPATH_CALLBACKS DatapathCallbacks = {
+ const CXPLAT_DATAPATH_DGRAM_CALLBACKS DatapathCallbacks = {
UdpRecvCallback,
UdpUnreachCallback,
};