From 06d14a02dd804c69f19042dea35d73c05b9c02b0 Mon Sep 17 00:00:00 2001 From: wfurt Date: Thu, 3 Jun 2021 14:41:45 +0200 Subject: [PATCH] use QUIC_ADDRESS_FAMILY enum for assigning socket family --- .../MsQuic/Internal/MsQuicAddressHelpers.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicAddressHelpers.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicAddressHelpers.cs index c81f217535328e..8698b79028a7ee 100644 --- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicAddressHelpers.cs +++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/Internal/MsQuicAddressHelpers.cs @@ -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(ref inetAddress.Ipv4.sin_addr[0], 4)), (ushort)IPAddress.NetworkToHostOrder((short)inetAddress.Ipv4.sin_port)); } @@ -34,11 +31,11 @@ internal static unsafe SOCKADDR_INET IPEndPointToINet(IPEndPoint endpoint) { case AddressFamily.InterNetwork: endpoint.Address.TryWriteBytes(MemoryMarshal.CreateSpan(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(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);