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

GSocket:

Browse Source 
- Added lots of comments to both code and headers.
- Restructured some parts of Unix version. Will try to merge with MSW soon
    and have a gsockcmn.c
- Fixed a potential bug in the MSW version of GSocket_Connect when in blocking mode.
- Fixed a potential (different) bug in the corresponding Unix version.
- Now WaitConnection correctly fills out the peer address field.
- Added GAddress_INET_SetAnyAddress (sets address to INADDR_ANY)
- Default address is INADDR_ANY again, not INADDR_NONE; failed hostname lookups
    sets the address to INADDR_NONE.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-01-21 03:10:42 +00:00
parent d93c719ac0
commit 9bf10d6bd3
4 changed files with 709 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
include/wx/gsocket.h
View File

@@ -1,10 +1,13 @@
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) * Project: GSocket (Generic Socket)
* Name: gsocket.h * Name: gsocket.h
* Author: Guilhem Lavaux
* Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
* Purpose: GSocket include file (system independent) * Purpose: GSocket include file (system independent)
* CVSID: $Id$ * CVSID: $Id$
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#ifndef __GSOCKET_H #ifndef __GSOCKET_H
#define __GSOCKET_H #define __GSOCKET_H
@@ -62,6 +65,8 @@ typedef enum {
GSOCK_MEMERR GSOCK_MEMERR
} GSocketError; } GSocketError;
/* See below for an explanation on how events work.
*/
typedef enum { typedef enum {
GSOCK_INPUT = 0, GSOCK_INPUT = 0,
GSOCK_OUTPUT = 1, GSOCK_OUTPUT = 1,
@@ -87,64 +92,124 @@ typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
/* GSocket_Init() must be called at the beginning */ /* GSocket_Init() must be called at the beginning */
bool GSocket_Init(); bool GSocket_Init();
/* GSocket_Cleanup() must be called at the ending */
/* GSocket_Cleanup() must be called at the end */
void GSocket_Cleanup(); void GSocket_Cleanup();
/* Constructors / Destructors */ /* Constructors / Destructors */
GSocket *GSocket_new(); GSocket *GSocket_new();
void GSocket_destroy(GSocket *socket); void GSocket_destroy(GSocket *socket);
/* This will disable all further IO calls to this socket */
/* GSocket_Shutdown:
* Disallow further read/write operations on this socket, close
* the fd and disable all callbacks.
*/
void GSocket_Shutdown(GSocket *socket); void GSocket_Shutdown(GSocket *socket);
/* Address handling */ /* Address handling */
/* GSocket_SetLocal:
* GSocket_GetLocal:
* GSocket_SetPeer:
* GSocket_GetPeer:
* Set or get the local or peer address for this socket. The 'set'
* functions return GSOCK_NOERROR on success, an error code otherwise.
* The 'get' functions return a pointer to a GAddress object on success,
* or NULL otherwise, in which case they set the error code of the
* corresponding GSocket.
*
* Error codes:
* GSOCK_INVSOCK - the socket is not valid.
* GSOCK_INVADDR - the address is not valid.
*/
GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address); GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address);
GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address); GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address);
GAddress *GSocket_GetLocal(GSocket *socket); GAddress *GSocket_GetLocal(GSocket *socket);
GAddress *GSocket_GetPeer(GSocket *socket); GAddress *GSocket_GetPeer(GSocket *socket);
/* Non-oriented connections handlers */
GSocketError GSocket_SetNonOriented(GSocket *socket);
/* Server specific parts */ /* Server specific parts */
/* GSocket_SetServer: /* GSocket_SetServer:
* Sets up the socket as a server. It uses the "Local" field of GSocket. * Sets up this socket as a server. The local address must have been
* "Local" must be set by GSocket_SetLocal() before GSocket_SetServer() * set with GSocket_SetLocal() before GSocket_SetServer() is called.
* is called. Possible error codes are: GSOCK_INVSOCK if socket has not * Returns GSOCK_NOERROR on success, one of the following otherwise:
* been initialized, GSOCK_INVADDR if the local address has not been *
* defined and GSOCK_IOERR for other internal errors. * Error codes:
* GSOCK_INVSOCK - the socket is in use.
* GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocket_SetServer(GSocket *socket); GSocketError GSocket_SetServer(GSocket *socket);
/* GSocket_WaitConnection: /* GSocket_WaitConnection:
* Waits for an incoming client connection. * Waits for an incoming client connection. Returns a pointer to
* a GSocket object, or NULL if there was an error, in which case
* the last error field will be updated for the calling GSocket.
*
* Error codes (set in the calling GSocket)
* GSOCK_INVSOCK - the socket is not valid or not a server.
* GSOCK_TIMEDOUT - timeout, no incoming connections.
* GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
* GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error.
*/ */
GSocket *GSocket_WaitConnection(GSocket *socket); GSocket *GSocket_WaitConnection(GSocket *socket);
/* Client specific parts */ /* Client specific parts */
/* GSocket_Connect: /* GSocket_Connect:
* Establishes a client connection to a server using the "Peer" * For stream (connection oriented) sockets, GSocket_Connect() tries
* field of GSocket. "Peer" must be set by GSocket_SetPeer() before * to establish a client connection to a server using the peer address
* GSocket_Connect() is called. Possible error codes are GSOCK_INVSOCK, * as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
* GSOCK_INVADDR, GSOCK_TIMEDOUT, GSOCK_WOULDBLOCK and GSOCK_IOERR. * connection has been succesfully established, or one of the error
* If a socket is nonblocking and Connect() returns GSOCK_WOULDBLOCK, * codes listed below. Note that for nonblocking sockets, a return
* the connection request can be completed later. Use GSocket_Select() * value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
* to check it, or wait for a GSOCK_CONNECTION event. * request can be completed later; you should use GSocket_Select()
* to poll for GSOCK_CONNECTION | GSOCK_LOST, or wait for the
* corresponding asynchronous events.
*
* For datagram (non connection oriented) sockets, GSocket_Connect()
* just sets the peer address established with GSocket_SetPeer() as
* default destination.
*
* Error codes:
* GSOCK_INVSOCK - the socket is in use or not valid.
* GSOCK_INVADDR - the peer address has not been established.
* GSOCK_TIMEDOUT - timeout, the connection failed.
* GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
* GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream); GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream);
/* Datagram sockets */
/* GSocket_SetNonOriented:
* Sets up this socket as a non-connection oriented (datagram) socket.
* Before using this function, the local address must have been set
* with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR
* on success, or one of the following otherwise.
*
* Error codes:
* GSOCK_INVSOCK - the socket is in use.
* GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error.
*/
GSocketError GSocket_SetNonOriented(GSocket *socket);
/* Generic IO */ /* Generic IO */
/* Like recv(), send(), ... */ /* Like recv(), send(), ... */
/* NOTE: In case we read from a non-oriented connection, the incoming /* For datagram sockets, the incoming / outgoing addresses
* (outgoing) connection address is stored in the "Local" ("Peer") * are stored as / read from the 'peer' address field.
* field.
*/ */
int GSocket_Read(GSocket *socket, char *buffer, int size); int GSocket_Read(GSocket *socket, char *buffer, int size);
int GSocket_Write(GSocket *socket, const char *buffer, int GSocket_Write(GSocket *socket, const char *buffer,
@@ -159,41 +224,49 @@ int GSocket_Write(GSocket *socket, const char *buffer,
*/ */
GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags); GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags);
/* Flags/Parameters */
/* GSocket_SetTimeout: /* Attributes */
* Sets the timeout for blocking calls. Time is
* expressed in milliseconds.
*/
void GSocket_SetTimeout(GSocket *socket, unsigned long millisec);
/* GSocket_SetNonBlocking: /* GSocket_SetNonBlocking:
* Sets the socket to non-blocking mode. This is useful if * Sets the socket to non-blocking mode. All IO calls will return
* we don't want to wait. * immediately.
*/ */
void GSocket_SetNonBlocking(GSocket *socket, bool non_block); void GSocket_SetNonBlocking(GSocket *socket, bool non_block);
/* GSocket_SetTimeout:
* Sets the timeout for blocking calls. Time is expressed in
* milliseconds.
*/
void GSocket_SetTimeout(GSocket *socket, unsigned long millisec);
/* GSocket_GetError: /* GSocket_GetError:
* Returns the last error occured for this socket. * Returns the last error occured for this socket. Note that successful
* operations do not clear this back to GSOCK_NOERROR, so use it only
* after an error.
*/ */
GSocketError GSocket_GetError(GSocket *socket); GSocketError GSocket_GetError(GSocket *socket);
/* Callbacks */ /* Callbacks */
/* Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION /* GSOCK_INPUT:
* and LOST). The callbacks are called in the following situations: * There is data to be read in the input buffer. If, after a read
* * operation, there is still data available, the callback function will
* INPUT: There is at least one byte in the input buffer * be called again.
* OUTPUT: The system is sure that the next write call will not block * GSOCK_OUTPUT:
* CONNECTION: Two cases are possible: * The socket is available for writing. That is, the next write call
* Client socket -> the connection is established * won't block. This event is generated only once, when the connection is
* Server socket -> a client requests a connection * first established, and then only if a call failed with GSOCK_WOULDBLOCK,
* LOST: The connection is lost * when the output buffer empties again. This means that the app should
* * assume that it can write since the first OUTPUT event, and no more
* An event is generated only once and its state is reseted when the * OUTPUT events will be generated unless an error occurs.
* relative IO call is requested. * GSOCK_CONNECTION:
* For example: INPUT -> GSocket_Read() * Connection succesfully established, for client sockets, or incoming
* CONNECTION -> GSocket_Accept() * client connection, for server sockets. Wait for this event (also watch
* out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
* GSOCK_LOST:
* The connection is lost (or a connection request failed); this could
* be due to a failure, or due to the peer closing it gracefully.
*/ */
/* GSocket_SetCallback: /* GSocket_SetCallback:
@@ -213,6 +286,7 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
*/ */
void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags); void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags);
/* GAddress */ /* GAddress */
GAddress *GAddress_new(); GAddress *GAddress_new();
@@ -228,6 +302,7 @@ GAddressType GAddress_GetFamily(GAddress *address);
*/ */
GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname); GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname);
GSocketError GAddress_INET_SetAnyAddress(GAddress *address);
GSocketError GAddress_INET_SetHostAddress(GAddress *address, GSocketError GAddress_INET_SetHostAddress(GAddress *address,
unsigned long hostaddr); unsigned long hostaddr);
GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,

