Skip to content

[QUIC] API Update #49823

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

Merged
ManickaP merged 15 commits into from
Mar 26, 2021
Merged

[QUIC] API Update #49823

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6bf36e4
Cherry picked change from scalablecory/msquic-update.
ManickaP Mar 12, 2021
e96522e
Enum rename _FLAG --> _FLAGS to follow msquic naming.
ManickaP Mar 12, 2021
b92bd1d
Enums updated
ManickaP Mar 12, 2021
7aa745c
Updated interop, compilable project.
ManickaP Mar 13, 2021
6a132c5
Somewhat working update of msquic API
ManickaP Mar 17, 2021
1d0d98c
Merge main
ManickaP Mar 17, 2021
68a5c48
Post-merge compilation fixes.
ManickaP Mar 17, 2021
851dc1b
Fixed most of the tests, one turned into ActiveIssue
ManickaP Mar 17, 2021
78e3981
Comments.
ManickaP Mar 18, 2021
7ad5163
Regenerated ref sources.
ManickaP Mar 18, 2021
f67ed0d
Addressed some feedback.
ManickaP Mar 19, 2021
204f4fa
Added readme.
ManickaP Mar 23, 2021
72ea176
Merge branch 'main' into mapichov/44580_quic_update
ManickaP Mar 25, 2021
5d3884f
QUIC_ADDRESS_FAMILY
ManickaP Mar 25, 2021
c0f896f
Merge branch 'main' into mapichov/44580_quic_update
ManickaP Mar 26, 2021
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
Prev Previous commit
Next Next commit
Comments.
  • Loading branch information
@ManickaP
ManickaP committed Mar 18, 2021
commit 78e3981cf8f42d47f89dea2452d3ab54543a2f9d
19 changes: 9 additions & 10 deletions ...System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Interop/MsQuicNativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,17 @@ internal enum QuicSettingsEnabledFlagsFlags : byte
VersionNegotiationExtEnabled = 1 << 6,
}

// Mana: get back to this, define delegate for AsyncHandler, define types fro IntPtr Certificate (union in C, plat dependent) and
// make proper use of it.
[StructLayout(LayoutKind.Sequential)]
internal struct CredentialConfig
{
internal QUIC_CREDENTIAL_TYPE Type;
internal QUIC_CREDENTIAL_FLAGS Flags;
// CredentialConfigCertificateUnion*
internal IntPtr Certificate;
[MarshalAs(UnmanagedType.LPUTF8Str)]
internal string Principal;
internal IntPtr Reserved; // Currently unused
// Mana: define delegate for the async callback
// TODO: define delegate for AsyncHandler and make proper use of it.
internal IntPtr AsyncHandler;
}

Expand Down Expand Up @@ -361,10 +360,10 @@ internal struct ConnectionEventDataShutdownInitiatedByPeer
internal ulong ErrorCode;
}

// Mana: it's a trap, those are flags with fixed sized exactly 3 bits!!!
[StructLayout(LayoutKind.Sequential)]
internal struct ConnectionEventDataShutdownComplete
{
// The flags have fixed sized exactly 3 bits
internal ConnectionEventDataShutdownCompleteFlags Flags;
}

Expand Down Expand Up @@ -431,7 +430,7 @@ internal struct ConnectionEventDataUnion
[FieldOffset(0)]
internal ConnectionEventDataStreamsAvailable StreamsAvailable;

// Mana: missing IDEAL_PROCESSOR_CHANGED, ..., PEER_CERTIFICATE_RECEIVED (7 total)
// TODO: missing IDEAL_PROCESSOR_CHANGED, ..., PEER_CERTIFICATE_RECEIVED (7 total)
}

[StructLayout(LayoutKind.Sequential)]
Expand All @@ -447,7 +446,7 @@ internal delegate uint ConnectionCallbackDelegate(
IntPtr context,
ref ConnectionEvent connectionEvent);

// Mana: order is Open, Close, Shutdown, Start, SetConfiguration, SendResumptionTicket
// TODO: order is Open, Close, Shutdown, Start, SetConfiguration, SendResumptionTicket
Copy link
Contributor

@jkotalik jkotalik Mar 18, 2021

Choose a reason for hiding this comment

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

Can this be removed now?

Copy link
Member Author

@ManickaP ManickaP Mar 19, 2021

Choose a reason for hiding this comment

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

Nope, that's my comment. The order (in the comment) is taken from msquic.h, we do not follow that in here. I didn't want to generate more diffs in this PR. I'll plan to do follow up that does not change the behavior at all, just shuffles things around to be more like msquic.h.

[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
internal delegate uint ConnectionOpenDelegate(
SafeMsQuicRegistrationHandle registration,
Expand Down Expand Up @@ -536,7 +535,7 @@ internal struct StreamEventDataUnion
[FieldOffset(0)]
internal StreamEventDataSendShutdownComplete SendShutdownComplete;

// Mana: missing IDEAL_SEND_BUFFER_SIZE
// TODO: missing IDEAL_SEND_BUFFER_SIZE
}

[StructLayout(LayoutKind.Sequential)]
Expand All @@ -546,7 +545,7 @@ internal struct StreamEvent
internal StreamEventDataUnion Data;
}

// Mana: rename to C#-like
// TODO: rename to C#-like
[StructLayout(LayoutKind.Sequential)]
internal struct SOCKADDR_IN
{
Expand All @@ -566,7 +565,7 @@ internal byte[] Address
}
}

// Mana: rename to C#-like
// TODO: rename to C#-like
[StructLayout(LayoutKind.Sequential)]
internal struct SOCKADDR_IN6
{
Expand Down Expand Up @@ -604,7 +603,7 @@ internal byte[] Address
}
}

// Mana: rename to C#-like
// TODO: rename to C#-like
[StructLayout(LayoutKind.Explicit)]
internal struct SOCKADDR_INET
{
Expand Down