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

ws2_32: Create a wrapper for connect.

This commit is contained in:
Mike Kaplinskiy 2010-07-31 23:21:31 -04:00 committed by Alexandre Julliard
parent fae0b6fa63
commit 15cc301728
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/ws2_32/socket.c
View File

@ -1803,26 +1803,14 @@ int WINAPI WS_closesocket(SOCKET s)
return SOCKET_ERROR; return SOCKET_ERROR;
} }
/*********************************************************************** static int do_connect(int fd, const struct WS_sockaddr* name, int namelen)
* connect (WS2_32.4)
*/
int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen)
{
int fd = get_sock_fd( s, FILE_READ_DATA, NULL );
TRACE("socket %04lx, ptr %p %s, length %d\n", s, name, debugstr_sockaddr(name), namelen);
if (fd != -1)
{ {
union generic_unix_sockaddr uaddr; union generic_unix_sockaddr uaddr;
unsigned int uaddrlen = ws_sockaddr_ws2u(name, namelen, &uaddr); unsigned int uaddrlen = ws_sockaddr_ws2u(name, namelen, &uaddr);
if (!uaddrlen) if (!uaddrlen)
{ return WSAEFAULT;
SetLastError(WSAEFAULT);
}
else
{
if (name->sa_family == WS_AF_INET) if (name->sa_family == WS_AF_INET)
{ {
struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr;
@ -1837,10 +1825,27 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen)
} }
if (connect(fd, &uaddr.addr, uaddrlen) == 0) if (connect(fd, &uaddr.addr, uaddrlen) == 0)
goto connect_success; return 0;
return wsaErrno();
} }
if (errno == EINPROGRESS) /***********************************************************************
* connect (WS2_32.4)
*/
int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen)
{
int fd = get_sock_fd( s, FILE_READ_DATA, NULL );
TRACE("socket %04lx, ptr %p %s, length %d\n", s, name, debugstr_sockaddr(name), namelen);
if (fd != -1)
{
int ret = do_connect(fd, name, namelen);
if (ret == 0)
goto connect_success;
if (ret == WSAEINPROGRESS)
{ {
/* tell wineserver that a connection is in progress */ /* tell wineserver that a connection is in progress */
_enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE,
@ -1868,7 +1873,7 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen)
} }
else else
{ {
SetLastError(wsaErrno()); SetLastError(ret);
} }
release_sock_fd( s, fd ); release_sock_fd( s, fd );
} }