Skip to content

Commit dad9b38

Browse files
authored
Mono: Cleanup dead code from w32socket.h (#49061)
1 parent f87f155 commit dad9b38

File tree

3 files changed

+0
-157
lines changed

3 files changed

+0
-157
lines changed

src/mono/mono/metadata/icall-table.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ typedef MonoStringHandle MonoStringOutHandle;
149149
#define MONO_HANDLE_TYPE_WRAP_MonoClassField_ptr ICALL_HANDLES_WRAP_NONE
150150
#define MONO_HANDLE_TYPE_WRAP_MonoMarshalNative ICALL_HANDLES_WRAP_NONE
151151
#define MONO_HANDLE_TYPE_WRAP_MonoProperty_ptr ICALL_HANDLES_WRAP_NONE
152-
#define MONO_HANDLE_TYPE_WRAP_MonoProtocolType ICALL_HANDLES_WRAP_NONE
153152
#define MONO_HANDLE_TYPE_WRAP_size_t ICALL_HANDLES_WRAP_NONE
154153
#define MONO_HANDLE_TYPE_WRAP_MonoVTable_ptr ICALL_HANDLES_WRAP_NONE
155154
#define MONO_HANDLE_TYPE_WRAP_WSABUF_ptr ICALL_HANDLES_WRAP_NONE

src/mono/mono/metadata/w32socket-win32.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,6 @@ mono_w32socket_convert_error (gint error)
296296
return (error > 0 && error < WSABASEERR) ? error + WSABASEERR : error;
297297
}
298298

