From: Tomas Weinfurt <tweinfurt@yahoo.com>
Date: Thu, 3 Jun 2021 16:53:57 +0000 (+0200)
Subject: use QUIC_ADDRESS_FAMILY enum for assigning socket family (#53673)
X-Git-Tag: submit/tizen/20210909.063632~1009
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01a8f497a0fb02aac891ae400fd59b5de65c0244;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

use QUIC_ADDRESS_FAMILY enum for assigning socket family (#53673)
---

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 c81f217..8698b79 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<byte>(ref inetAddress.Ipv4.sin_addr[0], 4)), (ushort)IPAddress.NetworkToHostOrder((short)inetAddress.Ipv4.sin_port));
             }
@@ -34,11 +31,11 @@ namespace System.Net.Quic.Implementations.MsQuic.Internal
                 {
                     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);