[System.Net] Replace use of obsolete `SupportsIPv6` property. #7584

alexischr · 2018-03-12T21:58:17Z

The obsolete property was always set to false. Fixes #6940

akoeplinger · 2018-03-12T23:17:58Z

The codepath quoted on the issue which always sets the obsolete property to false isn't used on Mono so I don't understand why this happens.

alexischr · 2018-03-13T01:20:20Z

@akoeplinger we define FEATURE_PAL:

mono/mcs/class/System/Makefile

Line 62 in 4e33896

REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,SYSTEM_NAMESPACE,MONO,PLATFORM_UNIX

marek-safar · 2018-03-13T08:41:30Z

I think the fix should be to move the code we have to location which is compiled

mono/mcs/class/referencesource/System/net/System/Net/Sockets/Socket.cs

Line 6065 in 4e33896

#if MONO

to

mono/mcs/class/referencesource/System/net/System/Net/Sockets/Socket.cs

Line 6129 in 4e33896

s_SupportsIPv4 = true;

akoeplinger · 2018-03-13T10:46:00Z

@alexischr you missed this little nugget at the top of the file 😄 :

mono/mcs/class/referencesource/System/net/System/Net/Sockets/Socket.cs

Lines 7 to 9 in 4e33896

    
           #if MONO 
        
           #undef FEATURE_PAL 
        
           #endif

alexischr · 2018-03-13T11:15:00Z

@akoeplinger Sorry, I saw that today 🤦‍♂️

That got me confused and had to verify that the change in Dns.cs fixes the behavior (it does, and the other change is not needed). I have to figure how OSSupportsIPv6 can possibly be true when SupportsIPv6 apparently wasn't.

alexischr · 2018-03-13T11:27:30Z

oh:

mono/mcs/class/referencesource/System/net/System/Net/Sockets/Socket.cs

Line 6117 in 4e33896

ipv6 = SettingsSectionInternal.Section.Ipv6Enabled;

akoeplinger · 2018-03-13T13:43:11Z

Yeah but that should just return true if the config section isn't there:

mono/mcs/class/System/ReferenceSources/SettingsSectionInternal.cs

Lines 31 to 43 in 4e33896

    
           		internal bool Ipv6Enabled { 
        
           			get { 
        
           #if CONFIGURATION_DEP && !MOBILE 
        
           				try { 
        
           					var config = (SettingsSection) System.Configuration.ConfigurationManager.GetSection ("system.net/settings"); 
        
           					if (config != null) 
        
           						return config.Ipv6.Enabled; 
        
           				} catch { 
        
           				} 
        
           #endif 
        
           				return true; 
        
           			}

... and looking at our machine.config file we're not setting it.

filipnavara · 2018-03-14T14:54:15Z

mcs/class/System/System.Net/Dns.cs

@@ -321,7 +321,7 @@ private static IPHostEntry hostent_to_IPHostEntry(string originalHostName, strin
 					IPAddress newAddress = IPAddress.Parse(h_addrlist[i]);

 #pragma warning disable 618


The pragma should no longer be necessary.

alexischr · 2018-03-15T13:17:46Z

@akoeplinger "system.net/settings" section is declared here:

mono/data/net_4_5/machine.config

Line 87 in 29c2ba9

    
           <section name="settings" type="System.Net.Configuration.SettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

And the "ipv6/enabled" defaults to false:

mono/mcs/class/System/System.Net.Configuration/Ipv6Element.cs

Line 65 in 29c2ba9

[ConfigurationProperty ("enabled", DefaultValue = "False")]

akoeplinger

Ok, so you're right that the config setting defaults to false - but in the MS referencesource code nothing uses that config setting anymore except a few old APIs and everything else switched over to OSSupportsIPv6.

Two consistency comments to fix and we're good to go :)

akoeplinger · 2018-03-16T13:54:32Z

mcs/class/referencesource/System/net/System/Net/Internal.cs

@@ -318,7 +318,7 @@ private static IPHostEntry GetLocalHost()
            //               old IPv4 gethostbyname(null). Instead we need
            //               to do a more complete lookup.
            //
-            if (Socket.SupportsIPv6)
+            if (Socket.OSSupportsIPv6)


please revert this change, we're not using this code.

akoeplinger · 2018-03-16T14:00:26Z

mcs/class/System/System.Net/Dns.cs

@@ -320,11 +320,9 @@ private static IPHostEntry hostent_to_IPHostEntry(string originalHostName, strin
 				try {
 					IPAddress newAddress = IPAddress.Parse(h_addrlist[i]);

-#pragma warning disable 618
-					if( (Socket.SupportsIPv6 && newAddress.AddressFamily == AddressFamily.InterNetworkV6) ||
+					if( (Socket.OSSupportsIPv6 && newAddress.AddressFamily == AddressFamily.InterNetworkV6) ||
 					    (Socket.SupportsIPv4 && newAddress.AddressFamily == AddressFamily.InterNetwork) )


please use Socket.OSSupportsIPv4 here so we're consistent.

The obsolete property was always set to false. Fixes mono#6940

Changes made

marek-safar · 2018-03-19T10:55:36Z

@monojenkins backport 2017-12

marek-safar · 2018-03-19T10:55:44Z

@monojenkins backport 2018-02

monojenkins · 2018-03-19T10:58:34Z

@marek-safar backporting to 2017-12 failed, the patch results in conflicts:

Applying: Replace use of obsolete `SupportsIPv6` property.
error: patch failed: mcs/class/System/Test/System.Net/DnsTest.cs:209
error: mcs/class/System/Test/System.Net/DnsTest.cs: patch does not apply
Patch failed at 0001 Replace use of obsolete `SupportsIPv6` property.

Please backport manually!

monojenkins · 2018-03-19T10:58:44Z

@marek-safar backporting to 2018-02 failed, the patch results in conflicts:

Applying: Replace use of obsolete `SupportsIPv6` property.
error: patch failed: mcs/class/System/Test/System.Net/DnsTest.cs:209
error: mcs/class/System/Test/System.Net/DnsTest.cs: patch does not apply
Patch failed at 0001 Replace use of obsolete `SupportsIPv6` property.

Please backport manually!

marek-safar · 2018-03-19T11:20:42Z

@alexischr please backport manually

[System.Net] Replace use of obsolete `SupportsIPv6` property.

[System.Net] Replace use of obsolete `SupportsIPv6` property. Commit migrated from mono/mono@2f21177

alexischr requested review from akoeplinger and marek-safar as code owners March 12, 2018 21:58

alexischr force-pushed the fix-gh-6940 branch from d8443f8 to d3c553d Compare March 12, 2018 22:13

filipnavara reviewed Mar 14, 2018

View reviewed changes

alexischr force-pushed the fix-gh-6940 branch from d3c553d to 2ad02f4 Compare March 15, 2018 13:09

alexischr force-pushed the fix-gh-6940 branch 3 times, most recently from b13fd68 to ceedc06 Compare March 15, 2018 16:30

akoeplinger previously requested changes Mar 16, 2018

View reviewed changes

[System.Net] Replace use of obsolete SupportsIPv6 property.

ec4c990

The obsolete property was always set to false. Fixes mono#6940

alexischr force-pushed the fix-gh-6940 branch from ceedc06 to ec4c990 Compare March 16, 2018 16:25

alexischr merged commit 2f21177 into mono:master Mar 16, 2018

This was referenced Mar 19, 2018

[System.Net] Replace use of obsolete SupportsIPv6 property. #7686

Merged

[System.Net] Replace use of obsolete SupportsIPv6 property. #7687

Merged

alexischr referenced this pull request Mar 20, 2018

Merge pull request #7686 from mono/backport-gh-7584

e74d4a6

[System.Net] Replace use of obsolete `SupportsIPv6` property.

alexischr referenced this pull request Mar 20, 2018

Merge pull request #7687 from mono/backport-gh-7584-2017-12

225ba3e

[System.Net] Replace use of obsolete `SupportsIPv6` property.

picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022

Merge pull request mono/mono#7584 from alexischr/fix-gh-6940

48712ab

[System.Net] Replace use of obsolete `SupportsIPv6` property. Commit migrated from mono/mono@2f21177

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[System.Net] Replace use of obsolete `SupportsIPv6` property. #7584

[System.Net] Replace use of obsolete `SupportsIPv6` property. #7584

alexischr commented Mar 12, 2018 •

edited

akoeplinger commented Mar 12, 2018

alexischr commented Mar 13, 2018 •

edited

marek-safar commented Mar 13, 2018

akoeplinger commented Mar 13, 2018

alexischr commented Mar 13, 2018

alexischr commented Mar 13, 2018

akoeplinger commented Mar 13, 2018

filipnavara Mar 14, 2018

alexischr commented Mar 15, 2018

akoeplinger left a comment

akoeplinger Mar 16, 2018

akoeplinger Mar 16, 2018

marek-safar commented Mar 19, 2018

marek-safar commented Mar 19, 2018

monojenkins commented Mar 19, 2018

monojenkins commented Mar 19, 2018

marek-safar commented Mar 19, 2018

		@@ -321,7 +321,7 @@ private static IPHostEntry hostent_to_IPHostEntry(string originalHostName, strin
		IPAddress newAddress = IPAddress.Parse(h_addrlist[i]);

		#pragma warning disable 618

[System.Net] Replace use of obsolete SupportsIPv6 property. #7584

[System.Net] Replace use of obsolete SupportsIPv6 property. #7584

Conversation

alexischr commented Mar 12, 2018 • edited

akoeplinger commented Mar 12, 2018

alexischr commented Mar 13, 2018 • edited

marek-safar commented Mar 13, 2018

akoeplinger commented Mar 13, 2018

alexischr commented Mar 13, 2018

alexischr commented Mar 13, 2018

akoeplinger commented Mar 13, 2018

filipnavara Mar 14, 2018

Choose a reason for hiding this comment

alexischr commented Mar 15, 2018

akoeplinger left a comment

Choose a reason for hiding this comment

akoeplinger Mar 16, 2018

Choose a reason for hiding this comment

akoeplinger Mar 16, 2018

Choose a reason for hiding this comment

marek-safar commented Mar 19, 2018

marek-safar commented Mar 19, 2018

monojenkins commented Mar 19, 2018

monojenkins commented Mar 19, 2018

marek-safar commented Mar 19, 2018

[System.Net] Replace use of obsolete `SupportsIPv6` property. #7584

[System.Net] Replace use of obsolete `SupportsIPv6` property. #7584

alexischr commented Mar 12, 2018 •

edited

alexischr commented Mar 13, 2018 •

edited