ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In WsControl, don't mix Linux and Wine socket calls. Always use Wine calls. 

Added hack for missing WINAPI in Unix socket() definition.
This commit is contained in:
James Hatheway 2001-01-17 20:19:14 +00:00 committed by Alexandre Julliard
parent c85144b0d9
commit 4bed8266e0
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/winsock/socket.c
View File

@ -1625,7 +1625,15 @@ INT WINAPI WSOCK32_ioctlsocket(SOCKET s, LONG cmd, ULONG *argp)
WARN("Warning: WS1.1 shouldn't be using async I/O\n"); WARN("Warning: WS1.1 shouldn't be using async I/O\n");
SetLastError(WSAEINVAL); SetLastError(WSAEINVAL);
return SOCKET_ERROR; return SOCKET_ERROR;
case SIOCGIFBRDADDR:
case SIOCGIFNETMASK:
case SIOCGIFADDR:
/* These don't need any special handling. They are used by
WsControl, and are here to suppress an unecessary warning. */
break;
default: default:
/* Netscape tries hard to use bogus ioctl 0x667e */ /* Netscape tries hard to use bogus ioctl 0x667e */
WARN("\tunknown WS_IOCTL cmd (%08lx)\n", cmd); WARN("\tunknown WS_IOCTL cmd (%08lx)\n", cmd);

43
dlls/wsock32/socket.c
View File

@ -4,6 +4,21 @@
* Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka. * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka.
*/ */
/*
FIXME: This hack is fixing a problem in WsControl. When we call socket(),
it is supposed to call into ws2_32's WSOCK32_socket.
The problem is that socket() is predefined in a linux system header that
we are including, which is different from the WINE definition.
(cdecl vs. stdapi) The result is stack corruption.
The correct answer to this problem is to make winsock.h not dependent
on system headers, that way all of our functions are defined consistently.
Until that happens we need this hack.
*/
#define socket linux_socket
/* */
#include "config.h" #include "config.h"
#include <sys/types.h> #include <sys/types.h>
@ -25,6 +40,14 @@
# include <net/if.h> # include <net/if.h>
#endif #endif
/* FIXME: The rest of the socket() cdecl<->stdapi stack corruption problem
discussed above. */
#undef socket
extern SOCKET WINAPI socket(INT af, INT type, INT protocol);
/* */
DEFAULT_DEBUG_CHANNEL(winsock); DEFAULT_DEBUG_CHANNEL(winsock);
@ -158,7 +181,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
IFEntry *IntInfo = (IFEntry *) pResponseInfo; IFEntry *IntInfo = (IFEntry *) pResponseInfo;
char ifName[512]; char ifName[512];
struct ifreq ifInfo; struct ifreq ifInfo;
int sock; SOCKET sock;
if (!WSCNTL_GetInterfaceName(pcommand->toi_entity.tei_instance, ifName)) if (!WSCNTL_GetInterfaceName(pcommand->toi_entity.tei_instance, ifName))
@ -186,7 +209,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
if (ioctlsocket(sock, SIOCGIFHWADDR, (ULONG*)&ifInfo) < 0) if (ioctlsocket(sock, SIOCGIFHWADDR, (ULONG*)&ifInfo) < 0)
{ {
ERR ("Error obtaining MAC Address!\n"); ERR ("Error obtaining MAC Address!\n");
close(sock); closesocket(sock);
return (-1); return (-1);
} }
else else
@ -199,7 +222,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
if (ioctlsocket(sock, SIOCGENADDR, (ULONG*)&ifInfo) < 0) if (ioctlsocket(sock, SIOCGENADDR, (ULONG*)&ifInfo) < 0)
{ {
ERR ("Error obtaining MAC Address!\n"); ERR ("Error obtaining MAC Address!\n");
close(sock); closesocket(sock);
return (-1); return (-1);
} }
else else
@ -223,7 +246,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
&IntInfo->if_inoctets, &IntInfo->if_outoctets)) < 0) &IntInfo->if_inoctets, &IntInfo->if_outoctets)) < 0)
{ {
ERR ("Error obtaining transmit/receive stats for the network interface!\n"); ERR ("Error obtaining transmit/receive stats for the network interface!\n");
close(sock); closesocket(sock);
return (-1); return (-1);
} }
@ -233,7 +256,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
IntInfo->if_speed = 1000000; /* Speed of interface (bits per second?) */ IntInfo->if_speed = 1000000; /* Speed of interface (bits per second?) */
/************************************************************************/ /************************************************************************/
close(sock); closesocket(sock);
*pcbResponseInfoLen = sizeof (IFEntry) + IntInfo->if_descrlen; *pcbResponseInfoLen = sizeof (IFEntry) + IntInfo->if_descrlen;
} }
else if (pcommand->toi_entity.tei_entity == CL_NL_ENTITY) else if (pcommand->toi_entity.tei_entity == CL_NL_ENTITY)
@ -312,7 +335,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
IPAddrEntry *baseIPInfo = (IPAddrEntry *) pResponseInfo; IPAddrEntry *baseIPInfo = (IPAddrEntry *) pResponseInfo;
char ifName[512]; char ifName[512];
struct ifreq ifInfo; struct ifreq ifInfo;
int sock; SOCKET sock;
if (*pcbResponseInfoLen < sizeof(IPAddrEntry)) if (*pcbResponseInfoLen < sizeof(IPAddrEntry))
{ {
@ -342,7 +365,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
/* IP Address */ /* IP Address */
strcpy (ifInfo.ifr_name, ifName); strcpy (ifInfo.ifr_name, ifName);
ifInfo.ifr_addr.sa_family = AF_INET; ifInfo.ifr_addr.sa_family = AF_INET;
if (ioctl(sock, SIOCGIFADDR, &ifInfo) < 0) if (ioctlsocket(sock, SIOCGIFADDR, (ULONG*)&ifInfo) < 0)
{ {
baseIPInfo->iae_addr = 0x0; baseIPInfo->iae_addr = 0x0;
} }
@ -354,7 +377,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
/* Broadcast Address */ /* Broadcast Address */
strcpy (ifInfo.ifr_name, ifName); strcpy (ifInfo.ifr_name, ifName);
if (ioctl(sock, SIOCGIFBRDADDR, &ifInfo) < 0) if (ioctlsocket(sock, SIOCGIFBRDADDR, (ULONG *)&ifInfo) < 0)
{ {
baseIPInfo->iae_bcastaddr = 0x0; baseIPInfo->iae_bcastaddr = 0x0;
} }
@ -366,7 +389,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
/* Subnet Mask */ /* Subnet Mask */
strcpy(ifInfo.ifr_name, ifName); strcpy(ifInfo.ifr_name, ifName);
if (ioctl(sock, SIOCGIFNETMASK, &ifInfo) < 0) if (ioctlsocket(sock, SIOCGIFNETMASK, (ULONG *)&ifInfo) < 0)
{ {
baseIPInfo->iae_mask = 0x0; baseIPInfo->iae_mask = 0x0;
} }
@ -396,7 +419,7 @@ DWORD WINAPI WsControl(DWORD protocoll,
/* Calculate size of out buffer */ /* Calculate size of out buffer */
*pcbResponseInfoLen = sizeof(IPAddrEntry); *pcbResponseInfoLen = sizeof(IPAddrEntry);
close(sock); closesocket(sock);
break; break;
} }