Merge pull request #1415 from Unity-Technologies/ipv6-unity-fix

Allowing sockets to be created with icmpv6 (case 1309061)

Author: bholmes

mcs/class/System/System.Net.Sockets/Socket.cs

@@ -147,7 +147,9 @@ void SocketDefaults ()
 					this.DontFragment = false;
 					if (protocolType == ProtocolType.Tcp)
 						this.NoDelay = false;
-				} else if (addressFamily == AddressFamily.InterNetworkV6) {
+				// The socket was created successfully; enable IPV6_V6ONLY by default for normal AF_INET6 sockets.
+				// This fails on raw sockets so we just let them be in default state.
+				} else if (addressFamily == AddressFamily.InterNetworkV6 && socketType != SocketType.Raw) {
 					this.DualMode = true;
 				}
 

mono/metadata/w32socket.c

@@ -378,6 +378,7 @@ convert_proto (MonoProtocolType mono_proto)
 	case ProtocolType_Pup:
 	case ProtocolType_Udp:
 	case ProtocolType_Idp:
+	case ProtocolType_IcmpV6:
 		/* These protocols are known (on my system at least) */
 		return mono_proto;
 	case ProtocolType_ND:

mono/metadata/w32socket.h

@@ -78,11 +78,19 @@ typedef enum {
 	ProtocolType_Icmp=1,
 	ProtocolType_Igmp=2,
 	ProtocolType_Ggp=3,
+	ProtocolType_IPv4=4,
 	ProtocolType_Tcp=6,
 	ProtocolType_Pup=12,
 	ProtocolType_Udp=17,
 	ProtocolType_Idp=22,
 	ProtocolType_IPv6=41,
+	ProtocolType_IPv6RoutingHeader=43,
+	ProtocolType_IPv6FragmentHeader=44,
+	ProtocolType_IPSecEncapsulatingSecurityPayload=50,
+	ProtocolType_IPSecAuthenticationHeader=51,
+	ProtocolType_IcmpV6=58,
+	ProtocolType_IPv6NoNextHeader=59,
+	ProtocolType_IPv6DestinationOptions=60,
 	ProtocolType_ND=77,
 	ProtocolType_Raw=255,
 	ProtocolType_Unspecified=0,