* Authors: Guilhem Lavaux,
* Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
* Purpose: GSocket main Unix-style file
+ * Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
#define BSD_SELECT /* use Berkley Sockets select */
#include <assert.h>
-#include <sys\types.h>
+#include <sys/types.h>
+
#ifdef __EMX__
#include <sys/time.h>
#include <netinet/in.h>
#include <unistd.h>
#include <sys/un.h>
#define HAVE_INET_ADDR
+
#else
-#include <utils.h>
-#include <sys\time.h>
+
+#include <string.h>
+
+#include <sys/time.h>
#include <types.h>
-#include <in.h>
+#include <netinet/in.h>
#include <netdb.h>
#include <nerrno.h>
+
#endif
+
#if defined(__VISAGECPP__) && __IBMCPP__ < 400
-#include <machine\endian.h>
+
+#include <machine/endian.h>
#include <socket.h>
#include <ioctl.h>
#include <select.h>
#include <unistd.h>
+
+#define EBADF SOCEBADF
+
#else
-#include <sys\socket.h>
-#include <sys\ioctl.h>
-#include <sys\select.h>
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
#ifdef __EMX__
#define soclose(a) close(a)
#else
#endif
#endif
-#include <string.h>
#include <stdio.h>
#if (defined(__VISAGECPP__) && __IBMCPP__ < 400) || defined(__EMX__)
# ifdef min
#endif
#include <stddef.h>
#include <ctype.h>
+#include <stdlib.h>
#include <signal.h>
signal(SIGPIPE, old_handler); \
}
+
#ifndef __GSOCKET_STANDALONE__
# include "wx/unix/gsockunx.h"
# include "wx/gsocket.h"
#endif /* wxUSE_GUI */
/* debugging helpers */
-#define __GSOCKET_DEBUG__
#ifdef __GSOCKET_DEBUG__
# define GSocket_Debug(args) printf args
#else
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)
{
assert(socket != NULL);
if (socket->m_fd != INVALID_SOCKET)
{
shutdown(socket->m_fd, 2);
- soclose(socket->m_fd);
- socket->m_fd = INVALID_SOCKET;
+ GSocket_close(socket);
}
/* Disable GUI callbacks */
return GSOCK_IOERR;
}
- ioctl(sck->m_fd, FIONBIO, &arg);
+ ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
_GSocket_Enable_Events(sck);
/* Bind to the local address,
(SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
(listen(sck->m_fd, 5) != 0))
{
- soclose(sck->m_fd);
- sck->m_fd = INVALID_SOCKET;
+ GSocket_close(sck);
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
return NULL;
}
- ioctl(connection->m_fd, FIONBIO, &arg);
+ ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
_GSocket_Enable_Events(connection);
return connection;
return GSOCK_IOERR;
}
- ioctl(sck->m_fd, FIONBIO, &arg);
+ ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
_GSocket_Enable_Events(sck);
/* 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);
- 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)
{
err = errno;
{
if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
{
- soclose(sck->m_fd);
- sck->m_fd = INVALID_SOCKET;
+ GSocket_close(sck);
/* sck->m_error is set in _GSocket_Output_Timeout */
return GSOCK_TIMEDOUT;
}
/* If connect failed with an error other than EINPROGRESS,
* then the call to GSocket_Connect has failed.
*/
- soclose(sck->m_fd);
- sck->m_fd = INVALID_SOCKET;
+ GSocket_close(sck);
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
return GSOCK_IOERR;
}
- ioctl(sck->m_fd, FIONBIO, &arg);
+ ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
_GSocket_Enable_Events(sck);
/* Bind to the local address,
sck->m_local->m_addr,
(SOCKLEN_T *) &sck->m_local->m_len) != 0))
{
- soclose(sck->m_fd);
- sck->m_fd = INVALID_SOCKET;
+ GSocket_close(sck);
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
FD_SET(socket->m_fd, &writefds);
FD_SET(socket->m_fd, &exceptfds);
- /* Check known state first */
- result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags);
- result |= (GSOCK_LOST_FLAG & socket->m_detected & flags);
+ /* Check 'sticky' CONNECTION flag first */
+ result |= (GSOCK_CONNECTION_FLAG & socket->m_detected);
+
+ /* 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 */
if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
- return result;
+ {
+ /* What to do here? */
+ return (result & flags);
+ }
/* Check for readability */
if (FD_ISSET(socket->m_fd, &readfds))
if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
{
- result |= (GSOCK_INPUT_FLAG & flags);
+ result |= GSOCK_INPUT_FLAG;
}
else
{
if (socket->m_server && socket->m_stream)
{
- result |= (GSOCK_CONNECTION_FLAG & flags);
+ result |= GSOCK_CONNECTION_FLAG;
socket->m_detected |= GSOCK_CONNECTION_FLAG;
}
else
{
- result |= (GSOCK_LOST_FLAG & flags);
socket->m_detected = GSOCK_LOST_FLAG;
+ socket->m_establishing = FALSE;
+
+ /* LOST event: Abort any further processing */
+ return (GSOCK_LOST_FLAG & flags);
}
}
}
if (error)
{
- result |= (GSOCK_LOST_FLAG & flags);
socket->m_detected = GSOCK_LOST_FLAG;
+
+ /* LOST event: Abort any further processing */
+ return (GSOCK_LOST_FLAG & flags);
}
else
{
- result |= (GSOCK_CONNECTION_FLAG & flags);
+ result |= GSOCK_CONNECTION_FLAG;
socket->m_detected |= GSOCK_CONNECTION_FLAG;
}
}
else
{
- result |= (GSOCK_OUTPUT_FLAG & flags);
+ result |= GSOCK_OUTPUT_FLAG;
}
}
/* Check for exceptions and errors (is this useful in Unices?) */
if (FD_ISSET(socket->m_fd, &exceptfds))
{
- result |= (GSOCK_LOST_FLAG & flags);
socket->m_establishing = FALSE;
socket->m_detected = GSOCK_LOST_FLAG;
+
+ /* LOST event: Abort any further processing */
+ return (GSOCK_LOST_FLAG & flags);
}
- return result;
+ return (result & flags);
#else
{
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_data[count] = cdata;
}
{
if ((flags & (1 << count)) != 0)
{
- printf("Removing callback no %d for socket at %X",
- count, socket);
socket->m_cbacks[count] = NULL;
socket->m_data[count] = NULL;
}
#define CALL_CALLBACK(socket, event) { \
_GSocket_Disable(socket, 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]); \
+ if (socket->m_cbacks[event]) \
socket->m_cbacks[event](socket, event, socket->m_data[event]); \
- } \
}
{
int ret;
+#ifdef __EMX__
MASK_SIGNAL();
ret = send(socket->m_fd, buffer, size, 0);
UNMASK_SIGNAL();
-
+#else
+ ret = send(socket->m_fd, (char *)buffer, size, 0);
+#endif
return ret;
}
return -1;
}
+#ifdef __EMX__
MASK_SIGNAL();
ret = sendto(socket->m_fd, buffer, size, 0, addr, len);
UNMASK_SIGNAL();
+#else
+ ret = sendto(socket->m_fd, (char *)buffer, size, 0, addr, len);
+#endif
/* Frees memory allocated from _GAddress_translate_to */
free(addr);
{
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)
{
CALL_CALLBACK(socket, GSOCK_INPUT);
else
{
CALL_CALLBACK(socket, GSOCK_LOST);
+ GSocket_Shutdown(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)
{
int error;
if (error)
{
CALL_CALLBACK(socket, GSOCK_LOST);
+ GSocket_Shutdown(socket);
}
else
{
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);
if (addr2->m_addr == NULL)
if (inet_aton(hostname, addr) == 0)
{
#elif defined(HAVE_INET_ADDR)
- if ( (addr->s_addr = inet_addr(hostname)) == -1 )
+ addr->s_addr = inet_addr(hostname);
+ if ( addr->s_addr == -1 )
{
#else
/* Use gethostbyname by default */
- if (1)
+ int val = 1; //VA doesn't like constants in conditional expressions at all
+ if (val)
{
#endif
struct in_addr *array_addr;
se = getservbyname(port, protocol);
if (!se)
{
+ /* the cast to int suppresses compiler warnings about subscript having the
+ type char */
if (isdigit((int)port[0]))
{
int port_int;
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)
{
struct sockaddr_un *addr;
CHECK_ADDRESS(address, UNIX);
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;
}
projects / wxWidgets.git / blobdiff