Add versioning support for Connection resumption ticket #5114
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Min and max resumption ticket version is set to 1 by default - Update API to read/set the new versions through QUIC_SETTINGS - New settings can be read from storage(registry) - Add tests for new version fields, as well as several missing tests for existing settings - Use the max resumption ticket version when issuing the ticket on the server - Check if the received resumption ticket is in a valid range on the client - NULL ptr checks in CxPlatStorageReadValue - Other minor test updates
Cargo - ubuntu-latestThe rust bindings need to be updated. Please apply ( diff --git a/src/rs/ffi/linux_bindings.rs b/src/rs/ffi/linux_bindings.rs
index 2523e0a..ad966ad 100644
--- a/src/rs/ffi/linux_bindings.rs
+++ b/src/rs/ffi/linux_bindings.rs
@@ -1925,6 +1925,8 @@ pub struct QUIC_SETTINGS {
pub StreamRecvWindowBidiLocalDefault: u32,
pub StreamRecvWindowBidiRemoteDefault: u32,
pub StreamRecvWindowUnidiDefault: u32,
+ pub ResumptionTicketMinVersion: u8,
+ pub ResumptionTicketMaxVersion: u8,
}
#[repr(C)]
#[derive(Copy, Clone)]
@@ -1936,7 +1938,7 @@ pub union QUIC_SETTINGS__bindgen_ty_1 {
#[repr(align(8))]
#[derive(Debug, Copy, Clone)]
pub struct QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
- pub _bitfield_align_1: [u32; 0],
+ pub _bitfield_align_1: [u16; 0],
pub _bitfield_1: __BindgenBitfieldUnit<[u8; 8usize]>,
}
#[allow(clippy::unnecessary_operation, clippy::identity_op)]
@@ -3466,14 +3468,80 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
}
}
#[inline]
+ pub fn ResumptionTicketMinVersion(&self) -> u64 {
+ unsafe { ::std::mem::transmute(self._bitfield_1.get(46usize, 1u8) as u64) }
+ }
+ #[inline]
+ pub fn set_ResumptionTicketMinVersion(&mut self, val: u64) {
+ unsafe {
+ let val: u64 = ::std::mem::transmute(val);
+ self._bitfield_1.set(46usize, 1u8, val as u64)
+ }
+ }
+ #[inline]
+ pub unsafe fn ResumptionTicketMinVersion_raw(this: *const Self) -> u64 {
+ unsafe {
+ ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
+ ::std::ptr::addr_of!((*this)._bitfield_1),
+ 46usize,
+ 1u8,
+ ) as u64)
+ }
+ }
+ #[inline]
+ pub unsafe fn set_ResumptionTicketMinVersion_raw(this: *mut Self, val: u64) {
+ unsafe {
+ let val: u64 = ::std::mem::transmute(val);
+ <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
+ ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+ 46usize,
+ 1u8,
+ val as u64,
+ )
+ }
+ }
+ #[inline]
+ pub fn ResumptionTicketMaxVersion(&self) -> u64 {
+ unsafe { ::std::mem::transmute(self._bitfield_1.get(47usize, 1u8) as u64) }
+ }
+ #[inline]
+ pub fn set_ResumptionTicketMaxVersion(&mut self, val: u64) {
+ unsafe {
+ let val: u64 = ::std::mem::transmute(val);
+ self._bitfield_1.set(47usize, 1u8, val as u64)
+ }
+ }
+ #[inline]
+ pub unsafe fn ResumptionTicketMaxVersion_raw(this: *const Self) -> u64 {
+ unsafe {
+ ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
+ ::std::ptr::addr_of!((*this)._bitfield_1),
+ 47usize,
+ 1u8,
+ ) as u64)
+ }
+ }
+ #[inline]
+ pub unsafe fn set_ResumptionTicketMaxVersion_raw(this: *mut Self, val: u64) {
+ unsafe {
+ let val: u64 = ::std::mem::transmute(val);
+ <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
+ ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+ 47usize,
+ 1u8,
+ val as u64,
+ )
+ }
+ }
+ #[inline]
pub fn RESERVED(&self) -> u64 {
- unsafe { ::std::mem::transmute(self._bitfield_1.get(46usize, 18u8) as u64) }
+ unsafe { ::std::mem::transmute(self._bitfield_1.get(48usize, 16u8) as u64) }
}
#[inline]
pub fn set_RESERVED(&mut self, val: u64) {
unsafe {
let val: u64 = ::std::mem::transmute(val);
- self._bitfield_1.set(46usize, 18u8, val as u64)
+ self._bitfield_1.set(48usize, 16u8, val as u64)
}
}
#[inline]
@@ -3481,8 +3549,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
unsafe {
::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
::std::ptr::addr_of!((*this)._bitfield_1),
- 46usize,
- 18u8,
+ 48usize,
+ 16u8,
) as u64)
}
}
@@ -3492,8 +3560,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
let val: u64 = ::std::mem::transmute(val);
<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
::std::ptr::addr_of_mut!((*this)._bitfield_1),
- 46usize,
- 18u8,
+ 48usize,
+ 16u8,
val as u64,
)
}
@@ -3546,6 +3614,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
XdpEnabled: u64,
QTIPEnabled: u64,
RioEnabled: u64,
+ ResumptionTicketMinVersion: u64,
+ ResumptionTicketMaxVersion: u64,
RESERVED: u64,
) -> __BindgenBitfieldUnit<[u8; 8usize]> {
let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 8usize]> = Default::default();
@@ -3755,7 +3825,17 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
let RioEnabled: u64 = unsafe { ::std::mem::transmute(RioEnabled) };
RioEnabled as u64
});
- __bindgen_bitfield_unit.set(46usize, 18u8, {
+ __bindgen_bitfield_unit.set(46usize, 1u8, {
+ let ResumptionTicketMinVersion: u64 =
+ unsafe { ::std::mem::transmute(ResumptionTicketMinVersion) };
+ ResumptionTicketMinVersion as u64
+ });
+ __bindgen_bitfield_unit.set(47usize, 1u8, {
+ let ResumptionTicketMaxVersion: u64 =
+ unsafe { ::std::mem::transmute(ResumptionTicketMaxVersion) };
+ ResumptionTicketMaxVersion as u64
+ });
+ __bindgen_bitfield_unit.set(48usize, 16u8, {
let RESERVED: u64 = unsafe { ::std::mem::transmute(RESERVED) };
RESERVED as u64
});
@@ -4255,6 +4335,10 @@ const _: () = {
[::std::mem::offset_of!(QUIC_SETTINGS, StreamRecvWindowBidiRemoteDefault) - 132usize];
["Offset of field: QUIC_SETTINGS::StreamRecvWindowUnidiDefault"]
[::std::mem::offset_of!(QUIC_SETTINGS, StreamRecvWindowUnidiDefault) - 136usize];
+ ["Offset of field: QUIC_SETTINGS::ResumptionTicketMinVersion"]
+ [::std::mem::offset_of!(QUIC_SETTINGS, ResumptionTicketMinVersion) - 140usize];
+ ["Offset of field: QUIC_SETTINGS::ResumptionTicketMaxVersion"]
+ [::std::mem::offset_of!(QUIC_SETTINGS, ResumptionTicketMaxVersion) - 141usize];
};
impl QUIC_SETTINGS {
#[inline] |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Cargo - windows-latestThe rust bindings need to be updated. Please apply ( diff --git a/src/rs/ffi/win_bindings.rs b/src/rs/ffi/win_bindings.rs
index 5b5a00e..beba39c 100644
--- a/src/rs/ffi/win_bindings.rs
+++ b/src/rs/ffi/win_bindings.rs
@@ -1919,6 +1919,8 @@ pub struct QUIC_SETTINGS {
pub StreamRecvWindowBidiLocalDefault: u32,
pub StreamRecvWindowBidiRemoteDefault: u32,
pub StreamRecvWindowUnidiDefault: u32,
+ pub ResumptionTicketMinVersion: u8,
+ pub ResumptionTicketMaxVersion: u8,
}
#[repr(C)]
#[derive(Copy, Clone)]
@@ -1930,7 +1932,7 @@ pub union QUIC_SETTINGS__bindgen_ty_1 {
#[repr(align(8))]
#[derive(Debug, Copy, Clone)]
pub struct QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
- pub _bitfield_align_1: [u32; 0],
+ pub _bitfield_align_1: [u16; 0],
pub _bitfield_1: __BindgenBitfieldUnit<[u8; 8usize]>,
}
#[allow(clippy::unnecessary_operation, clippy::identity_op)]
@@ -3460,14 +3462,80 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
}
}
#[inline]
+ pub fn ResumptionTicketMinVersion(&self) -> u64 {
+ unsafe { ::std::mem::transmute(self._bitfield_1.get(46usize, 1u8) as u64) }
+ }
+ #[inline]
+ pub fn set_ResumptionTicketMinVersion(&mut self, val: u64) {
+ unsafe {
+ let val: u64 = ::std::mem::transmute(val);
+ self._bitfield_1.set(46usize, 1u8, val as u64)
+ }
+ }
+ #[inline]
+ pub unsafe fn ResumptionTicketMinVersion_raw(this: *const Self) -> u64 {
+ unsafe {
+ ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
+ ::std::ptr::addr_of!((*this)._bitfield_1),
+ 46usize,
+ 1u8,
+ ) as u64)
+ }
+ }
+ #[inline]
+ pub unsafe fn set_ResumptionTicketMinVersion_raw(this: *mut Self, val: u64) {
+ unsafe {
+ let val: u64 = ::std::mem::transmute(val);
+ <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
+ ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+ 46usize,
+ 1u8,
+ val as u64,
+ )
+ }
+ }
+ #[inline]
+ pub fn ResumptionTicketMaxVersion(&self) -> u64 {
+ unsafe { ::std::mem::transmute(self._bitfield_1.get(47usize, 1u8) as u64) }
+ }
+ #[inline]
+ pub fn set_ResumptionTicketMaxVersion(&mut self, val: u64) {
+ unsafe {
+ let val: u64 = ::std::mem::transmute(val);
+ self._bitfield_1.set(47usize, 1u8, val as u64)
+ }
+ }
+ #[inline]
+ pub unsafe fn ResumptionTicketMaxVersion_raw(this: *const Self) -> u64 {
+ unsafe {
+ ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
+ ::std::ptr::addr_of!((*this)._bitfield_1),
+ 47usize,
+ 1u8,
+ ) as u64)
+ }
+ }
+ #[inline]
+ pub unsafe fn set_ResumptionTicketMaxVersion_raw(this: *mut Self, val: u64) {
+ unsafe {
+ let val: u64 = ::std::mem::transmute(val);
+ <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
+ ::std::ptr::addr_of_mut!((*this)._bitfield_1),
+ 47usize,
+ 1u8,
+ val as u64,
+ )
+ }
+ }
+ #[inline]
pub fn RESERVED(&self) -> u64 {
- unsafe { ::std::mem::transmute(self._bitfield_1.get(46usize, 18u8) as u64) }
+ unsafe { ::std::mem::transmute(self._bitfield_1.get(48usize, 16u8) as u64) }
}
#[inline]
pub fn set_RESERVED(&mut self, val: u64) {
unsafe {
let val: u64 = ::std::mem::transmute(val);
- self._bitfield_1.set(46usize, 18u8, val as u64)
+ self._bitfield_1.set(48usize, 16u8, val as u64)
}
}
#[inline]
@@ -3475,8 +3543,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
unsafe {
::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
::std::ptr::addr_of!((*this)._bitfield_1),
- 46usize,
- 18u8,
+ 48usize,
+ 16u8,
) as u64)
}
}
@@ -3486,8 +3554,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
let val: u64 = ::std::mem::transmute(val);
<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
::std::ptr::addr_of_mut!((*this)._bitfield_1),
- 46usize,
- 18u8,
+ 48usize,
+ 16u8,
val as u64,
)
}
@@ -3540,6 +3608,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
XdpEnabled: u64,
QTIPEnabled: u64,
RioEnabled: u64,
+ ResumptionTicketMinVersion: u64,
+ ResumptionTicketMaxVersion: u64,
RESERVED: u64,
) -> __BindgenBitfieldUnit<[u8; 8usize]> {
let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 8usize]> = Default::default();
@@ -3749,7 +3819,17 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
let RioEnabled: u64 = unsafe { ::std::mem::transmute(RioEnabled) };
RioEnabled as u64
});
- __bindgen_bitfield_unit.set(46usize, 18u8, {
+ __bindgen_bitfield_unit.set(46usize, 1u8, {
+ let ResumptionTicketMinVersion: u64 =
+ unsafe { ::std::mem::transmute(ResumptionTicketMinVersion) };
+ ResumptionTicketMinVersion as u64
+ });
+ __bindgen_bitfield_unit.set(47usize, 1u8, {
+ let ResumptionTicketMaxVersion: u64 =
+ unsafe { ::std::mem::transmute(ResumptionTicketMaxVersion) };
+ ResumptionTicketMaxVersion as u64
+ });
+ __bindgen_bitfield_unit.set(48usize, 16u8, {
let RESERVED: u64 = unsafe { ::std::mem::transmute(RESERVED) };
RESERVED as u64
});
@@ -4249,6 +4329,10 @@ const _: () = {
[::std::mem::offset_of!(QUIC_SETTINGS, StreamRecvWindowBidiRemoteDefault) - 132usize];
["Offset of field: QUIC_SETTINGS::StreamRecvWindowUnidiDefault"]
[::std::mem::offset_of!(QUIC_SETTINGS, StreamRecvWindowUnidiDefault) - 136usize];
+ ["Offset of field: QUIC_SETTINGS::ResumptionTicketMinVersion"]
+ [::std::mem::offset_of!(QUIC_SETTINGS, ResumptionTicketMinVersion) - 140usize];
+ ["Offset of field: QUIC_SETTINGS::ResumptionTicketMaxVersion"]
+ [::std::mem::offset_of!(QUIC_SETTINGS, ResumptionTicketMaxVersion) - 141usize];
};
impl QUIC_SETTINGS {
#[inline] |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5114 +/- ##
==========================================
+ Coverage 86.47% 86.87% +0.40%
==========================================
Files 59 59
Lines 18035 18059 +24
==========================================
+ Hits 15595 15688 +93
+ Misses 2440 2371 -69 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Why does the application need to set resumption ticket versions? The resumption ticket is opaque to the application, so the version of a ticket is for MsQuic's own benefit for parsing. |
|
For careful resume, the application should control whether it wants to use careful resume, not which version of the ticket to send. If careful resume is enabled on a server, send a version 2 ticket. If a client receives a version 2 ticket, but doesn't have careful resume enabled, ignore the version 2 field, and just use the version 1 fields. |
Part of the resumption ticket is visible to the client application and this versioning will help the client filter out tickets it cannot parse. |
nibanks
reviewed
May 23, 2025
nibanks
reviewed
May 23, 2025
nibanks
reviewed
May 23, 2025
nibanks
reviewed
May 23, 2025
nibanks
reviewed
May 23, 2025
nibanks
reviewed
May 23, 2025
Looking at the code, it doesn't seem like this is the case. The ticket, where ticket version, TP and whatnot are encoded in QuicCryptoEncodeServerTicket and then passed to schannel/quictls to encrypt (QuicCryptoEncodeServerTicket->QuicCryptoProcessAppData->CxPlatTlsProcessData). I don't see any code that skips the first few bytes. |
The format/version of the ticket is not exposed to the app. They can have their own blob as a part of it, but we only give them back their part. They should have their own version, which is completely independent of MsQuic's. |
The client shouldn't need to think about things like this. The client application, when it gets the resumption token from MsQuic, is supposed to treat it like an opaque string of bytes and save the ticket without modification for use later. If a client which supports careful resume receives a V1 resumption ticket from the server, that means it can't do careful resume, but it can still do resumption. |
So, the metadata like ticket version, quic version and TP etc can actually be decrypted and be decoded if the client is also msquic? My bad. I thought it couldn't be even decrypted by the client. |
Discussed this with Anthony - this is not the case here. |
- Address PR comments, including coding bot comments
- Update settings test to use new API and minor code cleanup
Cargo - ubuntu-latestThe rust bindings need to be updated. Please apply ( diff --git a/src/rs/ffi/linux_bindings.rs b/src/rs/ffi/linux_bindings.rs
index 5eb87c1..283e538 100644
--- a/src/rs/ffi/linux_bindings.rs
+++ b/src/rs/ffi/linux_bindings.rs
@@ -1926,8 +1926,6 @@ pub struct QUIC_SETTINGS {
pub StreamRecvWindowBidiLocalDefault: u32,
pub StreamRecvWindowBidiRemoteDefault: u32,
pub StreamRecvWindowUnidiDefault: u32,
- pub ResumptionTicketMinVersion: u8,
- pub ResumptionTicketMaxVersion: u8,
}
#[repr(C)]
#[derive(Copy, Clone)]
@@ -1939,7 +1937,7 @@ pub union QUIC_SETTINGS__bindgen_ty_1 {
#[repr(align(8))]
#[derive(Debug, Copy, Clone)]
pub struct QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
- pub _bitfield_align_1: [u16; 0],
+ pub _bitfield_align_1: [u32; 0],
pub _bitfield_1: __BindgenBitfieldUnit<[u8; 8usize]>,
}
#[allow(clippy::unnecessary_operation, clippy::identity_op)]
@@ -3469,80 +3467,14 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
}
}
#[inline]
- pub fn ResumptionTicketMinVersion(&self) -> u64 {
- unsafe { ::std::mem::transmute(self._bitfield_1.get(46usize, 1u8) as u64) }
- }
- #[inline]
- pub fn set_ResumptionTicketMinVersion(&mut self, val: u64) {
- unsafe {
- let val: u64 = ::std::mem::transmute(val);
- self._bitfield_1.set(46usize, 1u8, val as u64)
- }
- }
- #[inline]
- pub unsafe fn ResumptionTicketMinVersion_raw(this: *const Self) -> u64 {
- unsafe {
- ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
- ::std::ptr::addr_of!((*this)._bitfield_1),
- 46usize,
- 1u8,
- ) as u64)
- }
- }
- #[inline]
- pub unsafe fn set_ResumptionTicketMinVersion_raw(this: *mut Self, val: u64) {
- unsafe {
- let val: u64 = ::std::mem::transmute(val);
- <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
- ::std::ptr::addr_of_mut!((*this)._bitfield_1),
- 46usize,
- 1u8,
- val as u64,
- )
- }
- }
- #[inline]
- pub fn ResumptionTicketMaxVersion(&self) -> u64 {
- unsafe { ::std::mem::transmute(self._bitfield_1.get(47usize, 1u8) as u64) }
- }
- #[inline]
- pub fn set_ResumptionTicketMaxVersion(&mut self, val: u64) {
- unsafe {
- let val: u64 = ::std::mem::transmute(val);
- self._bitfield_1.set(47usize, 1u8, val as u64)
- }
- }
- #[inline]
- pub unsafe fn ResumptionTicketMaxVersion_raw(this: *const Self) -> u64 {
- unsafe {
- ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
- ::std::ptr::addr_of!((*this)._bitfield_1),
- 47usize,
- 1u8,
- ) as u64)
- }
- }
- #[inline]
- pub unsafe fn set_ResumptionTicketMaxVersion_raw(this: *mut Self, val: u64) {
- unsafe {
- let val: u64 = ::std::mem::transmute(val);
- <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
- ::std::ptr::addr_of_mut!((*this)._bitfield_1),
- 47usize,
- 1u8,
- val as u64,
- )
- }
- }
- #[inline]
pub fn RESERVED(&self) -> u64 {
- unsafe { ::std::mem::transmute(self._bitfield_1.get(48usize, 16u8) as u64) }
+ unsafe { ::std::mem::transmute(self._bitfield_1.get(46usize, 18u8) as u64) }
}
#[inline]
pub fn set_RESERVED(&mut self, val: u64) {
unsafe {
let val: u64 = ::std::mem::transmute(val);
- self._bitfield_1.set(48usize, 16u8, val as u64)
+ self._bitfield_1.set(46usize, 18u8, val as u64)
}
}
#[inline]
@@ -3550,8 +3482,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
unsafe {
::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
::std::ptr::addr_of!((*this)._bitfield_1),
- 48usize,
- 16u8,
+ 46usize,
+ 18u8,
) as u64)
}
}
@@ -3561,8 +3493,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
let val: u64 = ::std::mem::transmute(val);
<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
::std::ptr::addr_of_mut!((*this)._bitfield_1),
- 48usize,
- 16u8,
+ 46usize,
+ 18u8,
val as u64,
)
}
@@ -3615,8 +3547,6 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
XdpEnabled: u64,
QTIPEnabled: u64,
RioEnabled: u64,
- ResumptionTicketMinVersion: u64,
- ResumptionTicketMaxVersion: u64,
RESERVED: u64,
) -> __BindgenBitfieldUnit<[u8; 8usize]> {
let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 8usize]> = Default::default();
@@ -3826,17 +3756,7 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
let RioEnabled: u64 = unsafe { ::std::mem::transmute(RioEnabled) };
RioEnabled as u64
});
- __bindgen_bitfield_unit.set(46usize, 1u8, {
- let ResumptionTicketMinVersion: u64 =
- unsafe { ::std::mem::transmute(ResumptionTicketMinVersion) };
- ResumptionTicketMinVersion as u64
- });
- __bindgen_bitfield_unit.set(47usize, 1u8, {
- let ResumptionTicketMaxVersion: u64 =
- unsafe { ::std::mem::transmute(ResumptionTicketMaxVersion) };
- ResumptionTicketMaxVersion as u64
- });
- __bindgen_bitfield_unit.set(48usize, 16u8, {
+ __bindgen_bitfield_unit.set(46usize, 18u8, {
let RESERVED: u64 = unsafe { ::std::mem::transmute(RESERVED) };
RESERVED as u64
});
@@ -4336,10 +4256,6 @@ const _: () = {
[::std::mem::offset_of!(QUIC_SETTINGS, StreamRecvWindowBidiRemoteDefault) - 132usize];
["Offset of field: QUIC_SETTINGS::StreamRecvWindowUnidiDefault"]
[::std::mem::offset_of!(QUIC_SETTINGS, StreamRecvWindowUnidiDefault) - 136usize];
- ["Offset of field: QUIC_SETTINGS::ResumptionTicketMinVersion"]
- [::std::mem::offset_of!(QUIC_SETTINGS, ResumptionTicketMinVersion) - 140usize];
- ["Offset of field: QUIC_SETTINGS::ResumptionTicketMaxVersion"]
- [::std::mem::offset_of!(QUIC_SETTINGS, ResumptionTicketMaxVersion) - 141usize];
};
impl QUIC_SETTINGS {
#[inline] |
Cargo - windows-latestThe rust bindings need to be updated. Please apply ( diff --git a/src/rs/ffi/win_bindings.rs b/src/rs/ffi/win_bindings.rs
index 503f07b..c2af262 100644
--- a/src/rs/ffi/win_bindings.rs
+++ b/src/rs/ffi/win_bindings.rs
@@ -1920,8 +1920,6 @@ pub struct QUIC_SETTINGS {
pub StreamRecvWindowBidiLocalDefault: u32,
pub StreamRecvWindowBidiRemoteDefault: u32,
pub StreamRecvWindowUnidiDefault: u32,
- pub ResumptionTicketMinVersion: u8,
- pub ResumptionTicketMaxVersion: u8,
}
#[repr(C)]
#[derive(Copy, Clone)]
@@ -1933,7 +1931,7 @@ pub union QUIC_SETTINGS__bindgen_ty_1 {
#[repr(align(8))]
#[derive(Debug, Copy, Clone)]
pub struct QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
- pub _bitfield_align_1: [u16; 0],
+ pub _bitfield_align_1: [u32; 0],
pub _bitfield_1: __BindgenBitfieldUnit<[u8; 8usize]>,
}
#[allow(clippy::unnecessary_operation, clippy::identity_op)]
@@ -3463,80 +3461,14 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
}
}
#[inline]
- pub fn ResumptionTicketMinVersion(&self) -> u64 {
- unsafe { ::std::mem::transmute(self._bitfield_1.get(46usize, 1u8) as u64) }
- }
- #[inline]
- pub fn set_ResumptionTicketMinVersion(&mut self, val: u64) {
- unsafe {
- let val: u64 = ::std::mem::transmute(val);
- self._bitfield_1.set(46usize, 1u8, val as u64)
- }
- }
- #[inline]
- pub unsafe fn ResumptionTicketMinVersion_raw(this: *const Self) -> u64 {
- unsafe {
- ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
- ::std::ptr::addr_of!((*this)._bitfield_1),
- 46usize,
- 1u8,
- ) as u64)
- }
- }
- #[inline]
- pub unsafe fn set_ResumptionTicketMinVersion_raw(this: *mut Self, val: u64) {
- unsafe {
- let val: u64 = ::std::mem::transmute(val);
- <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
- ::std::ptr::addr_of_mut!((*this)._bitfield_1),
- 46usize,
- 1u8,
- val as u64,
- )
- }
- }
- #[inline]
- pub fn ResumptionTicketMaxVersion(&self) -> u64 {
- unsafe { ::std::mem::transmute(self._bitfield_1.get(47usize, 1u8) as u64) }
- }
- #[inline]
- pub fn set_ResumptionTicketMaxVersion(&mut self, val: u64) {
- unsafe {
- let val: u64 = ::std::mem::transmute(val);
- self._bitfield_1.set(47usize, 1u8, val as u64)
- }
- }
- #[inline]
- pub unsafe fn ResumptionTicketMaxVersion_raw(this: *const Self) -> u64 {
- unsafe {
- ::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
- ::std::ptr::addr_of!((*this)._bitfield_1),
- 47usize,
- 1u8,
- ) as u64)
- }
- }
- #[inline]
- pub unsafe fn set_ResumptionTicketMaxVersion_raw(this: *mut Self, val: u64) {
- unsafe {
- let val: u64 = ::std::mem::transmute(val);
- <__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
- ::std::ptr::addr_of_mut!((*this)._bitfield_1),
- 47usize,
- 1u8,
- val as u64,
- )
- }
- }
- #[inline]
pub fn RESERVED(&self) -> u64 {
- unsafe { ::std::mem::transmute(self._bitfield_1.get(48usize, 16u8) as u64) }
+ unsafe { ::std::mem::transmute(self._bitfield_1.get(46usize, 18u8) as u64) }
}
#[inline]
pub fn set_RESERVED(&mut self, val: u64) {
unsafe {
let val: u64 = ::std::mem::transmute(val);
- self._bitfield_1.set(48usize, 16u8, val as u64)
+ self._bitfield_1.set(46usize, 18u8, val as u64)
}
}
#[inline]
@@ -3544,8 +3476,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
unsafe {
::std::mem::transmute(<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_get(
::std::ptr::addr_of!((*this)._bitfield_1),
- 48usize,
- 16u8,
+ 46usize,
+ 18u8,
) as u64)
}
}
@@ -3555,8 +3487,8 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
let val: u64 = ::std::mem::transmute(val);
<__BindgenBitfieldUnit<[u8; 8usize]>>::raw_set(
::std::ptr::addr_of_mut!((*this)._bitfield_1),
- 48usize,
- 16u8,
+ 46usize,
+ 18u8,
val as u64,
)
}
@@ -3609,8 +3541,6 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
XdpEnabled: u64,
QTIPEnabled: u64,
RioEnabled: u64,
- ResumptionTicketMinVersion: u64,
- ResumptionTicketMaxVersion: u64,
RESERVED: u64,
) -> __BindgenBitfieldUnit<[u8; 8usize]> {
let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 8usize]> = Default::default();
@@ -3820,17 +3750,7 @@ impl QUIC_SETTINGS__bindgen_ty_1__bindgen_ty_1 {
let RioEnabled: u64 = unsafe { ::std::mem::transmute(RioEnabled) };
RioEnabled as u64
});
- __bindgen_bitfield_unit.set(46usize, 1u8, {
- let ResumptionTicketMinVersion: u64 =
- unsafe { ::std::mem::transmute(ResumptionTicketMinVersion) };
- ResumptionTicketMinVersion as u64
- });
- __bindgen_bitfield_unit.set(47usize, 1u8, {
- let ResumptionTicketMaxVersion: u64 =
- unsafe { ::std::mem::transmute(ResumptionTicketMaxVersion) };
- ResumptionTicketMaxVersion as u64
- });
- __bindgen_bitfield_unit.set(48usize, 16u8, {
+ __bindgen_bitfield_unit.set(46usize, 18u8, {
let RESERVED: u64 = unsafe { ::std::mem::transmute(RESERVED) };
RESERVED as u64
});
@@ -4330,10 +4250,6 @@ const _: () = {
[::std::mem::offset_of!(QUIC_SETTINGS, StreamRecvWindowBidiRemoteDefault) - 132usize];
["Offset of field: QUIC_SETTINGS::StreamRecvWindowUnidiDefault"]
[::std::mem::offset_of!(QUIC_SETTINGS, StreamRecvWindowUnidiDefault) - 136usize];
- ["Offset of field: QUIC_SETTINGS::ResumptionTicketMinVersion"]
- [::std::mem::offset_of!(QUIC_SETTINGS, ResumptionTicketMinVersion) - 140usize];
- ["Offset of field: QUIC_SETTINGS::ResumptionTicketMaxVersion"]
- [::std::mem::offset_of!(QUIC_SETTINGS, ResumptionTicketMaxVersion) - 141usize];
};
impl QUIC_SETTINGS {
#[inline] |
nibanks
reviewed
May 28, 2025
Co-authored-by: Nick Banks <[email protected]>
- Remove settings product and test code around resumption ticket versioning - Update CLOG files after settings update - Included a fixed size buffer for V2 ticket extension - Update resumption ticket tests around encoding v2 and decoding v1, v2 tickets - Address code review comments
…squic into sm/ticket_versioning
sm-msft
commented
May 29, 2025
| @@ -11353,6 +11353,30 @@ | |||
| ], | |||
| "macroName": "QuicTraceLogVerbose" | |||
| }, | |||
| "SettingResumptionTicketMaxVersion": { | |||
There was a problem hiding this comment.
Not sure why this didnt get updated....
nibanks
reviewed
May 29, 2025
Comment on lines
-1822
to
+1823
| if (!CXPLAT_STRUCT_HAS_FIELD(QUIC_SETTINGS, SettingsSize, MtuDiscoveryMissingProbeCount)) { | ||
| if (!CXPLAT_STRUCT_HAS_FIELD(QUIC_SETTINGS, SettingsSize, StreamRecvWindowUnidiDefault)) { |
There was a problem hiding this comment.
The existing code seems to be measuring the size of the struct incorrectly. I have updated this to point to the last member of QUIC_SETTINGS (
Line 839 in 2e4a9f0
nibanks
reviewed
May 29, 2025
Comment on lines
-2003
to
+2004
| uint32_t MinimumSettingsSize = (uint32_t)CXPLAT_STRUCT_SIZE_THRU_FIELD(QUIC_SETTINGS, MtuDiscoveryMissingProbeCount); | ||
| uint32_t MinimumSettingsSize = (uint32_t)CXPLAT_STRUCT_SIZE_THRU_FIELD(QUIC_SETTINGS, StreamRecvWindowUnidiDefault); |
There was a problem hiding this comment.
Downlevel tests are failing... got to revert this.
There was a problem hiding this comment.
Would it be correct to say that MtuDiscoveryMissingProbeCount is part of the earliest released QUIC_SETTINGS struct and our API contract requires us to accept these smaller sized structs?
Is there reference documentation around this?
nibanks
reviewed
May 29, 2025
nibanks
reviewed
May 29, 2025
nibanks
reviewed
May 29, 2025
nibanks
reviewed
May 29, 2025
nibanks
reviewed
May 29, 2025
nibanks
reviewed
May 29, 2025
Comment on lines
-345
to
+614
| uint32_t MinimumSettingsSize = (uint32_t)SETTINGS_SIZE_THRU_FIELD(QUIC_SETTINGS, MtuDiscoveryMissingProbeCount); | ||
| uint32_t MinimumSettingsSize = (uint32_t)SETTINGS_SIZE_THRU_FIELD(QUIC_SETTINGS, StreamRecvWindowUnidiDefault); |
There was a problem hiding this comment.
Line 839 in 2e4a9f0
Should the minimum size not be the last member in the QUIC_SETTINGS struct?
nibanks
reviewed
May 29, 2025
Comment on lines
-397
to
+666
| uint32_t MinimumSettingsSize = (uint32_t)SETTINGS_SIZE_THRU_FIELD(QUIC_SETTINGS, MtuDiscoveryMissingProbeCount); | ||
| uint32_t MinimumSettingsSize = (uint32_t)SETTINGS_SIZE_THRU_FIELD(QUIC_SETTINGS, StreamRecvWindowUnidiDefault); |
nibanks
reviewed
May 29, 2025
- Fix up few settings tests to hit relevant code paths and other minor changes - Remove unneeded settings load in ticket tests
|
Moved the resumption ticket related code into a separate PR: #5131 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update: Given the various unrelated changes that have accumulated in this PR, I will split this into two PRs and abandon this one.
The crux of the changes are in this PR: #5131
Will post a link to the second PR when it is ready.
Addresses the issue #5115
Description
This change adds the ability to version the connection resumption ticket on the server and the ability to filter out desirable versions of the tickets on the client.
Testing
Unit tests have been updated and expanded to test this change.
Documentation
TBD