2
include/wx/unix/gsockunx.h
View File

@@ -91,10 +91,10 @@ GSocketError _GAddress_translate_from(GAddress *address,
struct sockaddr *addr, int len); struct sockaddr *addr, int len);
GSocketError _GAddress_translate_to (GAddress *address, GSocketError _GAddress_translate_to (GAddress *address,
struct sockaddr **addr, int *len); struct sockaddr **addr, int *len);
GSocketError _GAddress_Init_INET(GAddress *address); GSocketError _GAddress_Init_INET(GAddress *address);
GSocketError _GAddress_Init_UNIX(GAddress *address); GSocketError _GAddress_Init_UNIX(GAddress *address);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

492
src/msw/gsocket.c
View File

@@ -1,18 +1,22 @@
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX * Project: GSocket (Generic Socket)
* Name: gsocket.c * Name: gsocket.c
* Author: Guillermo Rodriguez Garcia <guille@iies.es>
* Purpose: GSocket main MSW file * Purpose: GSocket main MSW file
* CVSID: $Id$ * CVSID: $Id$
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
/*
* PLEASE don't put C++ comments here - this is a C source file.
*/
#ifndef __GSOCKET_STANDALONE__ #ifndef __GSOCKET_STANDALONE__
#include "wx/setup.h" #include "wx/setup.h"
#endif #endif
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
#ifndef __GSOCKET_STANDALONE__ #ifndef __GSOCKET_STANDALONE__
#include "wx/msw/gsockmsw.h" #include "wx/msw/gsockmsw.h"
@@ -119,7 +123,7 @@ void GSocket_Cleanup()
WSACleanup(); WSACleanup();
} }
/* Constructors / Destructors */ /* Constructors / Destructors for GSocket */
GSocket *GSocket_new() GSocket *GSocket_new()
{ {
@@ -188,10 +192,14 @@ void GSocket_destroy(GSocket *socket)
if (socket->m_peer) if (socket->m_peer)
GAddress_destroy(socket->m_peer); GAddress_destroy(socket->m_peer);
/* Destroy socket itself */ /* Destroy the socket itself */
free(socket); free(socket);
} }
/* GSocket_Shutdown:
* Disallow further read/write operations on this socket, close
* the fd and disable all callbacks.
*/
void GSocket_Shutdown(GSocket *socket) void GSocket_Shutdown(GSocket *socket)
{ {
int evt; int evt;
@@ -216,16 +224,32 @@ void GSocket_Shutdown(GSocket *socket)
/* Address handling */ /* Address handling */
/* GSocket_SetLocal:
* GSocket_GetLocal:
* GSocket_SetPeer:
* GSocket_GetPeer:
* Set or get the local or peer address for this socket. The 'set'
* functions return GSOCK_NOERROR on success, an error code otherwise.
* The 'get' functions return a pointer to a GAddress object on success,
* or NULL otherwise, in which case they set the error code of the
* corresponding GSocket.
*
* Error codes:
* GSOCK_INVSOCK - the socket is not valid.
* GSOCK_INVADDR - the address is not valid.
*/
GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address) GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
{ {
assert(socket != NULL); assert(socket != NULL);
/* the socket must be initialized, or it must be a server */
if (socket->m_fd != INVALID_SOCKET && !socket->m_server) if (socket->m_fd != INVALID_SOCKET && !socket->m_server)
{ {
socket->m_error = GSOCK_INVSOCK; socket->m_error = GSOCK_INVSOCK;
return GSOCK_INVSOCK; return GSOCK_INVSOCK;
} }
/* check address */
if (address == NULL || address->m_family == GSOCK_NOFAMILY) if (address == NULL || address->m_family == GSOCK_NOFAMILY)
{ {
socket->m_error = GSOCK_INVADDR; socket->m_error = GSOCK_INVADDR;
@@ -244,6 +268,7 @@ GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
{ {
assert(socket != NULL); assert(socket != NULL);
/* check address */
if (address == NULL || address->m_family == GSOCK_NOFAMILY) if (address == NULL || address->m_family == GSOCK_NOFAMILY)
{ {
socket->m_error = GSOCK_INVADDR; socket->m_error = GSOCK_INVADDR;
@@ -267,31 +292,31 @@ GAddress *GSocket_GetLocal(GSocket *socket)
assert(socket != NULL); assert(socket != NULL);
/* try to get it from the m_local var first */
if (socket->m_local) if (socket->m_local)
return GAddress_copy(socket->m_local); return GAddress_copy(socket->m_local);
/* else, if the socket is initialized, try getsockname */
if (socket->m_fd == INVALID_SOCKET) if (socket->m_fd == INVALID_SOCKET)
{ {
socket->m_error = GSOCK_INVSOCK; socket->m_error = GSOCK_INVSOCK;
return NULL; return NULL;
} }
size = sizeof(addr);
if (getsockname(socket->m_fd, &addr, &size) == SOCKET_ERROR) if (getsockname(socket->m_fd, &addr, &size) == SOCKET_ERROR)
{ {
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
return NULL; return NULL;
} }
address = GAddress_new(); /* got a valid address from getsockname, create a GAddress object */
if (address == NULL) if ((address = GAddress_new()) == NULL)
{ {
socket->m_error = GSOCK_MEMERR; socket->m_error = GSOCK_MEMERR;
return NULL; return NULL;
} }
err = _GAddress_translate_from(address, &addr, size);
if (err != GSOCK_NOERROR) if ((err = _GAddress_translate_from(address, &addr, size)) != GSOCK_NOERROR)
{ {
GAddress_destroy(address); GAddress_destroy(address);
socket->m_error = err; socket->m_error = err;
@@ -305,6 +330,7 @@ GAddress *GSocket_GetPeer(GSocket *socket)
{ {
assert(socket != NULL); assert(socket != NULL);
/* try to get it from the m_peer var */
if (socket->m_peer) if (socket->m_peer)
return GAddress_copy(socket->m_peer); return GAddress_copy(socket->m_peer);
@@ -314,11 +340,14 @@ GAddress *GSocket_GetPeer(GSocket *socket)
/* Server specific parts */ /* Server specific parts */
/* GSocket_SetServer: /* GSocket_SetServer:
* Sets up the socket as a server. It uses the "Local" field of GSocket. * Sets up this socket as a server. The local address must have been
* "Local" must be set by GSocket_SetLocal() before GSocket_SetServer() * set with GSocket_SetLocal() before GSocket_SetServer() is called.
* is called. Possible error codes are: GSOCK_INVSOCK if socket has not * Returns GSOCK_NOERROR on success, one of the following otherwise:
* been initialized, GSOCK_INVADDR if the local address has not been *
* defined and GSOCK_IOERR for other internal errors. * Error codes:
* GSOCK_INVSOCK - the socket is in use.
* GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocket_SetServer(GSocket *sck) GSocketError GSocket_SetServer(GSocket *sck)
{ {
@@ -326,12 +355,14 @@ GSocketError GSocket_SetServer(GSocket *sck)
assert(sck != NULL); assert(sck != NULL);
/* must not be in use */
if (sck->m_fd != INVALID_SOCKET) if (sck->m_fd != INVALID_SOCKET)
{ {
sck->m_error = GSOCK_INVSOCK; sck->m_error = GSOCK_INVSOCK;
return GSOCK_INVSOCK; return GSOCK_INVSOCK;
} }
/* the local addr must have been set */
if (!sck->m_local) if (!sck->m_local)
{ {
sck->m_error = GSOCK_INVADDR; sck->m_error = GSOCK_INVADDR;
@@ -355,17 +386,15 @@ GSocketError GSocket_SetServer(GSocket *sck)
ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &arg); ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &arg);
_GSocket_Enable_Events(sck); _GSocket_Enable_Events(sck);
/* Bind the socket to the LOCAL address */ /* Bind to the local address,
if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) * retrieve the actual address bound,
{ * and listen up to 5 connections.
closesocket(sck->m_fd); */
sck->m_fd = INVALID_SOCKET; if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
sck->m_error = GSOCK_IOERR; (getsockname(sck->m_fd,
return GSOCK_IOERR; sck->m_local->m_addr,
} &sck->m_local->m_len) != 0) ||
(listen(sck->m_fd, 5) != 0))
/* Enable listening up to 5 connections */
if (listen(sck->m_fd, 5) != 0)
{ {
closesocket(sck->m_fd); closesocket(sck->m_fd);
sck->m_fd = INVALID_SOCKET; sck->m_fd = INVALID_SOCKET;
@@ -377,7 +406,16 @@ GSocketError GSocket_SetServer(GSocket *sck)
} }
/* GSocket_WaitConnection: /* GSocket_WaitConnection:
* Waits for an incoming client connection. * Waits for an incoming client connection. Returns a pointer to
* a GSocket object, or NULL if there was an error, in which case
* the last error field will be updated for the calling GSocket.
*
* Error codes (set in the calling GSocket)
* GSOCK_INVSOCK - the socket is not valid or not a server.
* GSOCK_TIMEDOUT - timeout, no incoming connections.
* GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
* GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error.
*/ */
GSocket *GSocket_WaitConnection(GSocket *sck) GSocket *GSocket_WaitConnection(GSocket *sck)
{ {
@@ -389,8 +427,10 @@ GSocket *GSocket_WaitConnection(GSocket *sck)
assert(sck != NULL); assert(sck != NULL);
/* Reenable CONNECTION events */
sck->m_detected &= ~GSOCK_CONNECTION_FLAG; sck->m_detected &= ~GSOCK_CONNECTION_FLAG;
/* If the socket has already been created, we exit immediately */
if (sck->m_fd == INVALID_SOCKET || !sck->m_server) if (sck->m_fd == INVALID_SOCKET || !sck->m_server)
{ {
sck->m_error = GSOCK_INVSOCK; sck->m_error = GSOCK_INVSOCK;
@@ -455,8 +495,134 @@ GSocket *GSocket_WaitConnection(GSocket *sck)
return connection; return connection;
} }
/* Non oriented connections */ /* Client specific parts */
/* GSocket_Connect:
* For stream (connection oriented) sockets, GSocket_Connect() tries
* to establish a client connection to a server using the peer address
* as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
* connection has been succesfully established, or one of the error
* codes listed below. Note that for nonblocking sockets, a return
* value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
* request can be completed later; you should use GSocket_Select()
* to poll for GSOCK_CONNECTION | GSOCK_LOST, or wait for the
* corresponding asynchronous events.
*
* For datagram (non connection oriented) sockets, GSocket_Connect()
* just sets the peer address established with GSocket_SetPeer() as
* default destination.
*
* Error codes:
* GSOCK_INVSOCK - the socket is in use or not valid.
* GSOCK_INVADDR - the peer address has not been established.
* GSOCK_TIMEDOUT - timeout, the connection failed.
* GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
* GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error.
*/
GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
{
int ret, err;
u_long arg = 1;
assert(sck != NULL);
/* Enable CONNECTION events (needed for nonblocking connections) */
sck->m_detected &= ~GSOCK_CONNECTION_FLAG;
if (sck->m_fd != INVALID_SOCKET)
{
sck->m_error = GSOCK_INVSOCK;
return GSOCK_INVSOCK;
}
if (!sck->m_peer)
{
sck->m_error = GSOCK_INVADDR;
return GSOCK_INVADDR;
}
/* Streamed or dgram socket? */
sck->m_stream = (stream == GSOCK_STREAMED);
sck->m_oriented = TRUE;
sck->m_server = FALSE;
/* Create the socket */
sck->m_fd = socket(sck->m_peer->m_realfamily,
sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0);
if (sck->m_fd == INVALID_SOCKET)
{
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &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);
if (ret == SOCKET_ERROR)
{
err = WSAGetLastError();
/* If connect failed with EWOULDBLOCK and the GSocket object
* is in blocking mode, we select() for the specified timeout
* checking for writability to see if the connection request
* completes.
*/
if ((err == WSAEWOULDBLOCK) && (!sck->m_non_blocking))
{
err = _GSocket_Connect_Timeout(sck);
if (err != GSOCK_NOERROR)
{
closesocket(sck->m_fd);
sck->m_fd = INVALID_SOCKET;
/* sck->m_error is set in _GSocket_Connect_Timeout */
}
return err;
}
/* If connect failed with EWOULDBLOCK and the GSocket object
* is set to nonblocking, we set m_error to GSOCK_WOULDBLOCK
* (and return GSOCK_WOULDBLOCK) but we don't close the socket;
* this way if the connection completes, a GSOCK_CONNECTION
* event will be generated, if enabled.
*/
if ((err == WSAEWOULDBLOCK) && (sck->m_non_blocking))
{
sck->m_error = GSOCK_WOULDBLOCK;
return GSOCK_WOULDBLOCK;
}
/* If connect failed with an error other than EWOULDBLOCK,
* then the call to GSocket_Connect() has failed.
*/
closesocket(sck->m_fd);
sck->m_fd = INVALID_SOCKET;
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
return GSOCK_NOERROR;
}
/* Datagram sockets */
/* GSocket_SetNonOriented:
* Sets up this socket as a non-connection oriented (datagram) socket.
* Before using this function, the local address must have been set
* with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR
* on success, or one of the following otherwise.
*
* Error codes:
* GSOCK_INVSOCK - the socket is in use.
* GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error.
*/
GSocketError GSocket_SetNonOriented(GSocket *sck) GSocketError GSocket_SetNonOriented(GSocket *sck)
{ {
u_long arg = 1; u_long arg = 1;
@@ -492,8 +658,13 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &arg); ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &arg);
_GSocket_Enable_Events(sck); _GSocket_Enable_Events(sck);
/* Bind it to the LOCAL address */ /* Bind to the local address,
if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) * and retrieve the actual address bound.
*/
if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
(getsockname(sck->m_fd,
sck->m_local->m_addr,
&sck->m_local->m_len) != 0))
{ {
closesocket(sck->m_fd); closesocket(sck->m_fd);
sck->m_fd = INVALID_SOCKET; sck->m_fd = INVALID_SOCKET;
@@ -504,123 +675,6 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
GSocketError GSocket_SetBroadcast(GSocket *sck)
{
BOOL b = TRUE;
assert(sck != NULL);
if (GSocket_SetNonOriented(sck) != GSOCK_NOERROR)
return sck->m_error;
setsockopt(sck->m_fd, SOL_SOCKET, SO_BROADCAST,
(const char FAR *) &b, sizeof(b));
return GSOCK_NOERROR;
}
/* Client specific parts */
/* GSocket_Connect:
* Establishes a client connection to a server using the "Peer"
* field of GSocket. "Peer" must be set by GSocket_SetPeer() before
* GSocket_Connect() is called. Possible error codes are GSOCK_INVSOCK,
* GSOCK_INVADDR, GSOCK_TIMEDOUT, GSOCK_WOULDBLOCK and GSOCK_IOERR.
* If a socket is nonblocking and Connect() returns GSOCK_WOULDBLOCK,
* the connection request can be completed later. Use GSocket_Select()
* to check or wait for a GSOCK_CONNECTION event.
*/
GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
{
u_long arg = 1;
int type, ret, err;
assert(sck != NULL);
sck->m_detected &= ~GSOCK_CONNECTION_FLAG;
if (sck->m_fd != INVALID_SOCKET)
{
sck->m_error = GSOCK_INVSOCK;
return GSOCK_INVSOCK;
}
if (!sck->m_peer)
{
sck->m_error = GSOCK_INVADDR;
return GSOCK_INVADDR;
}
/* Test whether we want the socket to be a stream (e.g. TCP) */
sck->m_stream = (stream == GSOCK_STREAMED);
sck->m_oriented = TRUE;
sck->m_server = FALSE;
if (sck->m_stream)
type = SOCK_STREAM;
else
type = SOCK_DGRAM;
/* Create the socket */
sck->m_fd = socket(sck->m_peer->m_realfamily, type, 0);
if (sck->m_fd == INVALID_SOCKET)
{
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &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);
if (ret == SOCKET_ERROR)
{
err = WSAGetLastError();
/* If connect failed with EWOULDBLOCK and the GSocket object
* is in blocking mode, we select() for the specified timeout
* checking for writability to see if the connection request
* completes.
*/
if ((err == WSAEWOULDBLOCK) && (!sck->m_non_blocking))
{
if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
{
closesocket(sck->m_fd);
sck->m_fd = INVALID_SOCKET;
/* sck->m_error is set in _GSocket_Output_Timeout */
return GSOCK_TIMEDOUT;
}
else
return GSOCK_NOERROR;
}
/* If connect failed with EWOULDBLOCK and the GSocket object
* is set to nonblocking, we set m_error to GSOCK_WOULDBLOCK
* (and return GSOCK_WOULDBLOCK) but we don't close the socket;
* this way if the connection completes, a GSOCK_CONNECTION
* event will be generated, if enabled.
*/
if ((err == WSAEWOULDBLOCK) && (sck->m_non_blocking))
{
sck->m_error = GSOCK_WOULDBLOCK;
return GSOCK_WOULDBLOCK;
}
/* If connect failed with an error other than EWOULDBLOCK,
* then the call to GSocket_Connect has failed.
*/
closesocket(sck->m_fd);
sck->m_fd = INVALID_SOCKET;
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
return GSOCK_NOERROR;
}
/* Generic IO */ /* Generic IO */
@@ -631,6 +685,7 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
assert(socket != NULL); assert(socket != NULL);
/* Reenable INPUT events */
socket->m_detected &= ~GSOCK_INPUT_FLAG; socket->m_detected &= ~GSOCK_INPUT_FLAG;
if (socket->m_fd == INVALID_SOCKET || socket->m_server) if (socket->m_fd == INVALID_SOCKET || socket->m_server)
@@ -651,31 +706,11 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
/* NOTE: Window sockets exhibit a very strange property;
* if the socket is in non-blocking mode (which is always
* the case here, no matter the setting of GSocket itself)
* a call to send() can fail with EWOULDBLOCK even when
* select() says that the socket is writable.
*
* This can break several things because, usually, if
* select() says that the socket is writable, it is
* assumed that send() won't fail. To avoid this, we
* return 0 instead of -1 for this special case.
*
* XXX - this comment seems not to belong here, and also
* the code is not consistent with the unix version of
* gsocket... what to do? (GRG)
*/
if (WSAGetLastError() != WSAEWOULDBLOCK) if (WSAGetLastError() != WSAEWOULDBLOCK)
{
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
return -1;
}
else else
{
socket->m_error = GSOCK_WOULDBLOCK; socket->m_error = GSOCK_WOULDBLOCK;
return 0; return -1;
}
} }
return ret; return ret;
@@ -697,7 +732,7 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT) if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT)
return -1; return -1;
/* Read the data */ /* Write the data */
if (socket->m_stream) if (socket->m_stream)
ret = _GSocket_Send_Stream(socket, buffer, size); ret = _GSocket_Send_Stream(socket, buffer, size);
else else
@@ -710,6 +745,11 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
else else
socket->m_error = GSOCK_WOULDBLOCK; socket->m_error = GSOCK_WOULDBLOCK;
/* Only reenable OUTPUT events after an error (just like WSAAsyncSelect
* does). Once the first OUTPUT event is received, users can assume
* that the socket is writable until a read operation fails. Only then
* will further OUTPUT events be posted.
*/
socket->m_detected &= ~GSOCK_OUTPUT_FLAG; socket->m_detected &= ~GSOCK_OUTPUT_FLAG;
return -1; return -1;
} }
@@ -731,11 +771,11 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
return (flags & socket->m_detected); return (flags & socket->m_detected);
} }
/* Flags */ /* Attributes */
/* GSocket_SetNonBlocking: /* GSocket_SetNonBlocking:
* Sets the socket to non-blocking mode. This is useful if * Sets the socket to non-blocking mode. All IO calls will return
* we don't want to wait. * immediately.
*/ */
void GSocket_SetNonBlocking(GSocket *socket, bool non_block) void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
{ {
@@ -745,8 +785,8 @@ void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
} }
/* GSocket_SetTimeout: /* GSocket_SetTimeout:
* Sets the timeout for blocking calls. Time is * Sets the timeout for blocking calls. Time is expressed in
* expressed in milliseconds. * milliseconds.
*/ */
void GSocket_SetTimeout(GSocket *socket, unsigned long millis) void GSocket_SetTimeout(GSocket *socket, unsigned long millis)
{ {
@@ -757,7 +797,9 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millis)
} }
/* GSocket_GetError: /* GSocket_GetError:
* Returns the last error occured for this socket. * Returns the last error occured for this socket. Note that successful
* operations do not clear this back to GSOCK_NOERROR, so use it only
* after an error.
*/ */
GSocketError GSocket_GetError(GSocket *socket) GSocketError GSocket_GetError(GSocket *socket)
{ {
@@ -766,22 +808,27 @@ GSocketError GSocket_GetError(GSocket *socket)
return socket->m_error; return socket->m_error;
} }
/* Callbacks */ /* Callbacks */
/* Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION /* GSOCK_INPUT:
* and LOST). The callbacks are called in the following situations: * There is data to be read in the input buffer. If, after a read
* * operation, there is still data available, the callback function will
* INPUT: There is at least one byte in the input buffer * be called again.
* OUTPUT: The system is sure that the next write call will not block * GSOCK_OUTPUT:
* CONNECTION: Two cases are possible: * The socket is available for writing. That is, the next write call
* Client socket -> the connection is established * won't block. This event is generated only once, when the connection is
* Server socket -> a client requests a connection * first established, and then only if a call failed with GSOCK_WOULDBLOCK,
* LOST: The connection is lost * when the output buffer empties again. This means that the app should
* * assume that it can write since the first OUTPUT event, and no more
* An event is generated only once and its state is reseted when the * OUTPUT events will be generated unless an error occurs.
* relative IO call is requested. * GSOCK_CONNECTION:
* For example: INPUT -> GSocket_Read() * Connection succesfully established, for client sockets, or incoming
* CONNECTION -> GSocket_Accept() * client connection, for server sockets. Wait for this event (also watch
* out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
* GSOCK_LOST:
* The connection is lost (or a connection request failed); this could
* be due to a failure, or due to the peer closing it gracefully.
*/ */
/* GSocket_SetCallback: /* GSocket_SetCallback:
@@ -815,7 +862,7 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
*/ */
void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags) void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
{ {
int count = 0; int count;
assert(socket != NULL); assert(socket != NULL);
@@ -833,9 +880,9 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
/* Internals */ /* Internals */
/* _GSocket_Enable_Events: /* _GSocket_Enable_Events:
* We enable all event notifications here (we need to be notified * Enable all event notifications; we need to be notified of all
* of all events for internal processing) but we will only notify * events for internal processing, but we will only notify users
* users when an appropiate callback function has been installed. * when an appropiate callback function has been installed.
*/ */
void _GSocket_Enable_Events(GSocket *socket) void _GSocket_Enable_Events(GSocket *socket)
{ {
@@ -916,7 +963,9 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
/* OK, we can now leave the critical section because we have /* OK, we can now leave the critical section because we have
* already obtained the callback address (we make no further * already obtained the callback address (we make no further
* accesses to socket->whatever) * accesses to socket->whatever). However, the app should
* be prepared to handle events from a socket that has just
* been closed!
*/ */
LeaveCriticalSection(&critical); LeaveCriticalSection(&critical);
@@ -972,6 +1021,36 @@ GSocketError _GSocket_Output_Timeout(GSocket *socket)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
/* _GSocket_Connect_Timeout:
* For blocking sockets, wait until the connection is
* established or fails, or until timeout ellapses.
*/
GSocketError _GSocket_Connect_Timeout(GSocket *socket)
{
fd_set writefds;
fd_set exceptfds;
if (!socket->m_non_blocking)
{
FD_ZERO(&writefds);
FD_ZERO(&exceptfds);
FD_SET(socket->m_fd, &writefds);
FD_SET(socket->m_fd, &exceptfds);
if (select(0, NULL, &writefds, &exceptfds, &socket->m_timeout) == 0)
{
socket->m_error = GSOCK_TIMEDOUT;
return GSOCK_TIMEDOUT;
}
}
if (!FD_ISSET(socket->m_fd, &writefds))
{
socket->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
return GSOCK_NOERROR;
}
int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
{ {
return recv(socket->m_fd, buffer, size, 0); return recv(socket->m_fd, buffer, size, 0);
@@ -1206,7 +1285,7 @@ GSocketError _GAddress_Init_INET(GAddress *address)
address->m_family = GSOCK_INET; address->m_family = GSOCK_INET;
address->m_realfamily = PF_INET; address->m_realfamily = PF_INET;
((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET; ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_NONE; ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY;
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
@@ -1232,6 +1311,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
/* It is a real name, we solve it */ /* It is a real name, we solve it */
if ((he = gethostbyname(hostname)) == NULL) if ((he = gethostbyname(hostname)) == NULL)
{ {
/* addr->s_addr = INADDR_NONE just done by inet_addr() above */
address->m_error = GSOCK_NOHOST; address->m_error = GSOCK_NOHOST;
return GSOCK_NOHOST; return GSOCK_NOHOST;
} }
@@ -1241,6 +1321,11 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
GSocketError GAddress_INET_SetAnyAddress(GAddress *address)
{
return GAddress_INET_SetHostAddress(address, INADDR_ANY);
}
GSocketError GAddress_INET_SetHostAddress(GAddress *address, GSocketError GAddress_INET_SetHostAddress(GAddress *address,
unsigned long hostaddr) unsigned long hostaddr)
{ {
@@ -1268,7 +1353,7 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
if (!port) if (!port)
{ {
address->m_error = GSOCK_INVPORT; address->m_error = GSOCK_INVPORT;
return GSOCK_INVOP; return GSOCK_INVPORT;
} }
se = getservbyname(port, protocol); se = getservbyname(port, protocol);
@@ -1384,22 +1469,9 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
#else /* !wxUSE_SOCKETS */ #else /* !wxUSE_SOCKETS */
/* /*
* translation unit shouldn't be empty, so include this typedef to make the * Translation unit shouldn't be empty, so include this typedef to make the
* compiler (VC++ 6.0, for example) happy * compiler (VC++ 6.0, for example) happy
*/ */
typedef (*wxDummy)(); typedef (*wxDummy)();
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ #endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
/* Diferencias con la version Unix:
* - El descriptor es SOCKET y no int
* - Constantes -1 pasan a INVALID_SOCKET
* - Errores en muchas funciones pasan de -1 o <0 a SOCKET_ERROR
* - ioctl y close pasan a ioctlsocket y closesocket
* - inet_addr en lugar de inet_aton
* - Codigo de inicializacion y terminacion para inicializar y
* terminar WinSocket y para la ventana interna.
* - SetTimeout, SetNonBlocking y la implementacion de los
* timeouts eran bastante diferentes, pero ahora se han
* hecho en la version Unix igual que en esta.
*/

388
src/unix/gsocket.c
View File

@@ -1,19 +1,28 @@
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX * Project: GSocket (Generic Socket) for WX
* Name: gsocket.c * Name: gsocket.c
* Authors: Guilhem Lavaux,
* Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
* Purpose: GSocket main Unix file * Purpose: GSocket main Unix file
* CVSID: $Id$ * CVSID: $Id$
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
#include "wx/setup.h" /*
* PLEASE don't put C++ comments here - this is a C source file.
*/
#if wxUSE_SOCKETS #ifndef __GSOCKET_STANDALONE__
#include "wx/setup.h"
#endif
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
#include <assert.h> #include <assert.h>
#include <sys/types.h> #include <sys/types.h>
#include <netdb.h> #include <netdb.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#ifdef __VMS__ #ifdef __VMS__
#include <socket.h> #include <socket.h>
struct sockaddr_un { struct sockaddr_un {
@@ -25,30 +34,25 @@ struct sockaddr_un {
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#endif #endif
#include <sys/time.h> #include <sys/time.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <ctype.h> #include <ctype.h>
#ifdef sun #ifdef sun
# include <sys/filio.h> # include <sys/filio.h>
#endif #endif
#ifdef sgi #ifdef sgi
# include <bstring.h> # include <bstring.h>
#endif #endif
#include <signal.h> #include <signal.h>
#include "wx/gsocket.h"
#include "wx/unix/gsockunx.h"
#ifndef SOCKLEN_T #ifndef SOCKLEN_T
@@ -66,6 +70,15 @@ struct sockaddr_un {
#endif /* SOCKLEN_T */ #endif /* SOCKLEN_T */
/*
* INADDR_BROADCAST is identical to INADDR_NONE which is not defined
* on all unices. INADDR_BROADCAST should be fine to indicate an error.
*/
#ifndef INADDR_NONE
#define INADDR_NONE INADDR_BROADCAST
#endif
#define MASK_SIGNAL() \ #define MASK_SIGNAL() \
{ \ { \
void (*old_handler)(int); \ void (*old_handler)(int); \
@@ -77,6 +90,19 @@ struct sockaddr_un {
} }
#ifndef __GSOCKET_STANDALONE__
#include "wx/gsocket.h"
#include "wx/unix/gsockunx.h"
#else
#include "gsocket.h"
#include "gsockunx.h"
#endif /* __GSOCKET_STANDALONE__ */
/* Global initialisers */ /* Global initialisers */
bool GSocket_Init() bool GSocket_Init()
@@ -88,7 +114,7 @@ void GSocket_Cleanup()
{ {
} }
/* Constructors / Destructors */ /* Constructors / Destructors for GSocket */
GSocket *GSocket_new() GSocket *GSocket_new()
{ {
@@ -127,31 +153,35 @@ void GSocket_destroy(GSocket *socket)
{ {
assert(socket != NULL); assert(socket != NULL);
/* First, we check that the socket is really shutdowned */ /* Check that the socket is really shutdowned */
if (socket->m_fd != -1) if (socket->m_fd != -1)
GSocket_Shutdown(socket); GSocket_Shutdown(socket);
/* We destroy GUI specific variables */ /* We destroy GUI specific variables */
_GSocket_GUI_Destroy(socket); _GSocket_GUI_Destroy(socket);
/* We destroy private addresses */ /* Destroy private addresses */
if (socket->m_local) if (socket->m_local)
GAddress_destroy(socket->m_local); GAddress_destroy(socket->m_local);
if (socket->m_peer) if (socket->m_peer)
GAddress_destroy(socket->m_peer); GAddress_destroy(socket->m_peer);
/* We destroy socket itself */ /* Destroy the socket itself */
free(socket); free(socket);
} }
/* GSocket_Shutdown:
* Disallow further read/write operations on this socket, close
* the fd and disable all callbacks.
*/
void GSocket_Shutdown(GSocket *socket) void GSocket_Shutdown(GSocket *socket)
{ {
int evt; int evt;
assert(socket != NULL); assert(socket != NULL);
/* If socket has been created, we shutdown it */ /* If socket has been created, shutdown it */
if (socket->m_fd != -1) if (socket->m_fd != -1)
{ {
shutdown(socket->m_fd, 2); shutdown(socket->m_fd, 2);
@@ -159,7 +189,7 @@ void GSocket_Shutdown(GSocket *socket)
socket->m_fd = -1; socket->m_fd = -1;
} }
/* We also disable GUI callbacks */ /* Disable GUI callbacks */
for (evt = 0; evt < GSOCK_MAX_EVENT; evt++) for (evt = 0; evt < GSOCK_MAX_EVENT; evt++)
socket->m_cbacks[evt] = NULL; socket->m_cbacks[evt] = NULL;
@@ -169,16 +199,34 @@ void GSocket_Shutdown(GSocket *socket)
/* Address handling */ /* Address handling */
/* GSocket_SetLocal:
* GSocket_GetLocal:
* GSocket_SetPeer:
* GSocket_GetPeer:
* Set or get the local or peer address for this socket. The 'set'
* functions return GSOCK_NOERROR on success, an error code otherwise.
* The 'get' functions return a pointer to a GAddress object on success,
* or NULL otherwise, in which case they set the error code of the
* corresponding GSocket.
*
* Error codes:
* GSOCK_INVSOCK - the socket is not valid.
* GSOCK_INVADDR - the address is not valid.
*/
GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address) GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
{ {
assert(socket != NULL); assert(socket != NULL);
if ((socket->m_fd != -1 && !socket->m_server)) { /* the socket must be initialized, or it must be a server */
if ((socket->m_fd != -1 && !socket->m_server))
{
socket->m_error = GSOCK_INVSOCK; socket->m_error = GSOCK_INVSOCK;
return GSOCK_INVSOCK; return GSOCK_INVSOCK;
} }
if (address == NULL || address->m_family == GSOCK_NOFAMILY) { /* check address */
if (address == NULL || address->m_family == GSOCK_NOFAMILY)
{
socket->m_error = GSOCK_INVADDR; socket->m_error = GSOCK_INVADDR;
return GSOCK_INVADDR; return GSOCK_INVADDR;
} }
@@ -195,7 +243,9 @@ GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
{ {
assert(socket != NULL); assert(socket != NULL);
if (address == NULL || address->m_family == GSOCK_NOFAMILY) { /* check address */
if (address == NULL || address->m_family == GSOCK_NOFAMILY)
{
socket->m_error = GSOCK_INVADDR; socket->m_error = GSOCK_INVADDR;
return GSOCK_INVADDR; return GSOCK_INVADDR;
} }
@@ -217,28 +267,34 @@ GAddress *GSocket_GetLocal(GSocket *socket)
assert(socket != NULL); assert(socket != NULL);
/* try to get it from the m_local var first */
if (socket->m_local) if (socket->m_local)
return GAddress_copy(socket->m_local); return GAddress_copy(socket->m_local);
if (socket->m_fd == -1) { /* else, if the socket is initialized, try getsockname */
if (socket->m_fd == -1)
{
socket->m_error = GSOCK_INVSOCK; socket->m_error = GSOCK_INVSOCK;
return NULL; return NULL;
} }
size = sizeof(addr); if (getsockname(socket->m_fd, &addr, (SOCKLEN_T *) &size) < 0)
{
if (getsockname(socket->m_fd, &addr, (SOCKLEN_T *) &size) < 0) {
socket->m_error = GSOCK_IOERR; socket->m_error = GSOCK_IOERR;
return NULL; return NULL;
} }
/* got a valid address from getsockname, create a GAddress object */
address = GAddress_new(); address = GAddress_new();
if (address == NULL) { if (address == NULL)
{
socket->m_error = GSOCK_MEMERR; socket->m_error = GSOCK_MEMERR;
return NULL; return NULL;
} }
err = _GAddress_translate_from(address, &addr, size); /*xxx*/
if (err != GSOCK_NOERROR) { err = _GAddress_translate_from(address, &addr, size);
if (err != GSOCK_NOERROR)
{
GAddress_destroy(address); GAddress_destroy(address);
socket->m_error = err; socket->m_error = err;
return NULL; return NULL;
@@ -251,6 +307,7 @@ GAddress *GSocket_GetPeer(GSocket *socket)
{ {
assert(socket != NULL); assert(socket != NULL);
/* try to get it from the m_peer var */
if (socket->m_peer) if (socket->m_peer)
return GAddress_copy(socket->m_peer); return GAddress_copy(socket->m_peer);
@@ -260,11 +317,14 @@ GAddress *GSocket_GetPeer(GSocket *socket)
/* Server specific parts */ /* Server specific parts */
/* GSocket_SetServer: /* GSocket_SetServer:
* Sets up the socket as a server. It uses the "Local" field of GSocket. * Sets up this socket as a server. The local address must have been
* "Local" must be set by GSocket_SetLocal() before GSocket_SetServer() * set with GSocket_SetLocal() before GSocket_SetServer() is called.
* is called. Possible error codes are: GSOCK_INVSOCK if socket has not * Returns GSOCK_NOERROR on success, one of the following otherwise:
* been initialized, GSOCK_INVADDR if the local address has not been *
* defined and GSOCK_IOERR for other internal errors. * Error codes:
* GSOCK_INVSOCK - the socket is in use.
* GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocket_SetServer(GSocket *sck) GSocketError GSocket_SetServer(GSocket *sck)
{ {
@@ -273,24 +333,30 @@ GSocketError GSocket_SetServer(GSocket *sck)
assert(sck != NULL); assert(sck != NULL);
if (sck->m_fd != -1) { /* must not be in use */
if (sck->m_fd != -1)
{
sck->m_error = GSOCK_INVSOCK; sck->m_error = GSOCK_INVSOCK;
return GSOCK_INVSOCK; return GSOCK_INVSOCK;
} }
if (!sck->m_local) { /* the local addr must have been set */
if (!sck->m_local)
{
sck->m_error = GSOCK_INVADDR; sck->m_error = GSOCK_INVADDR;
return GSOCK_INVADDR; return GSOCK_INVADDR;
} }
/* We always have a stream here */ /* Initialize all fields */
sck->m_stream = TRUE; sck->m_stream = TRUE;
sck->m_server = TRUE; sck->m_server = TRUE;
sck->m_oriented = TRUE;
/* Create the socket */ /* Create the socket */
sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0); sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);
if (sck->m_fd == -1) { if (sck->m_fd == -1)
{
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR; return GSOCK_IOERR;
} }
@@ -298,16 +364,16 @@ GSocketError GSocket_SetServer(GSocket *sck)
ioctl(sck->m_fd, FIONBIO, &arg); ioctl(sck->m_fd, FIONBIO, &arg);
_GSocket_Enable_Events(sck); _GSocket_Enable_Events(sck);
/* Bind the socket to the LOCAL address */ /* Bind to the local address,
if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) { * retrieve the actual address bound,
close(sck->m_fd); * and listen up to 5 connections.
sck->m_fd = -1; */
sck->m_error = GSOCK_IOERR; if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
return GSOCK_IOERR; (getsockname(sck->m_fd,
} sck->m_local->m_addr,
(SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
/* Enable listening up to 5 connections */ (listen(sck->m_fd, 5) != 0))
if (listen(sck->m_fd, 5) < 0) { {
close(sck->m_fd); close(sck->m_fd);
sck->m_fd = -1; sck->m_fd = -1;
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
@@ -318,7 +384,16 @@ GSocketError GSocket_SetServer(GSocket *sck)
} }
/* GSocket_WaitConnection: /* GSocket_WaitConnection:
* Waits for an incoming client connection. * Waits for an incoming client connection. Returns a pointer to
* a GSocket object, or NULL if there was an error, in which case
* the last error field will be updated for the calling GSocket.
*
* Error codes (set in the calling GSocket)
* GSOCK_INVSOCK - the socket is not valid or not a server.
* GSOCK_TIMEDOUT - timeout, no incoming connections.
* GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
* GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error.
*/ */
GSocket *GSocket_WaitConnection(GSocket *socket) GSocket *GSocket_WaitConnection(GSocket *socket)
{ {
@@ -342,13 +417,14 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
/* Create a GSocket object for the new connection */ /* Create a GSocket object for the new connection */
connection = GSocket_new(); connection = GSocket_new();
if (!connection) if (!connection)
{ {
socket->m_error = GSOCK_MEMERR; socket->m_error = GSOCK_MEMERR;
return NULL; return NULL;
} }
/* Accept the incoming connection */ /* Wait for a connection (with timeout) */
if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT) if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
{ {
GSocket_destroy(connection); GSocket_destroy(connection);
@@ -374,7 +450,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
connection->m_stream = TRUE; connection->m_stream = TRUE;
connection->m_oriented = TRUE; connection->m_oriented = TRUE;
/* Setup the peer address field */ /*xxx*/ /* Setup the peer address field */
connection->m_peer = GAddress_new(); connection->m_peer = GAddress_new();
if (!connection->m_peer) if (!connection->m_peer)
{ {
@@ -397,24 +473,38 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
return connection; return connection;
} }
/* Non oriented connections */ /* Datagram sockets */
/* GSocket_SetNonOriented:
* Sets up this socket as a non-connection oriented (datagram) socket.
* Before using this function, the local address must have been set
* with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR
* on success, or one of the following otherwise.
*
* Error codes:
* GSOCK_INVSOCK - the socket is in use.
* GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error.
*/
GSocketError GSocket_SetNonOriented(GSocket *sck) GSocketError GSocket_SetNonOriented(GSocket *sck)
{ {
int arg = 1; int arg = 1;
assert(sck != NULL); assert(sck != NULL);
if (sck->m_fd != -1) { if (sck->m_fd != -1)
{
sck->m_error = GSOCK_INVSOCK; sck->m_error = GSOCK_INVSOCK;
return GSOCK_INVSOCK; return GSOCK_INVSOCK;
} }
if (!sck->m_local) { if (!sck->m_local)
{
sck->m_error = GSOCK_INVADDR; sck->m_error = GSOCK_INVADDR;
return GSOCK_INVADDR; return GSOCK_INVADDR;
} }
/* Initialize all fields */
sck->m_stream = FALSE; sck->m_stream = FALSE;
sck->m_server = FALSE; sck->m_server = FALSE;
sck->m_oriented = FALSE; sck->m_oriented = FALSE;
@@ -422,7 +512,8 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
/* Create the socket */ /* Create the socket */
sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0); sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0);
if (sck->m_fd < 0) { if (sck->m_fd < 0)
{
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR; return GSOCK_IOERR;
} }
@@ -430,8 +521,14 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
ioctl(sck->m_fd, FIONBIO, &arg); ioctl(sck->m_fd, FIONBIO, &arg);
_GSocket_Enable_Events(sck); _GSocket_Enable_Events(sck);
/* Bind it to the LOCAL address */ /* Bind to the local address,
if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) { * and retrieve the actual address bound.
*/
if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
(getsockname(sck->m_fd,
sck->m_local->m_addr,
(SOCKLEN_T *) &sck->m_local->m_len) != 0))
{
close(sck->m_fd); close(sck->m_fd);
sck->m_fd = -1; sck->m_fd = -1;
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
@@ -444,17 +541,31 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
/* Client specific parts */ /* Client specific parts */
/* GSocket_Connect: /* GSocket_Connect:
* Establishes a client connection to a server using the "Peer" * For stream (connection oriented) sockets, GSocket_Connect() tries
* field of GSocket. "Peer" must be set by GSocket_SetPeer() before * to establish a client connection to a server using the peer address
* GSocket_Connect() is called. Possible error codes are GSOCK_INVSOCK, * as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
* GSOCK_INVADDR, GSOCK_TIMEDOUT, GSOCK_WOULDBLOCK and GSOCK_IOERR. * connection has been succesfully established, or one of the error
* If a socket is nonblocking and Connect() returns GSOCK_WOULDBLOCK, * codes listed below. Note that for nonblocking sockets, a return
* the connection request can be completed later. Use GSocket_Select() * value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
* to check or wait for a GSOCK_CONNECTION event. * request can be completed later; you should use GSocket_Select()
* to poll for GSOCK_CONNECTION | GSOCK_LOST, or wait for the
* corresponding asynchronous events.
*
* For datagram (non connection oriented) sockets, GSocket_Connect()
* just sets the peer address established with GSocket_SetPeer() as
* default destination.
*
* Error codes:
* GSOCK_INVSOCK - the socket is in use or not valid.
* GSOCK_INVADDR - the peer address has not been established.
* GSOCK_TIMEDOUT - timeout, the connection failed.
* GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
* GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error.
*/ */
GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
{ {
int type, err, ret; int err, ret;
int arg = 1; int arg = 1;
assert(sck != NULL); assert(sck != NULL);
@@ -474,21 +585,18 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
return GSOCK_INVADDR; return GSOCK_INVADDR;
} }
/* Test whether we want the socket to be a stream (e.g. TCP) */ /* Streamed or dgram socket? */
sck->m_stream = (stream == GSOCK_STREAMED); sck->m_stream = (stream == GSOCK_STREAMED);
sck->m_oriented = TRUE; sck->m_oriented = TRUE;
sck->m_server = FALSE; sck->m_server = FALSE;
sck->m_establishing = FALSE; sck->m_establishing = FALSE;
if (sck->m_stream)
type = SOCK_STREAM;
else
type = SOCK_DGRAM;
/* Create the socket */ /* Create the socket */
sck->m_fd = socket(sck->m_peer->m_realfamily, type, 0); sck->m_fd = socket(sck->m_peer->m_realfamily,
sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0);
if (sck->m_fd == -1) { if (sck->m_fd == -1)
{
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR; return GSOCK_IOERR;
} }
@@ -496,7 +604,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
ioctl(sck->m_fd, FIONBIO, &arg); ioctl(sck->m_fd, FIONBIO, &arg);
_GSocket_Enable_Events(sck); _GSocket_Enable_Events(sck);
/* Connect it to the PEER address */ /* 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);
if (ret == -1) if (ret == -1)
@@ -519,6 +627,12 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
} }
else else
{ {
int error;
SOCKLEN_T len = sizeof(error);
getsockopt(sck->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
if (!error)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
} }
@@ -531,9 +645,8 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
*/ */
if ((err == EINPROGRESS) && (sck->m_non_blocking)) if ((err == EINPROGRESS) && (sck->m_non_blocking))
{ {
sck->m_error = GSOCK_WOULDBLOCK;
sck->m_establishing = TRUE; sck->m_establishing = TRUE;
sck->m_error = GSOCK_WOULDBLOCK;
return GSOCK_WOULDBLOCK; return GSOCK_WOULDBLOCK;
} }
@@ -543,7 +656,6 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
close(sck->m_fd); close(sck->m_fd);
sck->m_fd = -1; sck->m_fd = -1;
sck->m_error = GSOCK_IOERR; sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR; return GSOCK_IOERR;
} }
@@ -568,9 +680,11 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
return -1; return -1;
} }
/* If the socket is blocking, wait for data (with a timeout) */
if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT) if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
return -1; return -1;
/* Read the data */
if (socket->m_stream) if (socket->m_stream)
ret = _GSocket_Recv_Stream(socket, buffer, size); ret = _GSocket_Recv_Stream(socket, buffer, size);
else else
@@ -587,8 +701,7 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
return ret; return ret;
} }
int GSocket_Write(GSocket *socket, const char *buffer, int GSocket_Write(GSocket *socket, const char *buffer, int size)
int size)
{ {
int ret; int ret;
@@ -600,9 +713,11 @@ int GSocket_Write(GSocket *socket, const char *buffer,
return -1; return -1;
} }
/* If the socket is blocking, wait for writability (with a timeout) */
if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT) if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT)
return -1; return -1;
/* Write the data */
if (socket->m_stream) if (socket->m_stream)
ret = _GSocket_Send_Stream(socket, buffer, size); ret = _GSocket_Send_Stream(socket, buffer, size);
else else
@@ -621,6 +736,7 @@ int GSocket_Write(GSocket *socket, const char *buffer,
* will further OUTPUT events be posted. * will further OUTPUT events be posted.
*/ */
_GSocket_Enable(socket, GSOCK_OUTPUT); _GSocket_Enable(socket, GSOCK_OUTPUT);
return -1;
} }
return ret; return ret;
@@ -643,8 +759,8 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
/* Flags */ /* Flags */
/* GSocket_SetNonBlocking: /* GSocket_SetNonBlocking:
* Sets the socket to non-blocking mode. This is useful if * Sets the socket to non-blocking mode. All IO calls will return
* we don't want to wait. * immediately.
*/ */
void GSocket_SetNonBlocking(GSocket *socket, bool non_block) void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
{ {
@@ -654,8 +770,8 @@ void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
} }
/* GSocket_SetTimeout: /* GSocket_SetTimeout:
* Sets the timeout for blocking calls. Time is * Sets the timeout for blocking calls. Time is expressed in
* expressed in milliseconds. * milliseconds.
*/ */
void GSocket_SetTimeout(GSocket *socket, unsigned long millisec) void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
{ {
@@ -665,7 +781,9 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
} }
/* GSocket_GetError: /* GSocket_GetError:
* Returns the last error occured for this socket. * Returns the last error occured for this socket. Note that successful
* operations do not clear this back to GSOCK_NOERROR, so use it only
* after an error.
*/ */
GSocketError GSocket_GetError(GSocket *socket) GSocketError GSocket_GetError(GSocket *socket)
{ {
@@ -676,20 +794,24 @@ GSocketError GSocket_GetError(GSocket *socket)
/* Callbacks */ /* Callbacks */
/* Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION /* GSOCK_INPUT:
* and LOST). The callbacks are called in the following situations: * There is data to be read in the input buffer. If, after a read
* * operation, there is still data available, the callback function will
* INPUT: There is at least one byte in the input buffer * be called again.
* OUTPUT: The system is sure that the next write call will not block * GSOCK_OUTPUT:
* CONNECTION: Two cases are possible: * The socket is available for writing. That is, the next write call
* Client socket -> the connection is established * won't block. This event is generated only once, when the connection is
* Server socket -> a client requests a connection * first established, and then only if a call failed with GSOCK_WOULDBLOCK,
* LOST: The connection is lost * when the output buffer empties again. This means that the app should
* * assume that it can write since the first OUTPUT event, and no more
* An event is generated only once and its state is reseted when the * OUTPUT events will be generated unless an error occurs.
* relative IO call is requested. * GSOCK_CONNECTION:
* For example: INPUT -> GSocket_Read() * Connection succesfully established, for client sockets, or incoming
* CONNECTION -> GSocket_Accept() * client connection, for server sockets. Wait for this event (also watch
* out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
* GSOCK_LOST:
* The connection is lost (or a connection request failed); this could
* be due to a failure, or due to the peer closing it gracefully.
*/ */
/* GSocket_SetCallback: /* GSocket_SetCallback:
@@ -737,6 +859,7 @@ 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]) \
@@ -874,13 +997,15 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
int len, ret; int len, ret;
GSocketError err; GSocketError err;
if (!socket->m_peer) { if (!socket->m_peer)
{
socket->m_error = GSOCK_INVADDR; socket->m_error = GSOCK_INVADDR;
return -1; return -1;
} }
err = _GAddress_translate_to(socket->m_peer, &addr, &len); err = _GAddress_translate_to(socket->m_peer, &addr, &len);
if (err != GSOCK_NOERROR) { if (err != GSOCK_NOERROR)
{
socket->m_error = err; socket->m_error = err;
return -1; return -1;
} }
@@ -900,15 +1025,16 @@ void _GSocket_Detected_Read(GSocket *socket)
char c; char c;
int ret; int ret;
if (socket->m_stream)
{
ret = recv(socket->m_fd, &c, 1, MSG_PEEK); ret = recv(socket->m_fd, &c, 1, MSG_PEEK);
if (socket->m_stream)
{
if (ret < 0 && socket->m_server) if (ret < 0 && socket->m_server)
{ {
CALL_CALLBACK(socket, GSOCK_CONNECTION); CALL_CALLBACK(socket, GSOCK_CONNECTION);
return; return;
} }
}
if (ret > 0) if (ret > 0)
{ {
@@ -919,19 +1045,17 @@ void _GSocket_Detected_Read(GSocket *socket)
CALL_CALLBACK(socket, GSOCK_LOST); CALL_CALLBACK(socket, GSOCK_LOST);
} }
} }
}
void _GSocket_Detected_Write(GSocket *socket) void _GSocket_Detected_Write(GSocket *socket)
{ {
if (socket->m_establishing && !socket->m_server) if (socket->m_establishing && !socket->m_server)
{ {
int error, len; int error;
SOCKLEN_T len = sizeof(error);
socket->m_establishing = FALSE; socket->m_establishing = FALSE;
len = sizeof(error); getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error,
(SOCKLEN_T *) &len);
if (error) if (error)
{ {
@@ -959,17 +1083,17 @@ void _GSocket_Detected_Write(GSocket *socket)
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
/* CHECK_ADDRESS verifies that the current family is either GSOCK_NOFAMILY or /* CHECK_ADDRESS verifies that the current family is either GSOCK_NOFAMILY
* GSOCK_*family*. In case it is GSOCK_NOFAMILY, it initializes address to be * or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it initalizes address
* a GSOCK_*family*. In other cases, it returns GSOCK_INVADDR. * to be a GSOCK_*family*. In other cases, it returns GSOCK_INVADDR.
*/ */
#define CHECK_ADDRESS(address, family, retval) \ #define CHECK_ADDRESS(address, family, retval) \
{ \ { \
if (address->m_family == GSOCK_NOFAMILY) \ if (address->m_family == GSOCK_NOFAMILY) \
if (_GAddress_Init_##family(address) != GSOCK_NOERROR) {\ if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
return address->m_error; \ return address->m_error; \
}\ if (address->m_family != GSOCK_##family) \
if (address->m_family != GSOCK_##family) {\ { \
address->m_error = GSOCK_INVADDR; \ address->m_error = GSOCK_INVADDR; \
return retval; \ return retval; \
} \ } \
@@ -979,9 +1103,7 @@ GAddress *GAddress_new()
{ {
GAddress *address; GAddress *address;
address = (GAddress *)malloc(sizeof(GAddress)); if ((address = (GAddress *) malloc(sizeof(GAddress))) == NULL)
if (address == NULL)
return NULL; return NULL;
address->m_family = GSOCK_NOFAMILY; address->m_family = GSOCK_NOFAMILY;
@@ -997,16 +1119,16 @@ GAddress *GAddress_copy(GAddress *address)
assert(address != NULL); assert(address != NULL);
addr2 = (GAddress *)malloc(sizeof(GAddress)); if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == NULL)
if (addr2 == NULL)
return NULL; return NULL;
memcpy(addr2, address, sizeof(GAddress)); memcpy(addr2, address, sizeof(GAddress));
if (address->m_addr) { if (address->m_addr)
{
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)
{
free(addr2); free(addr2);
return NULL; return NULL;
} }
@@ -1037,9 +1159,12 @@ GAddressType GAddress_GetFamily(GAddress *address)
return address->m_family; return address->m_family;
} }
GSocketError _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len){ GSocketError _GAddress_translate_from(GAddress *address,
struct sockaddr *addr, int len)
{
address->m_realfamily = addr->sa_family; address->m_realfamily = addr->sa_family;
switch (addr->sa_family) { switch (addr->sa_family)
{
case AF_INET: case AF_INET:
address->m_family = GSOCK_INET; address->m_family = GSOCK_INET;
break; break;
@@ -1063,7 +1188,9 @@ GSocketError _GAddress_translate_from(GAddress *address, struct sockaddr *addr,
address->m_len = len; address->m_len = len;
address->m_addr = (struct sockaddr *)malloc(len); address->m_addr = (struct sockaddr *)malloc(len);
if (address->m_addr == NULL) {
if (address->m_addr == NULL)
{
address->m_error = GSOCK_MEMERR; address->m_error = GSOCK_MEMERR;
return GSOCK_MEMERR; return GSOCK_MEMERR;
} }
@@ -1075,7 +1202,8 @@ GSocketError _GAddress_translate_from(GAddress *address, struct sockaddr *addr,
GSocketError _GAddress_translate_to(GAddress *address, GSocketError _GAddress_translate_to(GAddress *address,
struct sockaddr **addr, int *len) struct sockaddr **addr, int *len)
{ {
if (!address->m_addr) { if (!address->m_addr)
{
address->m_error = GSOCK_INVADDR; address->m_error = GSOCK_INVADDR;
return GSOCK_INVADDR; return GSOCK_INVADDR;
} }
@@ -1110,11 +1238,7 @@ GSocketError _GAddress_Init_INET(GAddress *address)
address->m_family = GSOCK_INET; address->m_family = GSOCK_INET;
address->m_realfamily = PF_INET; address->m_realfamily = PF_INET;
((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET; ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
/* ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY;
INADDR_BROADCAST is identical to INADDR_NONE which is not defined
on all unices. INADDR_BROADCAST should be fine to indicate an error.
*/
((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_BROADCAST;
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
@@ -1135,7 +1259,6 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
if (inet_aton(hostname, addr) == 0) if (inet_aton(hostname, addr) == 0)
{ {
#elif defined(HAVE_INET_ADDR) #elif defined(HAVE_INET_ADDR)
/* Fix from Guillermo Rodriguez Garcia <guille@iies.es> */
if ( (addr->s_addr = inet_addr(hostname)) == -1 ) if ( (addr->s_addr = inet_addr(hostname)) == -1 )
{ {
#else #else
@@ -1148,6 +1271,8 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
/* It is a real name, we solve it */ /* It is a real name, we solve it */
if ((he = gethostbyname(hostname)) == NULL) if ((he = gethostbyname(hostname)) == NULL)
{ {
/* Reset to invalid address */
addr->s_addr = INADDR_NONE;
address->m_error = GSOCK_NOHOST; address->m_error = GSOCK_NOHOST;
return GSOCK_NOHOST; return GSOCK_NOHOST;
} }
@@ -1157,6 +1282,11 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
GSocketError GAddress_INET_SetAnyAddress(GAddress *address)
{
return GAddress_INET_SetHostAddress(address, INADDR_ANY);
}
GSocketError GAddress_INET_SetHostAddress(GAddress *address, GSocketError GAddress_INET_SetHostAddress(GAddress *address,
unsigned long hostaddr) unsigned long hostaddr)
{ {
@@ -1188,7 +1318,8 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
} }
se = getservbyname(port, protocol); se = getservbyname(port, protocol);
if (!se) { if (!se)
{
if (isdigit(port[0])) if (isdigit(port[0]))
{ {
int port_int; int port_int;
@@ -1321,6 +1452,5 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
#endif #endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
/* wxUSE_SOCKETS */