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.

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

Add Load Balancing Tests #1707

Merged
merged 12 commits into from
Jun 14, 2021
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
84 changes: 72 additions & 12 deletions src/core/binding.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,42 @@ QuicBindingInitialize(
}
#endif

Status =
CxPlatSocketCreateUdp(
MsQuicLib.Datapath,
LocalAddress,
RemoteAddress,
Binding,
0,
&Binding->Socket);
#if QUIC_TEST_DATAPATH_HOOKS_ENABLED
QUIC_TEST_DATAPATH_HOOKS* Hooks = MsQuicLib.TestDatapathHooks;
if (Hooks != NULL) {
QUIC_ADDR RemoteAddressCopy;
if (RemoteAddress != NULL) {
RemoteAddressCopy = *RemoteAddress;
}
QUIC_ADDR LocalAddressCopy;
if (LocalAddress != NULL) {
LocalAddressCopy = *LocalAddress;
}
Hooks->Create(
RemoteAddress != NULL ? &RemoteAddressCopy : NULL,
LocalAddress != NULL ? &LocalAddressCopy : NULL);

Status =
CxPlatSocketCreateUdp(
MsQuicLib.Datapath,
LocalAddress != NULL ? &LocalAddressCopy : NULL,
RemoteAddress != NULL ? &RemoteAddressCopy : NULL,
Binding,
0,
&Binding->Socket);
} else {
#endif
Status =
CxPlatSocketCreateUdp(
MsQuicLib.Datapath,
LocalAddress,
RemoteAddress,
Binding,
0,
&Binding->Socket);
#if QUIC_TEST_DATAPATH_HOOKS_ENABLED
}
#endif

