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

Fix logic problems with NETCON_connected.

Browse Source
This commit is contained in:
Mike McCormack 2003-09-22 21:15:34 +00:00 committed by Alexandre Julliard
parent 4acad25f3d
commit 99f5a05555
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/wininet/netconnection.c
View File

@ -224,7 +224,7 @@ BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain,
*/ */
BOOL NETCON_close(WININET_NETCONNECTION *connection) BOOL NETCON_close(WININET_NETCONNECTION *connection)
{ {
if (!NETCON_connected) return FALSE; if (!NETCON_connected(connection)) return FALSE;
if (!connection->useSSL) if (!connection->useSSL)
{ {
int result; int result;
@ -255,13 +255,17 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection)
BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr,
socklen_t addrlen) socklen_t addrlen)
{ {
if (!NETCON_connected) return FALSE; if (!NETCON_connected(connection)) return FALSE;
if (!connection->useSSL) if (!connection->useSSL)
{ {
int result; int result;
result = connect(connection->socketFD, serv_addr, addrlen); result = connect(connection->socketFD, serv_addr, addrlen);
if (result == -1) if (result == -1)
{
close(connection->socketFD);
connection->socketFD = -1;
return FALSE; return FALSE;
}
return TRUE; return TRUE;
} }
else else
@ -297,7 +301,7 @@ BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *se
BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags,
int *sent /* out */) int *sent /* out */)
{ {
if (!NETCON_connected) return FALSE; if (!NETCON_connected(connection)) return FALSE;
if (!connection->useSSL) if (!connection->useSSL)
{ {
*sent = send(connection->socketFD, msg, len, flags); *sent = send(connection->socketFD, msg, len, flags);
@ -328,7 +332,7 @@ BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len,
BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags,
int *recvd /* out */) int *recvd /* out */)
{ {
if (!NETCON_connected) return FALSE; if (!NETCON_connected(connection)) return FALSE;
if (!connection->useSSL) if (!connection->useSSL)
{ {
*recvd = recv(connection->socketFD, buf, len, flags); *recvd = recv(connection->socketFD, buf, len, flags);