Skip to content

use QUIC_ADDRESS_FAMILY enum for assigning socket family #53673

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
wfurt merged 1 commit into from
Jun 3, 2021
Merged

use QUIC_ADDRESS_FAMILY enum for assigning socket family #53673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions ...stem.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicAddressHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
{
internal static class MsQuicAddressHelpers
{
internal const ushort IPv4 = 2;
internal const ushort IPv6 = 23;

internal static unsafe IPEndPoint INetToIPEndPoint(ref SOCKADDR_INET inetAddress)
{
if (inetAddress.si_family == IPv4)
if (inetAddress.si_family == (ushort)QUIC_ADDRESS_FAMILY.INET)
{
return new IPEndPoint(new IPAddress(MemoryMarshal.CreateReadOnlySpan<byte>(ref inetAddress.Ipv4.sin_addr[0], 4)), (ushort)IPAddress.NetworkToHostOrder((short)inetAddress.Ipv4.sin_port));
}
Expand All @@ -34,11 +31,11 @@ internal static unsafe SOCKADDR_INET IPEndPointToINet(IPEndPoint endpoint)
{
case AddressFamily.InterNetwork:
endpoint.Address.TryWriteBytes(MemoryMarshal.CreateSpan<byte>(ref socketAddress.Ipv4.sin_addr[0], 4), out _);
socketAddress.Ipv4.sin_family = IPv4;
socketAddress.Ipv4.sin_family = (ushort)QUIC_ADDRESS_FAMILY.INET;
break;
case AddressFamily.InterNetworkV6:
endpoint.Address.TryWriteBytes(MemoryMarshal.CreateSpan<byte>(ref socketAddress.Ipv6.sin6_addr[0], 16), out _);
socketAddress.Ipv6.sin6_family = IPv6;
socketAddress.Ipv6.sin6_family = (ushort)QUIC_ADDRESS_FAMILY.INET6;
break;
default:
throw new ArgumentException(SR.net_quic_addressfamily_notsupported);
Expand Down