/* -------------------------------------------------------------------------
- * Project: GSocket (Generic Socket)
+ * Project: wxSocketImpl (Generic Socket)
* Name: src/msw/gsocket.cpp
* Copyright: (c) Guilhem Lavaux
* Licence: wxWindows Licence
* Author: Guillermo Rodriguez Garcia <guille@iies.es>
- * Purpose: GSocket main MSW file
+ * Purpose: wxSocketImpl main MSW file
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
#if wxUSE_SOCKETS
-#include "wx/private/gsocket.h"
+#include "wx/private/socket.h"
#include "wx/link.h"
wxFORCE_LINK_MODULE(gsockmsw)
#include "wx/private/socket.h"
-bool GSocket_Init()
+/* static */
+wxSocketImpl *wxSocketImpl::Create(wxSocketBase& wxsocket)
{
- WSADATA wsaData;
-
- GSocketManager * const manager = GSocketManager::Get();
- if ( !manager || !manager->OnInit() )
- return false;
-
- /* Initialize WinSocket */
- return WSAStartup((1 << 8) | 1, &wsaData) == 0;
+ return new wxSocketImplMSW(wxsocket);
}
-void GSocket_Cleanup()
+void wxSocketImplMSW::DoClose()
{
- GSocketManager * const manager = GSocketManager::Get();
- if ( manager )
- manager->OnExit();
+ wxSocketManager::Get()->
+ Uninstall_Callback(this, wxSOCKET_MAX_EVENT /* unused anyhow */);
- /* Cleanup WinSocket */
- WSACleanup();
+ closesocket(m_fd);
}
-/* Constructors / Destructors for GSocket */
-
-/* Server specific parts */
-
-/* GSocket_SetServer:
- * Sets up this socket as a server. The local address must have been
- * set with GSocket_SetLocal() before GSocket_SetServer() is called.
- * Returns GSOCK_NOERROR on success, 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::SetServer()
-{
- u_long arg = 1;
-
- /* must not be in use */
- if (m_fd != INVALID_SOCKET)
- {
- m_error = GSOCK_INVSOCK;
- return GSOCK_INVSOCK;
- }
-
- /* the local addr must have been set */
- if (!m_local)
- {
- m_error = GSOCK_INVADDR;
- return GSOCK_INVADDR;
- }
-
- /* Initialize all fields */
- m_server = true;
- m_stream = true;
-
- /* Create the socket */
- m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0);
-
- if (m_fd == INVALID_SOCKET)
- {
- m_error = GSOCK_IOERR;
- return GSOCK_IOERR;
- }
-
- ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);
- GSocketManager::Get()->Install_Callback(this);
-
- /* allow a socket to re-bind if the socket is in the TIME_WAIT
- state after being previously closed.
- */
- if (m_reusable)
- {
- setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
- }
-
- /* Bind to the local address,
- * retrieve the actual address bound,
- * and listen up to 5 connections.
- */
- if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
- (getsockname(m_fd,
- m_local->m_addr,
- (WX_SOCKLEN_T *)&m_local->m_len) != 0) ||
- (listen(m_fd, 5) != 0))
- {
- Close();
- m_error = GSOCK_IOERR;
- return GSOCK_IOERR;
- }
-
- return GSOCK_NOERROR;
-}
-
-/* GSocket_WaitConnection:
+/*
* 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.
+ * a wxSocketImpl object, or NULL if there was an error, in which case
+ * the last error field will be updated for the calling wxSocketImpl.
*
- * 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.
+ * Error codes (set in the calling wxSocketImpl)
+ * wxSOCKET_INVSOCK - the socket is not valid or not a server.
+ * wxSOCKET_TIMEDOUT - timeout, no incoming connections.
+ * wxSOCKET_WOULDBLOCK - the call would block and the socket is nonblocking.
+ * wxSOCKET_MEMERR - couldn't allocate memory.
+ * wxSOCKET_IOERR - low-level error.
*/
-GSocket *GSocket::WaitConnection(wxSocketBase& wxsocket)
+wxSocketImpl *wxSocketImplMSW::WaitConnection(wxSocketBase& wxsocket)
{
- GSocket *connection;
+ wxSocketImpl *connection;
wxSockAddr from;
WX_SOCKLEN_T fromlen = sizeof(from);
- GSocketError err;
+ wxSocketError err;
u_long arg = 1;
/* Reenable CONNECTION events */
- m_detected &= ~GSOCK_CONNECTION_FLAG;
+ m_detected &= ~wxSOCKET_CONNECTION_FLAG;
/* If the socket has already been created, we exit immediately */
if (m_fd == INVALID_SOCKET || !m_server)
{
- m_error = GSOCK_INVSOCK;
+ m_error = wxSOCKET_INVSOCK;
return NULL;
}
- /* Create a GSocket object for the new connection */
- connection = GSocket::Create(wxsocket);
+ /* Create a wxSocketImpl object for the new connection */
+ connection = wxSocketImplMSW::Create(wxsocket);
if (!connection)
{
- m_error = GSOCK_MEMERR;
+ m_error = wxSOCKET_MEMERR;
return NULL;
}
/* Wait for a connection (with timeout) */
- if (Input_Timeout() == GSOCK_TIMEDOUT)
+ if (Input_Timeout() == wxSOCKET_TIMEDOUT)
{
delete connection;
- /* m_error set by _GSocket_Input_Timeout */
+ /* m_error set by Input_Timeout */
return NULL;
}
if (connection->m_fd == INVALID_SOCKET)
{
if (WSAGetLastError() == WSAEWOULDBLOCK)
- m_error = GSOCK_WOULDBLOCK;
+ m_error = wxSOCKET_WOULDBLOCK;
else
- m_error = GSOCK_IOERR;
+ m_error = wxSOCKET_IOERR;
delete connection;
return NULL;
if (!connection->m_peer)
{
delete connection;
- m_error = GSOCK_MEMERR;
+ m_error = wxSOCKET_MEMERR;
return NULL;
}
err = _GAddress_translate_from(connection->m_peer, (sockaddr*)&from, fromlen);
- if (err != GSOCK_NOERROR)
+ if (err != wxSOCKET_NOERROR)
{
GAddress_destroy(connection->m_peer);
delete connection;
}
ioctlsocket(connection->m_fd, FIONBIO, (u_long FAR *) &arg);
- GSocketManager::Get()->Install_Callback(connection);
+ wxSocketManager::Get()->Install_Callback(connection);
return connection;
}
-/* GSocket_SetReusable:
-* Simply sets the m_resuable flag on the socket. GSocket_SetServer will
-* make the appropriate setsockopt() call.
-* Implemented as a GSocket function because clients (ie, wxSocketServer)
-* don't have access to the GSocket struct information.
-* Returns true if the flag was set correctly, false if an error occurred
-* (ie, if the parameter was NULL)
-*/
-bool GSocket::SetReusable()
+wxSocketError wxSocketImplMSW::DoHandleConnect(int ret)
{
- /* socket must not be null, and must not be in use/already bound */
- if (this && m_fd == INVALID_SOCKET) {
- m_reusable = true;
- return true;
- }
- return false;
-}
-
-/* GSocket_SetBroadcast:
-* Simply sets the m_broadcast flag on the socket. GSocket_SetServer will
-* make the appropriate setsockopt() call.
-* Implemented as a GSocket function because clients (ie, wxSocketServer)
-* don't have access to the GSocket struct information.
-* Returns true if the flag was set correctly, false if an error occurred
-* (ie, if the parameter was NULL)
-*/
-bool GSocket::SetBroadcast()
-{
- /* socket must not be in use/already bound */
- if (m_fd == INVALID_SOCKET) {
- m_broadcast = true;
- return true;
- }
- return false;
-}
-
-bool GSocket::DontDoBind()
-{
- /* socket must not be in use/already bound */
- if (m_fd == INVALID_SOCKET) {
- m_dobind = false;
- return true;
- }
- return false;
-}
-
-/* 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 successfully 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(GSocketStream stream)
-{
- int ret, err;
- u_long arg = 1;
-
- /* Enable CONNECTION events (needed for nonblocking connections) */
- m_detected &= ~GSOCK_CONNECTION_FLAG;
-
- if (m_fd != INVALID_SOCKET)
- {
- m_error = GSOCK_INVSOCK;
- return GSOCK_INVSOCK;
- }
-
- if (!m_peer)
- {
- m_error = GSOCK_INVADDR;
- return GSOCK_INVADDR;
- }
-
- /* Streamed or dgram socket? */
- m_stream = (stream == GSOCK_STREAMED);
- m_server = false;
- m_establishing = false;
-
- /* Create the socket */
- m_fd = socket(m_peer->m_realfamily,
- m_stream? SOCK_STREAM : SOCK_DGRAM, 0);
-
- if (m_fd == INVALID_SOCKET)
- {
- m_error = GSOCK_IOERR;
- return GSOCK_IOERR;
- }
-
- ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);
- GSocketManager::Get()->Install_Callback(this);
-
- // If the reuse flag is set, use the applicable socket reuse flag
- if (m_reusable)
- {
- setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
- }
-
- if (m_initialRecvBufferSize >= 0)
- setsockopt(m_fd, SOL_SOCKET, SO_RCVBUF, (const char*)&m_initialRecvBufferSize, sizeof(m_initialRecvBufferSize));
- if (m_initialSendBufferSize >= 0)
- setsockopt(m_fd, SOL_SOCKET, SO_SNDBUF, (const char*)&m_initialSendBufferSize, sizeof(m_initialSendBufferSize));
-
- // If a local address has been set, then we need to bind to it before calling connect
- if (m_local && m_local->m_addr)
- {
- bind(m_fd, m_local->m_addr, m_local->m_len);
- }
-
- /* Connect it to the peer address, with a timeout (see below) */
- ret = connect(m_fd, m_peer->m_addr, 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) && (!m_non_blocking))
+ // TODO: review this
+ if (ret == SOCKET_ERROR)
{
- err = Connect_Timeout();
-
- if (err != GSOCK_NOERROR)
- {
+ int err = WSAGetLastError();
+
+ /* If connect failed with EWOULDBLOCK and the wxSocketImpl object
+ * is in blocking mode, we select() for the specified timeout
+ * checking for writability to see if the connection request
+ * completes.
+ */
+ if ((err == WSAEWOULDBLOCK) && (!m_non_blocking))
+ {
+ err = Connect_Timeout();
+
+ if (err != wxSOCKET_NOERROR)
+ {
+ Close();
+ /* m_error is set in Connect_Timeout */
+ }
+
+ return (wxSocketError) err;
+ }
+
+ /* If connect failed with EWOULDBLOCK and the wxSocketImpl object
+ * is set to nonblocking, we set m_error to wxSOCKET_WOULDBLOCK
+ * (and return wxSOCKET_WOULDBLOCK) but we don't close the socket;
+ * this way if the connection completes, a wxSOCKET_CONNECTION
+ * event will be generated, if enabled.
+ */
+ if ((err == WSAEWOULDBLOCK) && (m_non_blocking))
+ {
+ m_establishing = true;
+ m_error = wxSOCKET_WOULDBLOCK;
+ return wxSOCKET_WOULDBLOCK;
+ }
+
+ /* If connect failed with an error other than EWOULDBLOCK,
+ * then the call to Connect() has failed.
+ */
Close();
- /* m_error is set in _GSocket_Connect_Timeout */
- }
-
- return (GSocketError) 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) && (m_non_blocking))
- {
- m_establishing = true;
- m_error = GSOCK_WOULDBLOCK;
- return GSOCK_WOULDBLOCK;
- }
-
- /* If connect failed with an error other than EWOULDBLOCK,
- * then the call to GSocket_Connect() has failed.
- */
- Close();
- 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()
-{
- u_long arg = 1;
-
- if (m_fd != INVALID_SOCKET)
- {
- m_error = GSOCK_INVSOCK;
- return GSOCK_INVSOCK;
- }
-
- if (!m_local)
- {
- m_error = GSOCK_INVADDR;
- return GSOCK_INVADDR;
- }
-
- /* Initialize all fields */
- m_stream = false;
- m_server = false;
-
- /* Create the socket */
- m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0);
-
- if (m_fd == INVALID_SOCKET)
- {
- m_error = GSOCK_IOERR;
- return GSOCK_IOERR;
- }
-
- ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg);
- GSocketManager::Get()->Install_Callback(this);
-
- if (m_reusable)
- {
- setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(arg));
- }
- if (m_broadcast)
- {
- setsockopt(m_fd, SOL_SOCKET, SO_BROADCAST, (const char*)&arg, sizeof(arg));
- }
- if (m_dobind)
- {
- /* Bind to the local address,
- * and retrieve the actual address bound.
- */
- if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
- (getsockname(m_fd,
- m_local->m_addr,
- (WX_SOCKLEN_T *)&m_local->m_len) != 0))
- {
- Close();
- m_error = GSOCK_IOERR;
- return GSOCK_IOERR;
+ m_error = wxSOCKET_IOERR;
+ return wxSOCKET_IOERR;
}
- }
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
/* Generic IO */
/* Like recv(), send(), ... */
-int GSocket::Read(char *buffer, int size)
+int wxSocketImplMSW::Read(char *buffer, int size)
{
int ret;
/* Reenable INPUT events */
- m_detected &= ~GSOCK_INPUT_FLAG;
+ m_detected &= ~wxSOCKET_INPUT_FLAG;
if (m_fd == INVALID_SOCKET || m_server)
{
- m_error = GSOCK_INVSOCK;
+ m_error = wxSOCKET_INVSOCK;
return -1;
}
/* If the socket is blocking, wait for data (with a timeout) */
- if (Input_Timeout() == GSOCK_TIMEDOUT)
+ if (Input_Timeout() == wxSOCKET_TIMEDOUT)
{
- m_error = GSOCK_TIMEDOUT;
+ m_error = wxSOCKET_TIMEDOUT;
return -1;
}
if (ret == SOCKET_ERROR)
{
if (WSAGetLastError() != WSAEWOULDBLOCK)
- m_error = GSOCK_IOERR;
+ m_error = wxSOCKET_IOERR;
else
- m_error = GSOCK_WOULDBLOCK;
+ m_error = wxSOCKET_WOULDBLOCK;
return -1;
}
return ret;
}
-int GSocket::Write(const char *buffer, int size)
+int wxSocketImplMSW::Write(const char *buffer, int size)
{
int ret;
if (m_fd == INVALID_SOCKET || m_server)
{
- m_error = GSOCK_INVSOCK;
+ m_error = wxSOCKET_INVSOCK;
return -1;
}
/* If the socket is blocking, wait for writability (with a timeout) */
- if (Output_Timeout() == GSOCK_TIMEDOUT)
+ if (Output_Timeout() == wxSOCKET_TIMEDOUT)
return -1;
/* Write the data */
if (ret == SOCKET_ERROR)
{
if (WSAGetLastError() != WSAEWOULDBLOCK)
- m_error = GSOCK_IOERR;
+ m_error = wxSOCKET_IOERR;
else
- m_error = GSOCK_WOULDBLOCK;
+ m_error = wxSOCKET_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.
*/
- m_detected &= ~GSOCK_OUTPUT_FLAG;
+ m_detected &= ~wxSOCKET_OUTPUT_FLAG;
return -1;
}
return ret;
}
-/* Attributes */
-
-/* GSocket_SetNonBlocking:
- * Sets the socket to non-blocking mode. All IO calls will return
- * immediately.
- */
-void GSocket::SetNonBlocking(bool non_block)
-{
- m_non_blocking = non_block;
-}
-
-/* GSocket_GetError:
- * Returns the last error occurred for this socket. Note that successful
- * operations do not clear this back to GSOCK_NOERROR, so use it only
- * after an error.
- */
-GSocketError WXDLLIMPEXP_NET GSocket::GetError()
-{
- return m_error;
-}
-
-GSocketError GSocket::GetSockOpt(int level, int optname,
- void *optval, int *optlen)
-{
- if (getsockopt(m_fd, level, optname, (char*)optval, optlen) == 0)
- {
- return GSOCK_NOERROR;
- }
- return GSOCK_OPTERR;
-}
-
-GSocketError GSocket::SetSockOpt(int level, int optname,
- const void *optval, int optlen)
-{
- if (setsockopt(m_fd, level, optname, (char*)optval, optlen) == 0)
- {
- return GSOCK_NOERROR;
- }
- return GSOCK_OPTERR;
-}
-
/* Internals (IO) */
-/* _GSocket_Input_Timeout:
+/*
* For blocking sockets, wait until data is available or
* until timeout ellapses.
*/
-GSocketError GSocket::Input_Timeout()
+wxSocketError wxSocketImplMSW::Input_Timeout()
{
fd_set readfds;
FD_SET(m_fd, &readfds);
if (select(0, &readfds, NULL, NULL, &m_timeout) == 0)
{
- m_error = GSOCK_TIMEDOUT;
- return GSOCK_TIMEDOUT;
+ m_error = wxSOCKET_TIMEDOUT;
+ return wxSOCKET_TIMEDOUT;
}
}
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-/* _GSocket_Output_Timeout:
+/*
* For blocking sockets, wait until data can be sent without
* blocking or until timeout ellapses.
*/
-GSocketError GSocket::Output_Timeout()
+wxSocketError wxSocketImplMSW::Output_Timeout()
{
fd_set writefds;
FD_SET(m_fd, &writefds);
if (select(0, NULL, &writefds, NULL, &m_timeout) == 0)
{
- m_error = GSOCK_TIMEDOUT;
- return GSOCK_TIMEDOUT;
+ m_error = wxSOCKET_TIMEDOUT;
+ return wxSOCKET_TIMEDOUT;
}
}
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-/* _GSocket_Connect_Timeout:
+/*
* For blocking sockets, wait until the connection is
* established or fails, or until timeout ellapses.
*/
-GSocketError GSocket::Connect_Timeout()
+wxSocketError wxSocketImplMSW::Connect_Timeout()
{
fd_set writefds;
fd_set exceptfds;
FD_SET(m_fd, &exceptfds);
if (select(0, NULL, &writefds, &exceptfds, &m_timeout) == 0)
{
- m_error = GSOCK_TIMEDOUT;
- return GSOCK_TIMEDOUT;
+ m_error = wxSOCKET_TIMEDOUT;
+ return wxSOCKET_TIMEDOUT;
}
if (!FD_ISSET(m_fd, &writefds))
{
- m_error = GSOCK_IOERR;
- return GSOCK_IOERR;
+ m_error = wxSOCKET_IOERR;
+ return wxSOCKET_IOERR;
}
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-int GSocket::Recv_Stream(char *buffer, int size)
+int wxSocketImplMSW::Recv_Stream(char *buffer, int size)
{
return recv(m_fd, buffer, size, 0);
}
-int GSocket::Recv_Dgram(char *buffer, int size)
+int wxSocketImplMSW::Recv_Dgram(char *buffer, int size)
{
wxSockAddr from;
WX_SOCKLEN_T fromlen = sizeof(from);
int ret;
- GSocketError err;
+ wxSocketError err;
ret = recvfrom(m_fd, buffer, size, 0, (sockaddr*)&from, &fromlen);
if (ret == SOCKET_ERROR)
return SOCKET_ERROR;
- /* Translate a system address into a GSocket address */
+ /* Translate a system address into a wxSocketImpl address */
if (!m_peer)
{
m_peer = GAddress_new();
if (!m_peer)
{
- m_error = GSOCK_MEMERR;
+ m_error = wxSOCKET_MEMERR;
return -1;
}
}
err = _GAddress_translate_from(m_peer, (sockaddr*)&from, fromlen);
- if (err != GSOCK_NOERROR)
+ if (err != wxSOCKET_NOERROR)
{
GAddress_destroy(m_peer);
m_peer = NULL;
return ret;
}
-int GSocket::Send_Stream(const char *buffer, int size)
+int wxSocketImplMSW::Send_Stream(const char *buffer, int size)
{
return send(m_fd, buffer, size, 0);
}
-int GSocket::Send_Dgram(const char *buffer, int size)
+int wxSocketImplMSW::Send_Dgram(const char *buffer, int size)
{
struct sockaddr *addr;
int len, ret;
- GSocketError err;
+ wxSocketError err;
if (!m_peer)
{
- m_error = GSOCK_INVADDR;
+ m_error = wxSOCKET_INVADDR;
return -1;
}
err = _GAddress_translate_to(m_peer, &addr, &len);
- if (err != GSOCK_NOERROR)
+ if (err != wxSOCKET_NOERROR)
{
m_error = err;
return -1;
*/
/* CHECK_ADDRESS verifies that the current address family is either
- * GSOCK_NOFAMILY or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it
- * initalizes it to be a GSOCK_*family*. In other cases, it returns
+ * wxSOCKET_NOFAMILY or wxSOCKET_*family*, and if it is wxSOCKET_NOFAMILY, it
+ * initalizes it to be a wxSOCKET_*family*. In other cases, it returns
* an appropiate error code.
*
* CHECK_ADDRESS_RETVAL does the same but returning 'retval' on error.
*/
#define CHECK_ADDRESS(address, family) \
{ \
- if (address->m_family == GSOCK_NOFAMILY) \
- if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
+ if (address->m_family == wxSOCKET_NOFAMILY) \
+ if (_GAddress_Init_##family(address) != wxSOCKET_NOERROR) \
return address->m_error; \
- if (address->m_family != GSOCK_##family) \
+ if (address->m_family != wxSOCKET_##family) \
{ \
- address->m_error = GSOCK_INVADDR; \
- return GSOCK_INVADDR; \
+ address->m_error = wxSOCKET_INVADDR; \
+ return wxSOCKET_INVADDR; \
} \
}
#define CHECK_ADDRESS_RETVAL(address, family, retval) \
{ \
- if (address->m_family == GSOCK_NOFAMILY) \
- if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \
+ if (address->m_family == wxSOCKET_NOFAMILY) \
+ if (_GAddress_Init_##family(address) != wxSOCKET_NOERROR) \
return retval; \
- if (address->m_family != GSOCK_##family) \
+ if (address->m_family != wxSOCKET_##family) \
{ \
- address->m_error = GSOCK_INVADDR; \
+ address->m_error = wxSOCKET_INVADDR; \
return retval; \
} \
}
if ((address = (GAddress *) malloc(sizeof(GAddress))) == NULL)
return NULL;
- address->m_family = GSOCK_NOFAMILY;
+ address->m_family = wxSOCKET_NOFAMILY;
address->m_addr = NULL;
address->m_len = 0;
return address->m_family;
}
-GSocketError _GAddress_translate_from(GAddress *address,
+wxSocketError _GAddress_translate_from(GAddress *address,
struct sockaddr *addr, int len)
{
address->m_realfamily = addr->sa_family;
switch (addr->sa_family)
{
case AF_INET:
- address->m_family = GSOCK_INET;
+ address->m_family = wxSOCKET_INET;
break;
case AF_UNIX:
- address->m_family = GSOCK_UNIX;
+ address->m_family = wxSOCKET_UNIX;
break;
#if wxUSE_IPV6
case AF_INET6:
- address->m_family = GSOCK_INET6;
+ address->m_family = wxSOCKET_INET6;
break;
#endif
default:
{
- address->m_error = GSOCK_INVOP;
- return GSOCK_INVOP;
+ address->m_error = wxSOCKET_INVOP;
+ return wxSOCKET_INVOP;
}
}
if (address->m_addr == NULL)
{
- address->m_error = GSOCK_MEMERR;
- return GSOCK_MEMERR;
+ address->m_error = wxSOCKET_MEMERR;
+ return wxSOCKET_MEMERR;
}
memcpy(address->m_addr, addr, len);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError _GAddress_translate_to(GAddress *address,
+wxSocketError _GAddress_translate_to(GAddress *address,
struct sockaddr **addr, int *len)
{
if (!address->m_addr)
{
- address->m_error = GSOCK_INVADDR;
- return GSOCK_INVADDR;
+ address->m_error = wxSOCKET_INVADDR;
+ return wxSOCKET_INVADDR;
}
*len = address->m_len;
*addr = (struct sockaddr *) malloc(address->m_len);
if (*addr == NULL)
{
- address->m_error = GSOCK_MEMERR;
- return GSOCK_MEMERR;
+ address->m_error = wxSOCKET_MEMERR;
+ return wxSOCKET_MEMERR;
}
memcpy(*addr, address->m_addr, address->m_len);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
/*
* -------------------------------------------------------------------------
*/
-GSocketError _GAddress_Init_INET(GAddress *address)
+wxSocketError _GAddress_Init_INET(GAddress *address)
{
address->m_len = sizeof(struct sockaddr_in);
address->m_addr = (struct sockaddr *) malloc(address->m_len);
if (address->m_addr == NULL)
{
- address->m_error = GSOCK_MEMERR;
- return GSOCK_MEMERR;
+ address->m_error = wxSOCKET_MEMERR;
+ return wxSOCKET_MEMERR;
}
- address->m_family = GSOCK_INET;
+ address->m_family = wxSOCKET_INET;
address->m_realfamily = AF_INET;
((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY;
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
+wxSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
{
struct hostent *he;
struct in_addr *addr;
if ((he = gethostbyname(hostname)) == NULL)
{
/* addr->s_addr = INADDR_NONE just done by inet_addr() above */
- address->m_error = GSOCK_NOHOST;
- return GSOCK_NOHOST;
+ address->m_error = wxSOCKET_NOHOST;
+ return wxSOCKET_NOHOST;
}
array_addr = (struct in_addr *) *(he->h_addr_list);
addr->s_addr = array_addr[0].s_addr;
}
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET_SetBroadcastAddress(GAddress *address)
+wxSocketError GAddress_INET_SetBroadcastAddress(GAddress *address)
{
return GAddress_INET_SetHostAddress(address, INADDR_BROADCAST);
}
-GSocketError GAddress_INET_SetAnyAddress(GAddress *address)
+wxSocketError GAddress_INET_SetAnyAddress(GAddress *address)
{
return GAddress_INET_SetHostAddress(address, INADDR_ANY);
}
-GSocketError GAddress_INET_SetHostAddress(GAddress *address,
+wxSocketError GAddress_INET_SetHostAddress(GAddress *address,
unsigned long hostaddr)
{
struct in_addr *addr;
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
addr->s_addr = htonl(hostaddr);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
+wxSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
const char *protocol)
{
struct servent *se;
if (!port)
{
- address->m_error = GSOCK_INVPORT;
- return GSOCK_INVPORT;
+ address->m_error = wxSOCKET_INVPORT;
+ return wxSOCKET_INVPORT;
}
se = getservbyname(port, protocol);
port_int = atoi(port);
addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = htons((u_short) port_int);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
- address->m_error = GSOCK_INVPORT;
- return GSOCK_INVPORT;
+ address->m_error = wxSOCKET_INVPORT;
+ return wxSOCKET_INVPORT;
}
addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = se->s_port;
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
+wxSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
{
struct sockaddr_in *addr;
addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = htons(port);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t sbuf)
+wxSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t sbuf)
{
struct hostent *he;
char *addr_buf;
he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
if (he == NULL)
{
- address->m_error = GSOCK_NOHOST;
- return GSOCK_NOHOST;
+ address->m_error = wxSOCKET_NOHOST;
+ return wxSOCKET_NOHOST;
}
strncpy(hostname, he->h_name, sbuf);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
unsigned long GAddress_INET_GetHostAddress(GAddress *address)
#pragma comment(lib,"ws2_32")
#endif // __VISUALC__
-GSocketError _GAddress_Init_INET6(GAddress *address)
+wxSocketError _GAddress_Init_INET6(GAddress *address)
{
struct in6_addr any_address = IN6ADDR_ANY_INIT;
address->m_len = sizeof(struct sockaddr_in6);
address->m_addr = (struct sockaddr *) malloc(address->m_len);
if (address->m_addr == NULL)
{
- address->m_error = GSOCK_MEMERR;
- return GSOCK_MEMERR;
+ address->m_error = wxSOCKET_MEMERR;
+ return wxSOCKET_MEMERR;
}
memset(address->m_addr,0,address->m_len);
- address->m_family = GSOCK_INET6;
+ address->m_family = wxSOCKET_INET6;
address->m_realfamily = AF_INET6;
((struct sockaddr_in6 *)address->m_addr)->sin6_family = AF_INET6;
((struct sockaddr_in6 *)address->m_addr)->sin6_addr = any_address;
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname)
+wxSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname)
{
CHECK_ADDRESS(address, INET6);
addrinfo * info = 0;
if ( getaddrinfo( hostname, "0", & hints, & info ) || ! info )
{
- address->m_error = GSOCK_NOHOST;
- return GSOCK_NOHOST;
+ address->m_error = wxSOCKET_NOHOST;
+ return wxSOCKET_NOHOST;
}
memcpy( address->m_addr, info->ai_addr, info->ai_addrlen );
freeaddrinfo( info );
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET6_SetAnyAddress(GAddress *address)
+wxSocketError GAddress_INET6_SetAnyAddress(GAddress *address)
{
CHECK_ADDRESS(address, INET6);
memset( & addr, 0, sizeof( addr ) );
return GAddress_INET6_SetHostAddress(address, addr);
}
-GSocketError GAddress_INET6_SetHostAddress(GAddress *address,
+wxSocketError GAddress_INET6_SetHostAddress(GAddress *address,
struct in6_addr hostaddr)
{
CHECK_ADDRESS(address, INET6);
((struct sockaddr_in6 *)address->m_addr)->sin6_addr = hostaddr;
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port,
+wxSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port,
const char *protocol)
{
struct servent *se;
if (!port)
{
- address->m_error = GSOCK_INVPORT;
- return GSOCK_INVPORT;
+ address->m_error = wxSOCKET_INVPORT;
+ return wxSOCKET_INVPORT;
}
se = getservbyname(port, protocol);
port_int = atoi(port);
addr = (struct sockaddr_in6 *)address->m_addr;
addr->sin6_port = htons((u_short) port_int);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
- address->m_error = GSOCK_INVPORT;
- return GSOCK_INVPORT;
+ address->m_error = wxSOCKET_INVPORT;
+ return wxSOCKET_INVPORT;
}
addr = (struct sockaddr_in6 *)address->m_addr;
addr->sin6_port = se->s_port;
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port)
+wxSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port)
{
struct sockaddr_in6 *addr;
addr = (struct sockaddr_in6 *)address->m_addr;
addr->sin6_port = htons(port);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, size_t sbuf)
+wxSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, size_t sbuf)
{
struct hostent *he;
char *addr_buf;
he = gethostbyaddr(addr_buf, sizeof(addr->sin6_addr), AF_INET6);
if (he == NULL)
{
- address->m_error = GSOCK_NOHOST;
- return GSOCK_NOHOST;
+ address->m_error = wxSOCKET_NOHOST;
+ return wxSOCKET_NOHOST;
}
strncpy(hostname, he->h_name, sbuf);
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
-GSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr)
+wxSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr)
{
- CHECK_ADDRESS_RETVAL(address, INET6, GSOCK_INVADDR);
+ CHECK_ADDRESS_RETVAL(address, INET6, wxSOCKET_INVADDR);
*hostaddr = ( (struct sockaddr_in6 *)address->m_addr )->sin6_addr;
- return GSOCK_NOERROR;
+ return wxSOCKET_NOERROR;
}
unsigned short GAddress_INET6_GetPort(GAddress *address)
* -------------------------------------------------------------------------
*/
-GSocketError _GAddress_Init_UNIX(GAddress *address)
+wxSocketError _GAddress_Init_UNIX(GAddress *address)
{
- address->m_error = GSOCK_INVADDR;
- return GSOCK_INVADDR;
+ address->m_error = wxSOCKET_INVADDR;
+ return wxSOCKET_INVADDR;
}
-GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path))
+wxSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path))
{
- address->m_error = GSOCK_INVADDR;
- return GSOCK_INVADDR;
+ address->m_error = wxSOCKET_INVADDR;
+ return wxSOCKET_INVADDR;
}
-GSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf))
+wxSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf))
{
- address->m_error = GSOCK_INVADDR;
- return GSOCK_INVADDR;
+ address->m_error = wxSOCKET_INVADDR;
+ return wxSOCKET_INVADDR;
}
#endif // wxUSE_SOCKETS
projects / wxWidgets.git / blobdiff