#ifdef QUIC_COMPARTMENT_ID
if (RevertCompartmentId) {
Expand All @@ -151,8 +179,8 @@ QuicBindingInitialize(
}

QUIC_ADDR DatapathLocalAddr, DatapathRemoteAddr;
CxPlatSocketGetLocalAddress(Binding->Socket, &DatapathLocalAddr);
CxPlatSocketGetRemoteAddress(Binding->Socket, &DatapathRemoteAddr);
QuicBindingGetLocalAddress(Binding, &DatapathLocalAddr);
QuicBindingGetRemoteAddress(Binding, &DatapathRemoteAddr);
QuicTraceEvent(
BindingCreated,
"[bind][%p] Created, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
Expand Down Expand Up @@ -248,8 +276,8 @@ QuicBindingTraceRundown(
// TODO - Trace datapath binding

QUIC_ADDR DatapathLocalAddr, DatapathRemoteAddr;
CxPlatSocketGetLocalAddress(Binding->Socket, &DatapathLocalAddr);
CxPlatSocketGetRemoteAddress(Binding->Socket, &DatapathRemoteAddr);
QuicBindingGetLocalAddress(Binding, &DatapathLocalAddr);
QuicBindingGetRemoteAddress(Binding, &DatapathRemoteAddr);
QuicTraceEvent(
BindingRundown,
"[bind][%p] Rundown, Udp=%p LocalAddr=%!ADDR! RemoteAddr=%!ADDR!",
Expand All @@ -270,6 +298,38 @@ QuicBindingTraceRundown(
CxPlatDispatchRwLockReleaseShared(&Binding->RwLock);
}

_IRQL_requires_max_(DISPATCH_LEVEL)
void
QuicBindingGetLocalAddress(
_In_ QUIC_BINDING* Binding,
_Out_ QUIC_ADDR* Address
)
{
CxPlatSocketGetLocalAddress(Binding->Socket, Address);
#if QUIC_TEST_DATAPATH_HOOKS_ENABLED
QUIC_TEST_DATAPATH_HOOKS* Hooks = MsQuicLib.TestDatapathHooks;
if (Hooks != NULL) {
Hooks->GetLocalAddress(Address);
}
#endif
}

_IRQL_requires_max_(DISPATCH_LEVEL)
void
QuicBindingGetRemoteAddress(
_In_ QUIC_BINDING* Binding,
_Out_ QUIC_ADDR* Address
)
{
CxPlatSocketGetRemoteAddress(Binding->Socket, Address);
#if QUIC_TEST_DATAPATH_HOOKS_ENABLED
QUIC_TEST_DATAPATH_HOOKS* Hooks = MsQuicLib.TestDatapathHooks;
if (Hooks != NULL) {
Hooks->GetRemoteAddress(Address);
}
#endif
}

//
// Returns TRUE if there are any registered listeners on this binding.
//
Expand Down
20 changes: 20 additions & 0 deletions src/core/binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,26 @@ QuicBindingTraceRundown(
_In_ QUIC_BINDING* Binding
);

//
// Queries the local IP address of the binding.
//
_IRQL_requires_max_(DISPATCH_LEVEL)
void
QuicBindingGetLocalAddress(
_In_ QUIC_BINDING* Binding,
_Out_ QUIC_ADDR* Address
);

//
// Queries the remote IP address of the binding.
//
_IRQL_requires_max_(DISPATCH_LEVEL)
void
QuicBindingGetRemoteAddress(
_In_ QUIC_BINDING* Binding,
_Out_ QUIC_ADDR* Address
);

//
// Looks up the listener based on the ALPN list. Optionally, outputs the
// first ALPN that matches.
Expand Down
8 changes: 3 additions & 5 deletions src/core/connection.c
Original file line number Diff line number Diff line change
Expand Up @@ -1868,9 +1868,7 @@ QuicConnStart(
}

Connection->State.LocalAddressSet = TRUE;
CxPlatSocketGetLocalAddress(
Path->Binding->Socket,
&Path->LocalAddress);
QuicBindingGetLocalAddress(Path->Binding, &Path->LocalAddress);
QuicTraceEvent(
ConnLocalAddrAdded,
"[conn][%p] New Local IP: %!ADDR!",
Expand Down Expand Up @@ -5675,8 +5673,8 @@ QuicConnParamSet(
Connection,
CASTED_CLOG_BYTEARRAY(sizeof(Connection->Paths[0].LocalAddress), &Connection->Paths[0].LocalAddress));

CxPlatSocketGetLocalAddress(
Connection->Paths[0].Binding->Socket,
QuicBindingGetLocalAddress(
Connection->Paths[0].Binding,
&Connection->Paths[0].LocalAddress);

QuicTraceEvent(
Expand Down
6 changes: 3 additions & 3 deletions src/core/library.c
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,7 @@ QuicLibraryLookupBinding(
#endif

QUIC_ADDR BindingLocalAddr;
CxPlatSocketGetLocalAddress(Binding->Socket, &BindingLocalAddr);
QuicBindingGetLocalAddress(Binding, &BindingLocalAddr);

if (!QuicAddrCompare(LocalAddress, &BindingLocalAddr)) {
continue;
Expand All @@ -1402,7 +1402,7 @@ QuicLibraryLookupBinding(
}

QUIC_ADDR BindingRemoteAddr;
CxPlatSocketGetRemoteAddress(Binding->Socket, &BindingRemoteAddr);
QuicBindingGetRemoteAddress(Binding, &BindingRemoteAddr);
if (!QuicAddrCompare(RemoteAddress, &BindingRemoteAddr)) {
continue;
}
Expand Down Expand Up @@ -1507,7 +1507,7 @@ QuicLibraryGetBinding(
goto Exit;
}

CxPlatSocketGetLocalAddress((*NewBinding)->Socket, &NewLocalAddress);
QuicBindingGetLocalAddress(*NewBinding, &NewLocalAddress);

CxPlatDispatchLockAcquire(&MsQuicLib.DatapathLock);

Expand Down
4 changes: 1 addition & 3 deletions src/core/listener.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,7 @@ MsQuicListenerStart(
}

if (PortUnspecified) {
CxPlatSocketGetLocalAddress(
Listener->Binding->Socket,
&BindingLocalAddress);
QuicBindingGetLocalAddress(Listener->Binding, &BindingLocalAddress);
QuicAddrSetPort(
&Listener->LocalAddress,
QuicAddrGetPort(&BindingLocalAddress));
Expand Down
3 changes: 3 additions & 0 deletions src/inc/msquic.h
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,7 @@ typedef struct QUIC_CONNECTION_EVENT {
union {
struct {
BOOLEAN SessionResumed;
_Field_range_(>, 0)
uint8_t NegotiatedAlpnLength;
_Field_size_(NegotiatedAlpnLength)
const uint8_t* NegotiatedAlpn;
Expand Down Expand Up @@ -934,7 +935,9 @@ typedef struct QUIC_CONNECTION_EVENT {
const uint8_t* ResumptionState;
} RESUMED;
struct {
_Field_range_(>, 0)
uint32_t ResumptionTicketLength;
_Field_size_(ResumptionTicketLength)
const uint8_t* ResumptionTicket;
} RESUMPTION_TICKET_RECEIVED;
struct {
Expand Down
Loading