299-
MonoBoolean
300-
ves_icall_System_Net_Sockets_Socket_SupportPortReuse_icall (MonoProtocolType proto)
301-
{
302-
return TRUE;
303-
}
304-
305299
gboolean
306300
mono_w32socket_duplicate (gpointer handle, gint32 targetProcessId, gpointer *duplicate_handle)
307301
{

src/mono/mono/metadata/w32socket.h

Lines changed: 0 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -28,154 +28,4 @@ typedef struct {
2828
} WSABUF, *LPWSABUF;
2929
#endif
3030

31-
/* This is a copy of System.Net.Sockets.SocketType */
32-
typedef enum {
33-
SocketType_Stream=1,
34-
SocketType_Dgram=2,
35-
SocketType_Raw=3,
36-
SocketType_Rdm=4,
37-
SocketType_Seqpacket=5,
38-
SocketType_Unknown=-1
39-
} MonoSocketType;
40-
41-
/* This is a copy of System.Net.Sockets.AddressFamily */
42-
typedef enum {
43-
AddressFamily_Unknown=-1,
44-
AddressFamily_Unspecified=0,
45-
AddressFamily_Unix=1,
46-
AddressFamily_InterNetwork=2,
47-
AddressFamily_ImpLink=3,
48-
AddressFamily_Pup=4,
49-
AddressFamily_Chaos=5,
50-
AddressFamily_NS=6,
51-
AddressFamily_Ipx=6,
52-
AddressFamily_Iso=7,
53-
AddressFamily_Osi=7,
54-
AddressFamily_Ecma=8,
55-
AddressFamily_DataKit=9,
56-
AddressFamily_Ccitt=10,
57-
AddressFamily_Sna=11,
58-
AddressFamily_DecNet=12,
59-
AddressFamily_DataLink=13,
60-
AddressFamily_Lat=14,
61-
AddressFamily_HyperChannel=15,
62-
AddressFamily_AppleTalk=16,
63-
AddressFamily_NetBios=17,
64-
AddressFamily_VoiceView=18,
65-
AddressFamily_FireFox=19,
66-
AddressFamily_Banyan=21,
67-
AddressFamily_Atm=22,
68-
AddressFamily_InterNetworkV6=23,
69-
AddressFamily_Cluster=24,
70-
AddressFamily_Ieee12844=25,
71-
AddressFamily_Irda=26,
72-
AddressFamily_NetworkDesigners=28
73-
} MonoAddressFamily;
74-
75-
/* This is a copy of System.Net.Sockets.ProtocolType */
76-
typedef enum {
77-
ProtocolType_IP=0,
78-
ProtocolType_Icmp=1,
79-
ProtocolType_Igmp=2,
80-
ProtocolType_Ggp=3,
81-
ProtocolType_Tcp=6,
82-
ProtocolType_Pup=12,
83-
ProtocolType_Udp=17,
84-
ProtocolType_Idp=22,
85-
ProtocolType_IPv6=41,
86-
ProtocolType_ND=77,
87-
ProtocolType_Raw=255,
88-
ProtocolType_Unspecified=0,
89-
ProtocolType_Ipx=1000,
90-
ProtocolType_Spx=1256,
91-
ProtocolType_SpxII=1257,
92-
ProtocolType_Unknown=-1
93-
} MonoProtocolType;
94-
95-
/* This is a copy of System.Net.Sockets.SocketOptionLevel */
96-
typedef enum {
97-
SocketOptionLevel_Socket=65535,
98-
SocketOptionLevel_IP=0,
99-
SocketOptionLevel_IPv6=41,
100-
SocketOptionLevel_Tcp=6,
101-
SocketOptionLevel_Udp=17
102-
} MonoSocketOptionLevel;
103-
104-
/* This is a copy of System.Net.Sockets.SocketOptionName */
105-
typedef enum {
106-
SocketOptionName_Debug=1,
107-
SocketOptionName_AcceptConnection=2,
108-
SocketOptionName_ReuseAddress=4,
109-
SocketOptionName_KeepAlive=8,
110-
SocketOptionName_DontRoute=16,
111-
SocketOptionName_IPProtectionLevel = 23,
112-
SocketOptionName_IPv6Only = 27,
113-
SocketOptionName_Broadcast=32,
114-
SocketOptionName_UseLoopback=64,
115-
SocketOptionName_Linger=128,
116-
SocketOptionName_OutOfBandInline=256,
117-
SocketOptionName_DontLinger= -129,
118-
SocketOptionName_ExclusiveAddressUse= -5,
119-
SocketOptionName_SendBuffer= 4097,
120-
SocketOptionName_ReceiveBuffer=4098,
121-
SocketOptionName_SendLowWater=4099,
122-
SocketOptionName_ReceiveLowWater=4100,
123-
SocketOptionName_SendTimeout=4101,
124-
SocketOptionName_ReceiveTimeout=4102,
125-
SocketOptionName_Error=4103,
126-
SocketOptionName_Type=4104,
127-
SocketOptionName_MaxConnections=2147483647,
128-
SocketOptionName_IPOptions=1,
129-
SocketOptionName_HeaderIncluded=2,
130-
SocketOptionName_TypeOfService=3,
131-
SocketOptionName_IpTimeToLive=4,
132-
SocketOptionName_MulticastInterface=9,
133-
SocketOptionName_MulticastTimeToLive=10,
134-
SocketOptionName_MulticastLoopback=11,
135-
SocketOptionName_AddMembership=12,
136-
SocketOptionName_DropMembership=13,
137-
SocketOptionName_DontFragment=14,
138-
SocketOptionName_AddSourceMembership=15,
139-
SocketOptionName_DropSourceMembership=16,
140-
SocketOptionName_BlockSource=17,
141-
SocketOptionName_UnblockSource=18,
142-
SocketOptionName_PacketInformation=19,
143-
SocketOptionName_NoDelay=1,
144-
SocketOptionName_BsdUrgent=2,
145-
SocketOptionName_Expedited=2,
146-
SocketOptionName_NoChecksum=1,
147-
SocketOptionName_ChecksumCoverage=20,
148-
SocketOptionName_HopLimit=21,
149-
150-
/* This is Mono-specific, keep it in sync with
151-
* Mono.Posix/PeerCred.cs
152-
*/
153-
SocketOptionName_PeerCred=10001
154-
} MonoSocketOptionName;
155-
156-
/* This is a copy of System.Net.Sockets.SocketFlags */
157-
typedef enum {
158-
SocketFlags_None = 0x0000,
159-
SocketFlags_OutOfBand = 0x0001,
160-
SocketFlags_MaxIOVectorLength = 0x0010,
161-
SocketFlags_Peek = 0x0002,
162-
SocketFlags_DontRoute = 0x0004,
163-
SocketFlags_Partial = 0x8000
164-
} MonoSocketFlags;
165-
166-
typedef struct
167-
{
168-
MonoObject obj;
169-
gint pid;
170-
gint uid;
171-
gint gid;
172-
} MonoPeerCredData;
173-
174-
/* Safely access Mono.Posix.PeerCredData from native code */
175-
TYPED_HANDLE_DECL (MonoPeerCredData);
176-
177-
ICALL_EXPORT
178-
gint32
179-
ves_icall_System_Net_Sockets_SocketException_WSAGetLastError_icall (void);
180-
18131
#endif /* _MONO_METADATA_W32SOCKET_H_ */

0 commit comments

Comments
 (0)