Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Client Migration (Client Side) #4218

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open

Support Client Migration (Client Side) #4218

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3ca34bb
Add active migration support.
masa-koz Mar 28, 2024
cb3545e
fix nits
masa-koz Mar 30, 2024
ac71d73
move the codes into the separate functions.
masa-koz Mar 30, 2024
5ca2a72
Merge branch 'microsoft:main' into add_active_migration
masa-koz Mar 31, 2024
a339913
Change the ConnID and reset Congestion Control.
masa-koz Apr 6, 2024
2bed382
Merge branch 'main' into add_active_migration
masa-koz Dec 18, 2024
257f270
Merge branch 'add_active_migration' of https://github.com/masa-koz/ms…
masa-koz Dec 18, 2024
c6f7e3d
Defer sending a path challange if there is no unused ConnID
masa-koz Dec 18, 2024
ac1f616
Release bindings and assert non-null for retired paths in connection …
masa-koz Dec 18, 2024
2b3c6fd
Accept adding local address before connection start
masa-koz Dec 18, 2024
9e287a7
Add support for multiple local addresses in connection tests
masa-koz Dec 18, 2024
5da50d7
Replace all the existing source connection IDs if we find the collisi…
masa-koz Dec 18, 2024
d1d69a3
run ./scripts/update-sidecar.ps1
masa-koz Dec 21, 2024
12c1579
Fix missing newline at end of file in quic_gtest.h
masa-koz Dec 21, 2024
f2c9629
Define local address management parameters only when preview features…
masa-koz Dec 21, 2024
b85b832
Improve local address handling in path tests with retry logic for add…
masa-koz Dec 21, 2024
e5e4c7b
Merge branch 'main' into add_active_migration
masa-koz Jan 2, 2025
e0691f3
Refactoring
masa-koz Jan 9, 2025
1cd0b78
Enhance UdpPortChangeOnly condition for server connections in QuicPat…
masa-koz Jan 9, 2025
64a35a7
Refactor migration test to use QUIC_MIGRATION_TYPE and improve path m…
masa-koz Jan 10, 2025
aaf479d
Merge branch 'main' into add_active_migration
masa-koz Jan 10, 2025
01f7e15
Validate buffer and address in local address add/remove functions
masa-koz Jan 10, 2025
6d53d03
Refactor QUIC CID source functions to remove unnecessary connection p…
masa-koz Jan 10, 2025
dda0b00
Add partition index to UDP configuration for new path binding
masa-koz Jan 13, 2025
5730945
Update PathProbeHelper instantiation to use std::nothrow and fix QUIC…
masa-koz Jan 18, 2025
8f11fe7
Merge branch 'add_active_migration' of https://github.com/masa-koz/ms…
masa-koz Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 13 additions & 22 deletions src/core/binding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,10 +560,11 @@ _IRQL_requires_max_(DISPATCH_LEVEL)
BOOLEAN
QuicBindingAddSourceConnectionID(
_In_ QUIC_BINDING* Binding,
_In_ QUIC_CONNECTION* Connection,
_In_ QUIC_CID_SLIST_ENTRY* SourceCid
)
{
return QuicLookupAddLocalCid(&Binding->Lookup, SourceCid, NULL);
return QuicLookupAddLocalCid(&Binding->Lookup, Connection, SourceCid, NULL);
}

_IRQL_requires_max_(DISPATCH_LEVEL)
Expand All @@ -582,7 +583,7 @@ QuicBindingAddAllSourceConnectionIDs(
Link,
QUIC_CID_SLIST_ENTRY,
Link);
if (!QuicBindingAddSourceConnectionID(Binding, Entry)) {
if (!QuicBindingAddSourceConnectionID(Binding, Connection, Entry)) {
return FALSE;
}
}
Expand All @@ -607,8 +608,6 @@ QuicBindingRemoveAllSourceConnectionIDs(
_In_ QUIC_CONNECTION* Connection
)
{
CXPLAT_SLIST_ENTRY EntriesToFree = {0};

for (CXPLAT_SLIST_ENTRY* Link = Connection->SourceCids.Next;
Link != NULL;
Link = Link->Next) {
Expand All @@ -619,31 +618,23 @@ QuicBindingRemoveAllSourceConnectionIDs(
QUIC_CID_SLIST_ENTRY,
Link);

CXPLAT_SLIST_ENTRY** Link1 = &Entry->HashEntries.Next;
while (*Link1 != NULL) {
QUIC_CID_HASH_ENTRY* Entry1 =
CXPLAT_SLIST_ENTRY** HashLink = &Entry->HashEntries.Next;
while (*HashLink != NULL) {
QUIC_CID_HASH_ENTRY* HashEntry =
CXPLAT_CONTAINING_RECORD(
*Link1,
*HashLink,
QUIC_CID_HASH_ENTRY,
Link);
if (Entry1->Binding == Binding) {
QuicBindingRemoveSourceConnectionID(Binding, Entry1);
*Link1 = (*Link1)->Next;
CxPlatListPushEntry(&EntriesToFree, &Entry1->Link);
if (HashEntry->Binding == Binding) {
QuicBindingRemoveSourceConnectionID(Binding, HashEntry);
*HashLink = (*HashLink)->Next;
CXPLAT_FREE(HashEntry, QUIC_POOL_CIDHASH);
HashEntry = NULL;
} else {
Link1 = &(*Link1)->Next;
HashLink = &(*HashLink)->Next;
}
}
}

while (EntriesToFree.Next != NULL) {
QUIC_CID_HASH_ENTRY* Entry =
CXPLAT_CONTAINING_RECORD(
CxPlatListPopEntry(&EntriesToFree),
QUIC_CID_HASH_ENTRY,
Link);
CXPLAT_FREE(Entry, QUIC_POOL_CIDHASH);
}
}

_IRQL_requires_max_(DISPATCH_LEVEL)
Expand Down
1 change: 1 addition & 0 deletions src/core/binding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ _IRQL_requires_max_(DISPATCH_LEVEL)
BOOLEAN
QuicBindingAddSourceConnectionID(
_In_ QUIC_BINDING* Binding,
_In_ QUIC_CONNECTION* Connection,
_In_ QUIC_CID_SLIST_ENTRY* SourceCid
);

Expand Down
5 changes: 1 addition & 4 deletions src/core/cid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ typedef struct QUIC_CID_LIST_ENTRY {
typedef struct QUIC_CID_SLIST_ENTRY {

CXPLAT_SLIST_ENTRY Link;
QUIC_CONNECTION* Connection;
CXPLAT_SLIST_ENTRY HashEntries;
QUIC_CID CID;

Expand All @@ -178,7 +177,7 @@ typedef struct QUIC_CID_HASH_ENTRY {
CXPLAT_SLIST_ENTRY Link;
QUIC_CONNECTION* Connection;
QUIC_BINDING* Binding;
QUIC_CID_SLIST_ENTRY* CID;
QUIC_CID_SLIST_ENTRY* Parent;

} QUIC_CID_HASH_ENTRY;

Expand All @@ -199,7 +198,6 @@ QuicCidNewNullSource(
QUIC_POOL_CIDSLIST);

if (Entry != NULL) {
Entry->Connection = Connection;
Entry->HashEntries.Next = NULL;
CxPlatZeroMemory(&Entry->CID, sizeof(Entry->CID));
}
Expand Down Expand Up @@ -228,7 +226,6 @@ QuicCidNewSource(
QUIC_POOL_CIDSLIST);

if (Entry != NULL) {
Entry->Connection = Connection;
Entry->HashEntries.Next = NULL;
CxPlatZeroMemory(&Entry->CID, sizeof(Entry->CID));
Entry->CID.Length = Length;
Expand Down
33 changes: 19 additions & 14 deletions src/core/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ QuicConnGenerateNewSourceCid(
BOOLEAN Collision = FALSE;
int8_t Revert = -1;
for (uint8_t i = 0; i < BindingsCount; ++i) {
if (!QuicBindingAddSourceConnectionID(Bindings[i], SourceCid)) {
if (!QuicBindingAddSourceConnectionID(Bindings[i], Connection, SourceCid)) {
Collision = TRUE;
if (i > 0) {
Revert = i - 1;
Expand Down Expand Up @@ -2004,7 +2004,7 @@ QuicConnStart(
CASTED_CLOG_BYTEARRAY(SourceCid->CID.Length, SourceCid->CID.Data));
CxPlatListPushEntry(&Connection->SourceCids, &SourceCid->Link);

if (!QuicBindingAddSourceConnectionID(Path->Binding, SourceCid)) {
if (!QuicBindingAddSourceConnectionID(Path->Binding, Connection, SourceCid)) {
QuicLibraryReleaseBinding(Path->Binding);
Path->Binding = NULL;
Status = QUIC_STATUS_OUT_OF_MEMORY;
Expand Down Expand Up @@ -6351,7 +6351,7 @@ QuicConnOpenNewPath(
CASTED_CLOG_BYTEARRAY(SourceCid->CID.Length, SourceCid->CID.Data));
CxPlatListPushEntry(&Connection->SourceCids, &SourceCid->Link);

if (!QuicBindingAddSourceConnectionID(NewBinding, SourceCid)) {
if (!QuicBindingAddSourceConnectionID(NewBinding, Connection, SourceCid)) {
return QUIC_STATUS_OUT_OF_MEMORY;
}
} else {
Expand All @@ -6366,7 +6366,6 @@ QuicConnOpenNewPath(
Connection,
CASTED_CLOG_BYTEARRAY(sizeof(Path->Route.LocalAddress), &Path->Route.LocalAddress));


QUIC_CID_LIST_ENTRY* NewDestCid = QuicConnGetUnusedDestCid(Connection);
//
// If we can't get a unused CID, we defer sending a path challange until we receieve a new CID.
Expand Down Expand Up @@ -6432,10 +6431,6 @@ QuicConnAddLocalAddress(
return QUIC_STATUS_INVALID_STATE;
}

if (!QuicAddrIsValid(LocalAddress)) {
return QUIC_STATUS_INVALID_PARAMETER;
}

BOOLEAN AddrInUse = FALSE;
if (Connection->State.LocalAddressSet) {
for (uint8_t i = 0; i < Connection->PathsCount; ++i) {
Expand Down Expand Up @@ -6516,10 +6511,6 @@ QuicConnRemoveLocalAddress(
return QUIC_STATUS_INVALID_STATE;
}

if (!QuicAddrIsValid(LocalAddress)) {
return QUIC_STATUS_INVALID_PARAMETER;
}

if (!Connection->State.LocalAddressSet) {
return QUIC_STATUS_NOT_FOUND;
}
Expand Down Expand Up @@ -7062,7 +7053,14 @@ QuicConnParamSet(
break;
}

Status = QuicConnAddLocalAddress(Connection, (QUIC_ADDR*)Buffer);
QUIC_ADDR* LocalAddress = (QUIC_ADDR*)Buffer;

if (!QuicAddrIsValid(LocalAddress)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally, I'd have combined this with the other invalid parameter check (on the same line) as the one above. Looks a bit cleaner IMO.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now, all the checks are done on the same line.

Status = QUIC_STATUS_INVALID_PARAMETER;
break;
}

Status = QuicConnAddLocalAddress(Connection, LocalAddress);
break;
}

Expand All @@ -7073,7 +7071,14 @@ QuicConnParamSet(
break;
}

Status = QuicConnRemoveLocalAddress(Connection, (QUIC_ADDR*)Buffer);
QUIC_ADDR* LocalAddress = (QUIC_ADDR*)Buffer;

if (!QuicAddrIsValid(LocalAddress)) {
Status = QUIC_STATUS_INVALID_PARAMETER;
break;
}

Status = QuicConnRemoveLocalAddress(Connection, LocalAddress);
break;
}

Expand Down
1 change: 0 additions & 1 deletion src/core/library.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,6 @@ QuicCidNewRandomSource(
QUIC_POOL_CIDSLIST);

if (Entry != NULL) {
Entry->Connection = Connection;
Entry->HashEntries.Next = NULL;
CxPlatZeroMemory(&Entry->CID, sizeof(Entry->CID));
Entry->CID.Length = MsQuicLib.CidTotalLength;
Expand Down
Loading