Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrated fixes from latest UNIX version.

Browse Source 
Removed some debug output.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2002-09-11 23:26:49 +00:00
parent 5005acfef5
commit e32c4e6082
1 changed files with 99 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/os2/gsocket.c
View File

@@ -131,6 +131,7 @@ int _System soclose(int);
signal(SIGPIPE, old_handler); \ signal(SIGPIPE, old_handler); \
} }
#ifndef __GSOCKET_STANDALONE__ #ifndef __GSOCKET_STANDALONE__
# include "wx/unix/gsockunx.h" # include "wx/unix/gsockunx.h"
# include "wx/gsocket.h" # include "wx/gsocket.h"
@@ -150,7 +151,6 @@ int _System soclose(int);
#endif /* wxUSE_GUI */ #endif /* wxUSE_GUI */
/* debugging helpers */ /* debugging helpers */
#define __GSOCKET_DEBUG__
#ifdef __GSOCKET_DEBUG__ #ifdef __GSOCKET_DEBUG__
# define GSocket_Debug(args) printf args # define GSocket_Debug(args) printf args
#else #else
@@ -208,6 +208,13 @@ GSocket *GSocket_new(void)
return socket; return socket;
} }
void GSocket_close(GSocket *socket)
{
_GSocket_Disable_Events(socket);
soclose(socket->m_fd);
socket->m_fd = INVALID_SOCKET;
}
void GSocket_destroy(GSocket *socket) void GSocket_destroy(GSocket *socket)
{ {
assert(socket != NULL); assert(socket != NULL);
@@ -244,8 +251,7 @@ void GSocket_Shutdown(GSocket *socket)
if (socket->m_fd != INVALID_SOCKET) if (socket->m_fd != INVALID_SOCKET)
{ {
shutdown(socket->m_fd, 2); shutdown(socket->m_fd, 2);
soclose(socket->m_fd); GSocket_close(socket);
socket->m_fd = INVALID_SOCKET;
} }
/* Disable GUI callbacks */ /* Disable GUI callbacks */
@@ -379,11 +385,11 @@ GAddress *GSocket_GetPeer(GSocket *socket)
* Sets up this socket as a server. The local address must have been * Sets up this socket as a server. The local address must have been
* set with GSocket_SetLocal() before GSocket_SetServer() is called. * set with GSocket_SetLocal() before GSocket_SetServer() is called.
* Returns GSOCK_NOERROR on success, one of the following otherwise: * Returns GSOCK_NOERROR on success, one of the following otherwise:
* *
* Error codes: * Error codes:
* GSOCK_INVSOCK - the socket is in use. * GSOCK_INVSOCK - the socket is in use.
* GSOCK_INVADDR - the local address has not been set. * GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error. * GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocket_SetServer(GSocket *sck) GSocketError GSocket_SetServer(GSocket *sck)
{ {
@@ -432,8 +438,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
(SOCKLEN_T *) &sck->m_local->m_len) != 0) || (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
(listen(sck->m_fd, 5) != 0)) (listen(sck->m_fd, 5) != 0))
{ {
soclose(sck->m_fd); GSocket_close(sck);
sck->m_fd = INVALID_SOCKET;
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR; return GSOCK_IOERR;
} }
@@ -451,7 +456,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
* GSOCK_TIMEDOUT - timeout, no incoming connections. * GSOCK_TIMEDOUT - timeout, no incoming connections.
* GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking. * GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
* GSOCK_MEMERR - couldn't allocate memory. * GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error. * GSOCK_IOERR - low-level error.
*/ */
GSocket *GSocket_WaitConnection(GSocket *socket) GSocket *GSocket_WaitConnection(GSocket *socket)
{ {
@@ -554,7 +559,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
* GSOCK_TIMEDOUT - timeout, the connection failed. * GSOCK_TIMEDOUT - timeout, the connection failed.
* GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only) * GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
* GSOCK_MEMERR - couldn't allocate memory. * GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error. * GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
{ {
@@ -600,8 +605,6 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
/* Connect it to the peer address, with a timeout (see below) */ /* Connect it to the peer address, with a timeout (see below) */
ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len); ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
printf("connect on %d to %X (%d) returned %d, errno = %d\n",
sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len, ret, errno);
if (ret == -1) if (ret == -1)
{ {
err = errno; err = errno;
@@ -615,8 +618,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
{ {
if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT) if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
{ {
soclose(sck->m_fd); GSocket_close(sck);
sck->m_fd = INVALID_SOCKET;
/* sck->m_error is set in _GSocket_Output_Timeout */ /* sck->m_error is set in _GSocket_Output_Timeout */
return GSOCK_TIMEDOUT; return GSOCK_TIMEDOUT;
} }
@@ -648,8 +650,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
/* If connect failed with an error other than EINPROGRESS, /* If connect failed with an error other than EINPROGRESS,
* then the call to GSocket_Connect has failed. * then the call to GSocket_Connect has failed.
*/ */
soclose(sck->m_fd); GSocket_close(sck);
sck->m_fd = INVALID_SOCKET;
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR; return GSOCK_IOERR;
} }
@@ -713,8 +714,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
sck->m_local->m_addr, sck->m_local->m_addr,
(SOCKLEN_T *) &sck->m_local->m_len) != 0)) (SOCKLEN_T *) &sck->m_local->m_len) != 0))
{ {
soclose(sck->m_fd); GSocket_close(sck);
sck->m_fd = INVALID_SOCKET;
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR; return GSOCK_IOERR;
} }
@@ -749,7 +749,7 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
ret = _GSocket_Recv_Stream(socket, buffer, size); ret = _GSocket_Recv_Stream(socket, buffer, size);
else else
ret = _GSocket_Recv_Dgram(socket, buffer, size); ret = _GSocket_Recv_Dgram(socket, buffer, size);
if (ret == -1) if (ret == -1)
{ {
if (errno == EWOULDBLOCK) if (errno == EWOULDBLOCK)
@@ -757,16 +757,16 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
else else
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
} }
return ret; return ret;
} }
int GSocket_Write(GSocket *socket, const char *buffer, int size) int GSocket_Write(GSocket *socket, const char *buffer, int size)
{ {
int ret; int ret;
assert(socket != NULL); assert(socket != NULL);
GSocket_Debug(( "GSocket_Write #1, size %d\n", size )); GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));
if (socket->m_fd == INVALID_SOCKET || socket->m_server) if (socket->m_fd == INVALID_SOCKET || socket->m_server)
@@ -788,7 +788,7 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
ret = _GSocket_Send_Stream(socket, buffer, size); ret = _GSocket_Send_Stream(socket, buffer, size);
else else
ret = _GSocket_Send_Dgram(socket, buffer, size); ret = _GSocket_Send_Dgram(socket, buffer, size);
GSocket_Debug(( "GSocket_Write #4, size %d\n", size )); GSocket_Debug(( "GSocket_Write #4, size %d\n", size ));
if (ret == -1) if (ret == -1)
@@ -812,7 +812,7 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
_GSocket_Enable(socket, GSOCK_OUTPUT); _GSocket_Enable(socket, GSOCK_OUTPUT);
return -1; return -1;
} }
GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret )); GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret ));
return ret; return ret;
@@ -848,13 +848,25 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
FD_SET(socket->m_fd, &writefds); FD_SET(socket->m_fd, &writefds);
FD_SET(socket->m_fd, &exceptfds); FD_SET(socket->m_fd, &exceptfds);
/* Check known state first */ /* Check 'sticky' CONNECTION flag first */
result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags); result |= (GSOCK_CONNECTION_FLAG & socket->m_detected);
result |= (GSOCK_LOST_FLAG & socket->m_detected & flags);
/* If we have already detected a LOST event, then don't try
* to do any further processing.
*/
if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
{
socket->m_establishing = FALSE;
return (GSOCK_LOST_FLAG & flags);
}
/* Try select now */ /* Try select now */
if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0) if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
return result; {
/* What to do here? */
return (result & flags);
}
/* Check for readability */ /* Check for readability */
if (FD_ISSET(socket->m_fd, &readfds)) if (FD_ISSET(socket->m_fd, &readfds))
@@ -863,19 +875,22 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
{ {
result |= (GSOCK_INPUT_FLAG & flags); result |= GSOCK_INPUT_FLAG;
} }
else else
{ {
if (socket->m_server && socket->m_stream) if (socket->m_server && socket->m_stream)
{ {
result |= (GSOCK_CONNECTION_FLAG & flags); result |= GSOCK_CONNECTION_FLAG;
socket->m_detected |= GSOCK_CONNECTION_FLAG; socket->m_detected |= GSOCK_CONNECTION_FLAG;
} }
else else
{ {
result |= (GSOCK_LOST_FLAG & flags);
socket->m_detected = GSOCK_LOST_FLAG; socket->m_detected = GSOCK_LOST_FLAG;
socket->m_establishing = FALSE;
/* LOST event: Abort any further processing */
return (GSOCK_LOST_FLAG & flags);
} }
} }
} }
@@ -894,32 +909,36 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
if (error) if (error)
{ {
result |= (GSOCK_LOST_FLAG & flags);
socket->m_detected = GSOCK_LOST_FLAG; socket->m_detected = GSOCK_LOST_FLAG;
/* LOST event: Abort any further processing */
return (GSOCK_LOST_FLAG & flags);
} }
else else
{ {
result |= (GSOCK_CONNECTION_FLAG & flags); result |= GSOCK_CONNECTION_FLAG;
socket->m_detected |= GSOCK_CONNECTION_FLAG; socket->m_detected |= GSOCK_CONNECTION_FLAG;
} }
} }
else else
{ {
result |= (GSOCK_OUTPUT_FLAG & flags); result |= GSOCK_OUTPUT_FLAG;
} }
} }
/* Check for exceptions and errors (is this useful in Unices?) */ /* Check for exceptions and errors (is this useful in Unices?) */
if (FD_ISSET(socket->m_fd, &exceptfds)) if (FD_ISSET(socket->m_fd, &exceptfds))
{ {
result |= (GSOCK_LOST_FLAG & flags);
socket->m_establishing = FALSE; socket->m_establishing = FALSE;
socket->m_detected = GSOCK_LOST_FLAG; socket->m_detected = GSOCK_LOST_FLAG;
/* LOST event: Abort any further processing */
return (GSOCK_LOST_FLAG & flags);
} }
return result; return (result & flags);
#else #else
assert(socket != NULL); assert(socket != NULL);
return flags & socket->m_detected; return flags & socket->m_detected;
@@ -972,7 +991,7 @@ GSocketError GSocket_GetError(GSocket *socket)
* operation, there is still data available, the callback function will * operation, there is still data available, the callback function will
* be called again. * be called again.
* GSOCK_OUTPUT: * GSOCK_OUTPUT:
* The socket is available for writing. That is, the next write call * The socket is available for writing. That is, the next write call
* won't block. This event is generated only once, when the connection is * won't block. This event is generated only once, when the connection is
* first established, and then only if a call failed with GSOCK_WOULDBLOCK, * first established, and then only if a call failed with GSOCK_WOULDBLOCK,
* when the output buffer empties again. This means that the app should * when the output buffer empties again. This means that the app should
@@ -1006,8 +1025,6 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
{ {
if ((flags & (1 << count)) != 0) if ((flags & (1 << count)) != 0)
{ {
printf("Setting callback no %d for socket at %X to address %X,data %X\n",
count, socket, callback, cdata);
socket->m_cbacks[count] = callback; socket->m_cbacks[count] = callback;
socket->m_data[count] = cdata; socket->m_data[count] = cdata;
} }
@@ -1028,8 +1045,6 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
{ {
if ((flags & (1 << count)) != 0) if ((flags & (1 << count)) != 0)
{ {
printf("Removing callback no %d for socket at %X",
count, socket);
socket->m_cbacks[count] = NULL; socket->m_cbacks[count] = NULL;
socket->m_data[count] = NULL; socket->m_data[count] = NULL;
} }
@@ -1039,11 +1054,8 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
#define CALL_CALLBACK(socket, event) { \ #define CALL_CALLBACK(socket, event) { \
_GSocket_Disable(socket, event); \ _GSocket_Disable(socket, event); \
if (socket->m_cbacks[event]){ \ if (socket->m_cbacks[event]) \
printf("Call callback for event %d, socket %X: %X, %X\n", event, \
socket, socket->m_cbacks[event], socket->m_data[event]); \
socket->m_cbacks[event](socket, event, socket->m_data[event]); \ socket->m_cbacks[event](socket, event, socket->m_data[event]); \
} \
} }
@@ -1240,6 +1252,18 @@ void _GSocket_Detected_Read(GSocket *socket)
{ {
char c; char c;
/* If we have already detected a LOST event, then don't try
* to do any further processing.
*/
if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
{
socket->m_establishing = FALSE;
CALL_CALLBACK(socket, GSOCK_LOST);
GSocket_Shutdown(socket);
return;
}
if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
{ {
CALL_CALLBACK(socket, GSOCK_INPUT); CALL_CALLBACK(socket, GSOCK_INPUT);
@@ -1253,12 +1277,25 @@ void _GSocket_Detected_Read(GSocket *socket)
else else
{ {
CALL_CALLBACK(socket, GSOCK_LOST); CALL_CALLBACK(socket, GSOCK_LOST);
GSocket_Shutdown(socket);
} }
} }
} }
void _GSocket_Detected_Write(GSocket *socket) void _GSocket_Detected_Write(GSocket *socket)
{ {
/* If we have already detected a LOST event, then don't try
* to do any further processing.
*/
if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
{
socket->m_establishing = FALSE;
CALL_CALLBACK(socket, GSOCK_LOST);
GSocket_Shutdown(socket);
return;
}
if (socket->m_establishing && !socket->m_server) if (socket->m_establishing && !socket->m_server)
{ {
int error; int error;
@@ -1271,6 +1308,7 @@ void _GSocket_Detected_Write(GSocket *socket)
if (error) if (error)
{ {
CALL_CALLBACK(socket, GSOCK_LOST); CALL_CALLBACK(socket, GSOCK_LOST);
GSocket_Shutdown(socket);
} }
else else
{ {
@@ -1351,7 +1389,7 @@ GAddress *GAddress_copy(GAddress *address)
memcpy(addr2, address, sizeof(GAddress)); memcpy(addr2, address, sizeof(GAddress));
if (address->m_addr) if (address->m_addr && address->m_len > 0)
{ {
addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len); addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len);
if (addr2->m_addr == NULL) if (addr2->m_addr == NULL)
@@ -1549,10 +1587,12 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
address->m_error = GSOCK_INVPORT; address->m_error = GSOCK_INVPORT;
return GSOCK_INVPORT; return GSOCK_INVPORT;
} }
se = getservbyname(port, protocol); se = getservbyname(port, protocol);
if (!se) if (!se)
{ {
/* the cast to int suppresses compiler warnings about subscript having the
type char */
if (isdigit((int)port[0])) if (isdigit((int)port[0]))
{ {
int port_int; int port_int;
@@ -1579,7 +1619,7 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
assert(address != NULL); assert(address != NULL);
CHECK_ADDRESS(address, INET); CHECK_ADDRESS(address, INET);
addr = (struct sockaddr_in *)address->m_addr; addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = htons(port); addr->sin_port = htons(port);
@@ -1592,7 +1632,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
char *addr_buf; char *addr_buf;
struct sockaddr_in *addr; struct sockaddr_in *addr;
assert(address != NULL); assert(address != NULL);
CHECK_ADDRESS(address, INET); CHECK_ADDRESS(address, INET);
addr = (struct sockaddr_in *)address->m_addr; addr = (struct sockaddr_in *)address->m_addr;
@@ -1614,8 +1654,8 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
{ {
struct sockaddr_in *addr; struct sockaddr_in *addr;
assert(address != NULL); assert(address != NULL);
CHECK_ADDRESS_RETVAL(address, INET, 0); CHECK_ADDRESS_RETVAL(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr; addr = (struct sockaddr_in *)address->m_addr;
@@ -1626,8 +1666,8 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
{ {
struct sockaddr_in *addr; struct sockaddr_in *addr;
assert(address != NULL); assert(address != NULL);
CHECK_ADDRESS_RETVAL(address, INET, 0); CHECK_ADDRESS_RETVAL(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr; addr = (struct sockaddr_in *)address->m_addr;
return ntohs(addr->sin_port); return ntohs(addr->sin_port);
@@ -1658,16 +1698,19 @@ GSocketError _GAddress_Init_UNIX(GAddress *address)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
#define UNIX_SOCK_PATHLEN (sizeof(addr->sun_path)/sizeof(addr->sun_path[0]))
GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
{ {
struct sockaddr_un *addr; struct sockaddr_un *addr;
assert(address != NULL); assert(address != NULL);
CHECK_ADDRESS(address, UNIX); CHECK_ADDRESS(address, UNIX);
addr = ((struct sockaddr_un *)address->m_addr); addr = ((struct sockaddr_un *)address->m_addr);
memcpy(addr->sun_path, path, strlen(path)); strncpy(addr->sun_path, path, UNIX_SOCK_PATHLEN);
addr->sun_path[UNIX_SOCK_PATHLEN - 1] = '\0';
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }