From 3310e94b013fe7075f8461c7bd16e09414b2412a Mon Sep 17 00:00:00 2001 From: Dick Porter Date: Wed, 24 Jan 2007 16:15:58 +0000 Subject: 2007-01-24 Dick Porter * IOControlCode.cs: * SocketInformationOptions.cs: * TransmitFileOptions.cs: Fix enum values * AddressFamily.cs: Not Serializable in the 2.0 profile svn path=/trunk/mcs/; revision=71605 --- .../System/System.Net.Sockets/AddressFamily.cs | 2 + mcs/class/System/System.Net.Sockets/ChangeLog | 8 +++ .../System/System.Net.Sockets/IOControlCode.cs | 68 +++++++++++----------- .../System.Net.Sockets/SocketInformationOptions.cs | 8 +-- .../System.Net.Sockets/TransmitFileOptions.cs | 10 ++-- 5 files changed, 53 insertions(+), 43 deletions(-) diff --git a/mcs/class/System/System.Net.Sockets/AddressFamily.cs b/mcs/class/System/System.Net.Sockets/AddressFamily.cs index 03ecbf96abd..40d4332dae9 100644 --- a/mcs/class/System/System.Net.Sockets/AddressFamily.cs +++ b/mcs/class/System/System.Net.Sockets/AddressFamily.cs @@ -34,7 +34,9 @@ namespace System.Net.Sockets { +#if ONLY_1_1 [Serializable] +#endif public enum AddressFamily { Unknown = -1, Unspecified = 0, diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog index 1f60e58e4fe..1fbabb5610e 100644 --- a/mcs/class/System/System.Net.Sockets/ChangeLog +++ b/mcs/class/System/System.Net.Sockets/ChangeLog @@ -1,3 +1,11 @@ +2007-01-24 Dick Porter + + * IOControlCode.cs: + * SocketInformationOptions.cs: + * TransmitFileOptions.cs: Fix enum values + + * AddressFamily.cs: Not Serializable in the 2.0 profile + 2007-01-24 Dick Porter * NetworkStream.cs: 2.0 profile updates, based on a patch by diff --git a/mcs/class/System/System.Net.Sockets/IOControlCode.cs b/mcs/class/System/System.Net.Sockets/IOControlCode.cs index 8c5c7564104..6cd825be67b 100644 --- a/mcs/class/System/System.Net.Sockets/IOControlCode.cs +++ b/mcs/class/System/System.Net.Sockets/IOControlCode.cs @@ -33,40 +33,40 @@ namespace System.Net.Sockets { public enum IOControlCode: long { - AbsorbRouterAlert, - AddMulticastGroupOnInterface, - AddressListChange, - AddressListQuery, - AddressListSort, - AssociateHandle, - AsyncIO, - BindToInterface, - DataToRead, - DeleteMulticastGroupFromInterface, - EnableCircularQueuing, - Flush, - GetBroadcastAddress, - GetExtensionFunctionPointer, - GetGroupQos, - GetQos, - KeepAliveValues, - LimitBroadcasts, - MulticastInterface, - MulticastScope, - MultipointLoopback, - NamespaceChange, - NonBlockingIO, - OobDataRead, - QueryTargetPnpHandle, - ReceiveAll, - ReceiveAllIgmpMulticast, - ReceiveAllMulticast, - RoutingInterfaceChange, - RoutingInterfaceQuery, - SetGroupQos, - SetQos, - TranslateHandle, - UnicastInterface, + AbsorbRouterAlert = 0x98000005, + AddMulticastGroupOnInterface = 0x9800000A, + AddressListChange = 0x28000017, + AddressListQuery = 0x48000016, + AddressListSort = 0xC8000019, + AssociateHandle = 0x88000001, + AsyncIO = 0x8004667D, + BindToInterface = 0x98000008, + DataToRead = 0x4004667F, + DeleteMulticastGroupFromInterface = 0x9800000B, + EnableCircularQueuing = 0x28000002, + Flush = 0x28000004, + GetBroadcastAddress = 0x48000005, + GetExtensionFunctionPointer = 0xC8000006, + GetGroupQos = 0xC8000008, + GetQos = 0xC8000007, + KeepAliveValues = 0x98000004, + LimitBroadcasts = 0x98000007, + MulticastInterface = 0x98000009, + MulticastScope = 0x8800000A, + MultipointLoopback = 0x88000009, + NamespaceChange = 0x88000019, + NonBlockingIO = 0x8004667E, + OobDataRead = 0x40047307, + QueryTargetPnpHandle = 0x48000018, + ReceiveAll = 0x98000001, + ReceiveAllIgmpMulticast = 0x98000003, + ReceiveAllMulticast = 0x98000002, + RoutingInterfaceChange = 0x88000015, + RoutingInterfaceQuery = 0xC8000014, + SetGroupQos = 0x8800000C, + SetQos = 0x8800000B, + TranslateHandle = 0xC800000D, + UnicastInterface = 0x98000006, } } #endif diff --git a/mcs/class/System/System.Net.Sockets/SocketInformationOptions.cs b/mcs/class/System/System.Net.Sockets/SocketInformationOptions.cs index 947f584575c..c78ad2a4fff 100644 --- a/mcs/class/System/System.Net.Sockets/SocketInformationOptions.cs +++ b/mcs/class/System/System.Net.Sockets/SocketInformationOptions.cs @@ -36,10 +36,10 @@ namespace System.Net.Sockets { [FlagsAttribute] public enum SocketInformationOptions { - Connected = 0x00000000, - Listening = 0x00000001, - NonBlocking = 0x00000002, - UseOnlyOverlappedIO = 0x00000004 + NonBlocking = 0x00000001, + Connected = 0x00000002, + Listening = 0x00000004, + UseOnlyOverlappedIO = 0x00000008 } } diff --git a/mcs/class/System/System.Net.Sockets/TransmitFileOptions.cs b/mcs/class/System/System.Net.Sockets/TransmitFileOptions.cs index 57145697b67..8def6c713be 100644 --- a/mcs/class/System/System.Net.Sockets/TransmitFileOptions.cs +++ b/mcs/class/System/System.Net.Sockets/TransmitFileOptions.cs @@ -36,12 +36,12 @@ namespace System.Net.Sockets { [FlagsAttribute] public enum TransmitFileOptions { - Disconnect = 0x00000000, - ReuseSocket = 0x00000001, - UseDefaultWorkerThread = 0x00000002, - UseKernelApc = 0x00000004, + UseDefaultWorkerThread = 0x00000000, + Disconnect = 0x00000001, + ReuseSocket = 0x00000002, + WriteBehind = 0x00000004, UseSystemThread = 0x00000010, - WriteBehind = 0x00008000 + UseKernelApc = 0x00000020, } } -- cgit v1.2.3