#include "wx/private/fd.h"
#include "wx/private/socket.h"
+#ifdef __UNIX__
+ #include <errno.h>
+#endif
+
+// we use MSG_NOSIGNAL to avoid getting SIGPIPE when sending data to a remote
+// host which closed the connection if it is available, otherwise we rely on
+// SO_NOSIGPIPE existency
+//
+// this should cover all the current Unix systems (Windows never sends any
+// signals anyhow) but if we find one that has neither we should explicitly
+// ignore SIGPIPE for it
+#ifdef MSG_NOSIGNAL
+ #define wxSOCKET_MSG_NOSIGNAL MSG_NOSIGNAL
+#else // MSG_NOSIGNAL not available (BSD including OS X)
+ #if defined(__UNIX__) && !defined(SO_NOSIGPIPE)
+ #error "Writing to socket could generate unhandled SIGPIPE."
+ #error "Please post information about your system to wx-dev."
+ #endif
+
+ #define wxSOCKET_MSG_NOSIGNAL 0
+#endif
+
// DLL options compatibility check:
#include "wx/build.h"
WX_CHECK_BUILD_OPTIONS("wxNet")
IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase)
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+void SetTimeValFromMS(timeval& tv, unsigned long ms)
+{
+ tv.tv_sec = (ms / 1000);
+ tv.tv_usec = (ms % 1000) * 1000;
+}
+
+} // anonymous namespace
+
// --------------------------------------------------------------------------
// private classes
// --------------------------------------------------------------------------
DECLARE_NO_COPY_CLASS(wxSocketState)
};
-// Conditionally make the socket non-blocking for the lifetime of this object.
-class wxSocketUnblocker
-{
-public:
- wxSocketUnblocker(wxSocketImpl *socket, bool unblock = true)
- : m_impl(socket),
- m_unblock(unblock)
- {
- if ( m_unblock )
- m_impl->SetNonBlocking(true);
- }
-
- ~wxSocketUnblocker()
- {
- if ( m_unblock )
- m_impl->SetNonBlocking(false);
- }
-
-private:
- wxSocketImpl * const m_impl;
- bool m_unblock;
-
- DECLARE_NO_COPY_CLASS(wxSocketUnblocker)
-};
-
// ============================================================================
// wxSocketManager
// ============================================================================
: m_wxsocket(&wxsocket)
{
m_fd = INVALID_SOCKET;
- m_detected = 0;
- m_local = NULL;
- m_peer = NULL;
m_error = wxSOCKET_NOERROR;
m_server = false;
m_stream = true;
- m_non_blocking = false;
SetTimeout(wxsocket.GetTimeout() * 1000);
wxSocketImpl::~wxSocketImpl()
{
- if (m_fd != INVALID_SOCKET)
+ if ( m_fd != INVALID_SOCKET )
Shutdown();
-
- if (m_local)
- GAddress_destroy(m_local);
-
- if (m_peer)
- GAddress_destroy(m_peer);
}
-bool wxSocketImpl::PreCreateCheck(GAddress *addr)
+bool wxSocketImpl::PreCreateCheck(const wxSockAddressImpl& addr)
{
if ( m_fd != INVALID_SOCKET )
{
return false;
}
- if ( !addr || !addr->m_addr )
+ if ( !addr.IsOk() )
{
m_error = wxSOCKET_INVADDR;
return false;
if ( m_initialSendBufferSize >= 0 )
SetSocketOption(SO_SNDBUF, m_initialSendBufferSize);
- // FIXME: shouldn't we check for m_non_blocking here? as it is now, all our
- // sockets are non-blocking
+ // we always put our sockets in unblocked mode and handle blocking
+ // ourselves in DoRead/Write() if wxSOCKET_WAITALL is specified
UnblockAndRegisterWithEventLoop();
}
wxSocketError wxSocketImpl::UpdateLocalAddress()
{
- WX_SOCKLEN_T lenAddr;
- if ( getsockname(m_fd, m_local->m_addr, &lenAddr) != 0 )
+ WX_SOCKLEN_T lenAddr = m_local.GetLen();
+ if ( getsockname(m_fd, m_local.GetWritableAddr(), &lenAddr) != 0 )
{
Close();
m_error = wxSOCKET_IOERR;
return m_error;
}
- m_local->m_len = lenAddr;
-
return wxSOCKET_NOERROR;
}
m_stream = true;
// do create the socket
- m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0);
+ m_fd = socket(m_local.GetFamily(), SOCK_STREAM, 0);
if ( m_fd == INVALID_SOCKET )
{
// and then bind to and listen on it
//
// FIXME: should we test for m_dobind here?
- if ( bind(m_fd, m_local->m_addr, m_local->m_len) != 0 )
+ if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 )
m_error = wxSOCKET_IOERR;
if ( IsOk() )
return UpdateLocalAddress();
}
-wxSocketError wxSocketImpl::CreateClient()
+wxSocketError wxSocketImpl::CreateClient(bool wait)
{
if ( !PreCreateCheck(m_peer) )
return m_error;
- m_fd = socket(m_peer->m_realfamily, SOCK_STREAM, 0);
+ m_fd = socket(m_peer.GetFamily(), SOCK_STREAM, 0);
if ( m_fd == INVALID_SOCKET )
{
- m_error = wxSOCKET_IOERR;
- return wxSOCKET_IOERR;
+ m_error = wxSOCKET_IOERR;
+ return wxSOCKET_IOERR;
}
PostCreation();
// If a local address has been set, then bind to it before calling connect
- if ( m_local && m_local->m_addr )
+ if ( m_local.IsOk() )
{
- if ( bind(m_fd, m_local->m_addr, m_local->m_len) != 0 )
+ if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 )
{
Close();
m_error = wxSOCKET_IOERR;
}
}
- // Connect to the peer and handle the EWOULDBLOCK return value in
- // platform-specific code
- return DoHandleConnect(connect(m_fd, m_peer->m_addr, m_peer->m_len));
+ // Do connect now
+ int rc = connect(m_fd, m_peer.GetAddr(), m_peer.GetLen());
+ if ( rc == SOCKET_ERROR )
+ {
+ wxSocketError err = GetLastError();
+ if ( err == wxSOCKET_WOULDBLOCK )
+ {
+ m_establishing = true;
+
+ // block waiting for connection if we should (otherwise just return
+ // wxSOCKET_WOULDBLOCK to the caller)
+ if ( wait )
+ {
+ err = SelectWithTimeout(wxSOCKET_CONNECTION_FLAG)
+ ? wxSOCKET_NOERROR
+ : wxSOCKET_TIMEDOUT;
+ m_establishing = false;
+ }
+ }
+
+ m_error = err;
+ }
+ else // connected
+ {
+ m_error = wxSOCKET_NOERROR;
+ }
+
+ return m_error;
}
m_stream = false;
m_server = false;
- m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0);
+ m_fd = socket(m_local.GetFamily(), SOCK_DGRAM, 0);
if ( m_fd == INVALID_SOCKET )
{
if ( m_dobind )
{
- if ( bind(m_fd, m_local->m_addr, m_local->m_len) != 0 )
+ if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 )
{
Close();
m_error = wxSOCKET_IOERR;
return wxSOCKET_NOERROR;
}
+wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket)
+{
+ wxSockAddressStorage from;
+ WX_SOCKLEN_T fromlen = sizeof(from);
+ const SOCKET fd = accept(m_fd, &from.addr, &fromlen);
+
+ if ( fd == INVALID_SOCKET )
+ return NULL;
+
+ wxSocketImpl * const sock = Create(wxsocket);
+ sock->m_fd = fd;
+ sock->m_peer = wxSockAddressImpl(from.addr, fromlen);
+
+ sock->UnblockAndRegisterWithEventLoop();
+
+ return sock;
+}
+
void wxSocketImpl::Close()
{
shutdown(m_fd, 1 /* SD_SEND */);
Close();
}
-
- m_detected = wxSOCKET_LOST_FLAG;
}
/*
*/
void wxSocketImpl::SetTimeout(unsigned long millis)
{
- m_timeout.tv_sec = (millis / 1000);
- m_timeout.tv_usec = (millis % 1000) * 1000;
+ SetTimeValFromMS(m_timeout, millis);
}
void wxSocketImpl::NotifyOnStateChange(wxSocketNotify event)
}
/* Address handling */
+wxSocketError wxSocketImpl::SetLocal(const wxSockAddressImpl& local)
+{
+ /* the socket must be initialized, or it must be a server */
+ if (m_fd != INVALID_SOCKET && !m_server)
+ {
+ m_error = wxSOCKET_INVSOCK;
+ return wxSOCKET_INVSOCK;
+ }
-/*
- * Set or get the local or peer address for this socket. The 'set'
- * functions return wxSOCKET_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 socket.
- *
- * Error codes:
- * wxSOCKET_INVSOCK - the socket is not valid.
- * wxSOCKET_INVADDR - the address is not valid.
- */
-wxSocketError wxSocketImpl::SetLocal(GAddress *address)
+ if ( !local.IsOk() )
+ {
+ m_error = wxSOCKET_INVADDR;
+ return wxSOCKET_INVADDR;
+ }
+
+ m_local = local;
+
+ return wxSOCKET_NOERROR;
+}
+
+wxSocketError wxSocketImpl::SetPeer(const wxSockAddressImpl& peer)
{
- /* the socket must be initialized, or it must be a server */
- if (m_fd != INVALID_SOCKET && !m_server)
- {
- m_error = wxSOCKET_INVSOCK;
- return wxSOCKET_INVSOCK;
- }
+ if ( !peer.IsOk() )
+ {
+ m_error = wxSOCKET_INVADDR;
+ return wxSOCKET_INVADDR;
+ }
- /* check address */
- if (address == NULL || address->m_family == wxSOCKET_NOFAMILY)
- {
- m_error = wxSOCKET_INVADDR;
- return wxSOCKET_INVADDR;
- }
+ m_peer = peer;
- if (m_local)
- GAddress_destroy(m_local);
+ return wxSOCKET_NOERROR;
+}
- m_local = GAddress_copy(address);
+const wxSockAddressImpl& wxSocketImpl::GetLocal()
+{
+ if ( !m_local.IsOk() )
+ UpdateLocalAddress();
- return wxSOCKET_NOERROR;
+ return m_local;
}
-wxSocketError wxSocketImpl::SetPeer(GAddress *address)
+// ----------------------------------------------------------------------------
+// wxSocketImpl IO
+// ----------------------------------------------------------------------------
+
+// this macro wraps the given expression (normally a syscall) in a loop which
+// ignores any interruptions, i.e. reevaluates it again if it failed and errno
+// is EINTR
+#ifdef __UNIX__
+ #define DO_WHILE_EINTR( rc, syscall ) \
+ do { \
+ rc = (syscall); \
+ } \
+ while ( rc == -1 && errno == EINTR )
+#else
+ #define DO_WHILE_EINTR( rc, syscall ) rc = (syscall)
+#endif
+
+int wxSocketImpl::RecvStream(void *buffer, int size)
{
- /* check address */
- if (address == NULL || address->m_family == wxSOCKET_NOFAMILY)
- {
- m_error = wxSOCKET_INVADDR;
- return wxSOCKET_INVADDR;
- }
+ int ret;
+ DO_WHILE_EINTR( ret, recv(m_fd, static_cast<char *>(buffer), size, 0) );
- if (m_peer)
- GAddress_destroy(m_peer);
+ if ( !ret )
+ {
+ // receiving 0 bytes for a TCP socket indicates that the connection was
+ // closed by peer so shut down our end as well (for UDP sockets empty
+ // datagrams are also possible)
+ m_establishing = false;
+ NotifyOnStateChange(wxSOCKET_LOST);
- m_peer = GAddress_copy(address);
+ Shutdown();
- return wxSOCKET_NOERROR;
+ // do not return an error in this case however
+ }
+
+ return ret;
}
-GAddress *wxSocketImpl::GetLocal()
+int wxSocketImpl::SendStream(const void *buffer, int size)
{
- GAddress *address;
- wxSockAddr addr;
- WX_SOCKLEN_T size = sizeof(addr);
- wxSocketError err;
+ int ret;
+ DO_WHILE_EINTR( ret, send(m_fd, static_cast<const char *>(buffer), size,
+ wxSOCKET_MSG_NOSIGNAL) );
- /* try to get it from the m_local var first */
- if (m_local)
- return GAddress_copy(m_local);
+ return ret;
+}
- /* else, if the socket is initialized, try getsockname */
- if (m_fd == INVALID_SOCKET)
- {
- m_error = wxSOCKET_INVSOCK;
- return NULL;
- }
+int wxSocketImpl::RecvDgram(void *buffer, int size)
+{
+ wxSockAddressStorage from;
+ WX_SOCKLEN_T fromlen = sizeof(from);
- if (getsockname(m_fd, (sockaddr*)&addr, &size) == SOCKET_ERROR)
- {
- m_error = wxSOCKET_IOERR;
- return NULL;
- }
+ int ret;
+ DO_WHILE_EINTR( ret, recvfrom(m_fd, static_cast<char *>(buffer), size,
+ 0, &from.addr, &fromlen) );
- /* got a valid address from getsockname, create a GAddress object */
- if ((address = GAddress_new()) == NULL)
- {
- m_error = wxSOCKET_MEMERR;
- return NULL;
- }
+ if ( ret == SOCKET_ERROR )
+ return SOCKET_ERROR;
- if ((err = _GAddress_translate_from(address, (sockaddr*)&addr, size)) != wxSOCKET_NOERROR)
- {
- GAddress_destroy(address);
- m_error = err;
- return NULL;
- }
+ m_peer = wxSockAddressImpl(from.addr, fromlen);
+ if ( !m_peer.IsOk() )
+ return -1;
- return address;
+ return ret;
}
-GAddress *wxSocketImpl::GetPeer()
+int wxSocketImpl::SendDgram(const void *buffer, int size)
{
- /* try to get it from the m_peer var */
- if (m_peer)
- return GAddress_copy(m_peer);
+ if ( !m_peer.IsOk() )
+ {
+ m_error = wxSOCKET_INVADDR;
+ return -1;
+ }
+
+ int ret;
+ DO_WHILE_EINTR( ret, sendto(m_fd, static_cast<const char *>(buffer), size,
+ 0, m_peer.GetAddr(), m_peer.GetLen()) );
- return NULL;
+ return ret;
}
-bool wxSocketImpl::DoBlockWithTimeout(wxSocketEventFlags flags)
+int wxSocketImpl::Read(void *buffer, int size)
{
- if ( !m_non_blocking )
+ // server sockets can't be used for IO, only to accept new connections
+ if ( m_fd == INVALID_SOCKET || m_server )
{
- fd_set fds;
- wxFD_ZERO(&fds);
- wxFD_SET(m_fd, &fds);
+ m_error = wxSOCKET_INVSOCK;
+ return -1;
+ }
- fd_set
- *readfds = flags & wxSOCKET_INPUT_FLAG ? &fds : NULL,
- *writefds = flags & wxSOCKET_OUTPUT_FLAG ? &fds : NULL;
+ int ret = m_stream ? RecvStream(buffer, size)
+ : RecvDgram(buffer, size);
- // make a copy as it can be modified by select()
- struct timeval tv = m_timeout;
- int ret = select(m_fd + 1, readfds, writefds, NULL, &tv);
+ m_error = ret == SOCKET_ERROR ? GetLastError() : wxSOCKET_NOERROR;
- switch ( ret )
- {
- case 0:
- m_error = wxSOCKET_TIMEDOUT;
- return false;
+ return ret;
+}
- case -1:
- m_error = wxSOCKET_IOERR;
- return false;
- }
+int wxSocketImpl::Write(const void *buffer, int size)
+{
+ if ( m_fd == INVALID_SOCKET || m_server )
+ {
+ m_error = wxSOCKET_INVSOCK;
+ return -1;
}
- //else: we're non-blocking, never block
- return true;
+ int ret = m_stream ? SendStream(buffer, size)
+ : SendDgram(buffer, size);
+
+ m_error = ret == SOCKET_ERROR ? GetLastError() : wxSOCKET_NOERROR;
+
+ return ret;
}
// ==========================================================================
m_establishing =
m_reading =
m_writing =
- m_error =
m_closed = false;
m_lcount = 0;
m_timeout = 600;
m_handler = NULL;
m_clientData = NULL;
m_notify = false;
- m_eventmask = 0;
+ m_eventmask =
+ m_eventsgot = 0;
if ( !IsInitialized() )
{
// Shutdown and close the socket
Close();
- // Supress events from now on
+ // Suppress events from now on
Notify(false);
// schedule this object for deletion
}
// ----------------------------------------------------------------------------
-// simply accessors
+// simple accessors
// ----------------------------------------------------------------------------
+void wxSocketBase::SetError(wxSocketError error)
+{
+ m_impl->m_error = error;
+}
+
wxSocketError wxSocketBase::LastError() const
{
return m_impl->GetError();
// Basic IO calls
// --------------------------------------------------------------------------
-// The following IO operations update m_error and m_lcount:
+// The following IO operations update m_lcount:
// {Read, Write, ReadMsg, WriteMsg, Peek, Unread, Discard}
-//
-// TODO: Should Connect, Accept and AcceptWith update m_error?
-
bool wxSocketBase::Close()
{
// Interrupt pending waits
m_lcount = DoRead(buffer, nbytes);
- // If in wxSOCKET_WAITALL mode, all bytes should have been read.
- if (m_flags & wxSOCKET_WAITALL)
- m_error = (m_lcount != nbytes);
- else
- m_error = (m_lcount == 0);
-
// Allow read events from now on
m_reading = false;
// polling the socket and don't block at all.
if ( m_flags & wxSOCKET_NOWAIT )
{
- wxSocketUnblocker unblock(m_impl);
int ret = m_impl->Read(buffer, nbytes);
- if ( ret < 0 )
- return 0;
-
- total += ret;
+ if ( ret == -1 )
+ {
+ if ( m_impl->GetLastError() != wxSOCKET_WOULDBLOCK )
+ SetError(wxSOCKET_IOERR);
+ }
+ else // not an error, even if we didn't read anything
+ {
+ total += ret;
+ }
}
else // blocking socket
{
for ( ;; )
{
- // Wait until socket becomes ready for reading dispatching the GUI
- // events in the meanwhile unless wxSOCKET_BLOCK was explicitly
- // specified to disable this.
- if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForRead() )
+ // Wait until socket becomes ready for reading
+ if ( !WaitForRead() )
break;
const int ret = m_impl->Read(buffer, nbytes);
break;
}
- if ( ret < 0 )
+ if ( ret == -1 )
{
- // this will be always interpreted as error by Read()
- return 0;
+ SetError(wxSOCKET_IOERR);
+ break;
}
total += ret;
buffer += ret;
}
+
+ // it's an error to not read everything in wxSOCKET_WAITALL mode or to
+ // not read anything otherwise
+ if ( ((m_flags & wxSOCKET_WAITALL) && nbytes) || !total )
+ SetError(wxSOCKET_IOERR);
}
return total;
wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
{
- wxUint32 len, len2, sig, total;
- bool error;
- int old_flags;
struct
{
unsigned char sig[4];
// Mask read events
m_reading = true;
- total = 0;
- error = true;
- old_flags = m_flags;
+ int old_flags = m_flags;
SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
- if (DoRead(&msg, sizeof(msg)) != sizeof(msg))
- goto exit;
-
- sig = (wxUint32)msg.sig[0];
- sig |= (wxUint32)(msg.sig[1] << 8);
- sig |= (wxUint32)(msg.sig[2] << 16);
- sig |= (wxUint32)(msg.sig[3] << 24);
-
- if (sig != 0xfeeddead)
+ bool ok = false;
+ if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) )
{
- wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
- goto exit;
- }
+ wxUint32 sig = (wxUint32)msg.sig[0];
+ sig |= (wxUint32)(msg.sig[1] << 8);
+ sig |= (wxUint32)(msg.sig[2] << 16);
+ sig |= (wxUint32)(msg.sig[3] << 24);
- len = (wxUint32)msg.len[0];
- len |= (wxUint32)(msg.len[1] << 8);
- len |= (wxUint32)(msg.len[2] << 16);
- len |= (wxUint32)(msg.len[3] << 24);
+ if ( sig == 0xfeeddead )
+ {
+ wxUint32 len = (wxUint32)msg.len[0];
+ len |= (wxUint32)(msg.len[1] << 8);
+ len |= (wxUint32)(msg.len[2] << 16);
+ len |= (wxUint32)(msg.len[3] << 24);
- if (len > nbytes)
- {
- len2 = len - nbytes;
- len = nbytes;
- }
- else
- len2 = 0;
+ wxUint32 len2;
+ if (len > nbytes)
+ {
+ len2 = len - nbytes;
+ len = nbytes;
+ }
+ else
+ len2 = 0;
- // Don't attempt to read if the msg was zero bytes long.
- if (len)
- {
- total = DoRead(buffer, len);
+ // Don't attempt to read if the msg was zero bytes long.
+ m_lcount = len ? DoRead(buffer, len) : 0;
- if (total != len)
- goto exit;
- }
+ if ( len2 )
+ {
+ char discard_buffer[MAX_DISCARD_SIZE];
+ long discard_len;
+
+ // NOTE: discarded bytes don't add to m_lcount.
+ do
+ {
+ discard_len = len2 > MAX_DISCARD_SIZE
+ ? MAX_DISCARD_SIZE
+ : len2;
+ discard_len = DoRead(discard_buffer, (wxUint32)discard_len);
+ len2 -= (wxUint32)discard_len;
+ }
+ while ((discard_len > 0) && len2);
+ }
- if (len2)
- {
- char *discard_buffer = new char[MAX_DISCARD_SIZE];
- long discard_len;
+ if ( !len2 && DoRead(&msg, sizeof(msg)) == sizeof(msg) )
+ {
+ sig = (wxUint32)msg.sig[0];
+ sig |= (wxUint32)(msg.sig[1] << 8);
+ sig |= (wxUint32)(msg.sig[2] << 16);
+ sig |= (wxUint32)(msg.sig[3] << 24);
- // NOTE: discarded bytes don't add to m_lcount.
- do
- {
- discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2);
- discard_len = DoRead(discard_buffer, (wxUint32)discard_len);
- len2 -= (wxUint32)discard_len;
+ if ( sig == 0xdeadfeed )
+ ok = true;
+ }
}
- while ((discard_len > 0) && len2);
-
- delete [] discard_buffer;
-
- if (len2 != 0)
- goto exit;
- }
- if (DoRead(&msg, sizeof(msg)) != sizeof(msg))
- goto exit;
-
- sig = (wxUint32)msg.sig[0];
- sig |= (wxUint32)(msg.sig[1] << 8);
- sig |= (wxUint32)(msg.sig[2] << 16);
- sig |= (wxUint32)(msg.sig[3] << 24);
-
- if (sig != 0xdeadfeed)
- {
- wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
- goto exit;
}
- // everything was OK
- error = false;
+ if ( !ok )
+ SetError(wxSOCKET_IOERR);
-exit:
- m_error = error;
- m_lcount = total;
m_reading = false;
SetFlags(old_flags);
m_lcount = DoRead(buffer, nbytes);
Pushback(buffer, m_lcount);
- // If in wxSOCKET_WAITALL mode, all bytes should have been read.
- if (m_flags & wxSOCKET_WAITALL)
- m_error = (m_lcount != nbytes);
- else
- m_error = (m_lcount == 0);
-
// Allow read events again
m_reading = false;
m_lcount = DoWrite(buffer, nbytes);
- // If in wxSOCKET_WAITALL mode, all bytes should have been written.
- if (m_flags & wxSOCKET_WAITALL)
- m_error = (m_lcount != nbytes);
- else
- m_error = (m_lcount == 0);
-
// Allow write events again
m_writing = false;
wxUint32 total = 0;
if ( m_flags & wxSOCKET_NOWAIT )
{
- wxSocketUnblocker unblock(m_impl);
const int ret = m_impl->Write(buffer, nbytes);
- if ( ret > 0 )
+ if ( ret == -1 )
+ {
+ if ( m_impl->GetLastError() != wxSOCKET_WOULDBLOCK )
+ SetError(wxSOCKET_IOERR);
+ }
+ else
+ {
total += ret;
+ }
}
else // blocking socket
{
for ( ;; )
{
- if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
+ if ( !WaitForWrite() )
break;
const int ret = m_impl->Write(buffer, nbytes);
break;
}
- if ( ret < 0 )
- return 0;
+ if ( ret == -1 )
+ {
+ SetError(wxSOCKET_IOERR);
+ break;
+ }
total += ret;
if ( !(m_flags & wxSOCKET_WAITALL) )
buffer += ret;
}
+
+ if ( ((m_flags & wxSOCKET_WAITALL) && nbytes) || !total )
+ SetError(wxSOCKET_IOERR);
}
return total;
wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
{
- wxUint32 total;
- bool error;
struct
{
unsigned char sig[4];
// Mask write events
m_writing = true;
- error = true;
- total = 0;
+ const int old_flags = m_flags;
SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
msg.sig[0] = (unsigned char) 0xad;
msg.len[2] = (unsigned char) ((nbytes >> 16) & 0xff);
msg.len[3] = (unsigned char) ((nbytes >> 24) & 0xff);
- if (DoWrite(&msg, sizeof(msg)) < sizeof(msg))
- goto exit;
-
- total = DoWrite(buffer, nbytes);
-
- if (total < nbytes)
- goto exit;
-
- msg.sig[0] = (unsigned char) 0xed;
- msg.sig[1] = (unsigned char) 0xfe;
- msg.sig[2] = (unsigned char) 0xad;
- msg.sig[3] = (unsigned char) 0xde;
- msg.len[0] =
- msg.len[1] =
- msg.len[2] =
- msg.len[3] = (char) 0;
-
- if ((DoWrite(&msg, sizeof(msg))) < sizeof(msg))
- goto exit;
+ bool ok = false;
+ if ( DoWrite(&msg, sizeof(msg)) == sizeof(msg) )
+ {
+ m_lcount = DoWrite(buffer, nbytes);
+ if ( m_lcount == nbytes )
+ {
+ msg.sig[0] = (unsigned char) 0xed;
+ msg.sig[1] = (unsigned char) 0xfe;
+ msg.sig[2] = (unsigned char) 0xad;
+ msg.sig[3] = (unsigned char) 0xde;
+ msg.len[0] =
+ msg.len[1] =
+ msg.len[2] =
+ msg.len[3] = (char) 0;
+
+ if ( DoWrite(&msg, sizeof(msg)) == sizeof(msg))
+ ok = true;
+ }
+ }
- // everything was OK
- error = false;
+ if ( !ok )
+ SetError(wxSOCKET_IOERR);
-exit:
- m_error = error;
- m_lcount = total;
m_writing = false;
+ SetFlags(old_flags);
return *this;
}
if (nbytes != 0)
Pushback(buffer, nbytes);
- m_error = false;
+ SetError(wxSOCKET_NOERROR);
m_lcount = nbytes;
return *this;
// Mask read events
m_reading = true;
+ const int old_flags = m_flags;
SetFlags(wxSOCKET_NOWAIT);
do
delete[] buffer;
m_lcount = total;
- m_error = false;
+ SetError(wxSOCKET_NOERROR);
// Allow read events again
m_reading = false;
+ SetFlags(old_flags);
+
return *this;
}
// --------------------------------------------------------------------------
/*
- * Polls the socket to determine its status. This function will
- * check for the events specified in the 'flags' parameter, and
- * it will return a mask indicating which operations can be
- * performed. This function won't block, regardless of the
- * mode (blocking | nonblocking) of the socket.
+ This function will check for the events specified in the flags parameter,
+ and it will return a mask indicating which operations can be performed.
*/
-wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags)
-{
- assert(this);
-
- wxSocketEventFlags result = 0;
- fd_set readfds;
- fd_set writefds;
- fd_set exceptfds;
- struct timeval tv;
-
- if (m_fd == INVALID_SOCKET)
- return (wxSOCKET_LOST_FLAG & flags);
-
- /* Do not use a static struct, Linux can garble it */
- tv.tv_sec = 0;
- tv.tv_usec = 0;
-
- wxFD_ZERO(&readfds);
- wxFD_ZERO(&writefds);
- wxFD_ZERO(&exceptfds);
- wxFD_SET(m_fd, &readfds);
- if (flags & wxSOCKET_OUTPUT_FLAG || flags & wxSOCKET_CONNECTION_FLAG)
- wxFD_SET(m_fd, &writefds);
- wxFD_SET(m_fd, &exceptfds);
-
- /* Check 'sticky' CONNECTION flag first */
- result |= wxSOCKET_CONNECTION_FLAG & m_detected;
-
- /* If we have already detected a LOST event, then don't try
- * to do any further processing.
- */
- if ((m_detected & wxSOCKET_LOST_FLAG) != 0)
- {
- m_establishing = false;
- return (wxSOCKET_LOST_FLAG & flags);
- }
-
- /* Try select now */
- if (select(m_fd + 1, &readfds, &writefds, &exceptfds, &tv) < 0)
- {
- /* What to do here? */
- return (result & flags);
- }
-
- /* Check for exceptions and errors */
- if (wxFD_ISSET(m_fd, &exceptfds))
- {
- m_establishing = false;
- m_detected = wxSOCKET_LOST_FLAG;
+wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags,
+ const timeval *timeout)
+{
+ if ( m_fd == INVALID_SOCKET )
+ return (wxSOCKET_LOST_FLAG & flags);
- /* LOST event: Abort any further processing */
- return (wxSOCKET_LOST_FLAG & flags);
- }
+ struct timeval tv;
+ if ( timeout )
+ tv = *timeout;
+ else
+ tv.tv_sec = tv.tv_usec = 0;
- /* Check for readability */
- if (wxFD_ISSET(m_fd, &readfds))
- {
- result |= wxSOCKET_INPUT_FLAG;
+ // prepare the FD sets, passing NULL for the one(s) we don't use
+ fd_set
+ readfds, *preadfds = NULL,
+ writefds, *pwritefds = NULL,
+ exceptfds; // always want to know about errors
- if (m_server && m_stream)
+ if ( flags & wxSOCKET_INPUT_FLAG )
{
- /* This is a TCP server socket that detected a connection.
- While the INPUT_FLAG is also set, it doesn't matter on
- this kind of sockets, as we can only Accept() from them. */
- m_detected |= wxSOCKET_CONNECTION_FLAG;
+ preadfds = &readfds;
+ wxFD_ZERO(preadfds);
+ wxFD_SET(m_fd, preadfds);
}
- }
- /* Check for writability */
- if (wxFD_ISSET(m_fd, &writefds))
- {
- if (m_establishing && !m_server)
+ // when using non-blocking connect() the socket becomes connected
+ // (successfully or not) when it becomes writable
+ if ( flags & (wxSOCKET_OUTPUT_FLAG | wxSOCKET_CONNECTION_FLAG) )
{
- int error;
- SOCKOPTLEN_T len = sizeof(error);
- m_establishing = false;
- getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
+ pwritefds = &writefds;
+ wxFD_ZERO(pwritefds);
+ wxFD_SET(m_fd, pwritefds);
+ }
- if (error)
- {
- m_detected = wxSOCKET_LOST_FLAG;
+ wxFD_ZERO(&exceptfds);
+ wxFD_SET(m_fd, &exceptfds);
- /* LOST event: Abort any further processing */
- return (wxSOCKET_LOST_FLAG & flags);
- }
- else
- {
- m_detected |= wxSOCKET_CONNECTION_FLAG;
- }
+ const int rc = select(m_fd + 1, preadfds, pwritefds, &exceptfds, &tv);
+
+ // check for errors first
+ if ( rc == -1 || wxFD_ISSET(m_fd, &exceptfds) )
+ {
+ m_establishing = false;
+
+ return wxSOCKET_LOST_FLAG & flags;
}
- else
+
+ if ( rc == 0 )
+ return 0;
+
+ wxASSERT_MSG( rc == 1, "unexpected select() return value" );
+
+ wxSocketEventFlags detected = 0;
+ if ( preadfds && wxFD_ISSET(m_fd, preadfds) )
+ detected |= wxSOCKET_INPUT_FLAG;
+
+ if ( pwritefds && wxFD_ISSET(m_fd, pwritefds) )
{
- result |= wxSOCKET_OUTPUT_FLAG;
+ // check for the case of non-blocking connect()
+ if ( m_establishing && !m_server )
+ {
+ int error;
+ SOCKOPTLEN_T len = sizeof(error);
+ m_establishing = false;
+ getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
+
+ if ( error )
+ detected = wxSOCKET_LOST_FLAG;
+ else
+ detected |= wxSOCKET_CONNECTION_FLAG;
+ }
+ else // not called to get non-blocking connect() status
+ {
+ detected |= wxSOCKET_OUTPUT_FLAG;
+ }
}
- }
- return (result | m_detected) & flags;
+ return detected & flags;
}
-// All Wait functions poll the socket using Select() to
-// check for the specified combination of conditions, until one
-// of these conditions become true, an error occurs, or the
-// timeout elapses. The polling loop runs the event loop so that
-// this won't block the GUI.
-
bool
wxSocketBase::DoWait(long seconds, long milliseconds, wxSocketEventFlags flags)
{
const wxMilliClock_t timeEnd = wxGetLocalTimeMillis() + timeout;
// Get the active event loop which we'll use for the message dispatching
- // when running in the main thread
+ // when running in the main thread unless this was explicitly disabled by
+ // setting wxSOCKET_BLOCK flag
wxEventLoopBase *eventLoop;
- if ( wxIsMainThread() )
+ if ( !(m_flags & wxSOCKET_BLOCK) && wxIsMainThread() )
{
eventLoop = wxEventLoop::GetActive();
}
eventLoop = NULL;
}
- // Wait in an active polling loop: notice that the loop is executed at
- // least once, even if timeout is 0 (i.e. polling).
+ // Wait until we receive the event we're waiting for or the timeout expires
+ // (but note that we always execute the loop at least once, even if timeout
+ // is 0 as this is used for polling)
bool gotEvent = false;
- for ( ;; )
+ for ( bool firstTime = true; !m_interrupt ; firstTime = false )
{
- // We always stop waiting when the connection is lost as it doesn't
- // make sense to continue further, even if wxSOCKET_LOST_FLAG is not
- // specified in flags to wait for.
- const wxSocketEventFlags
- result = m_impl->Select(flags | wxSOCKET_LOST_FLAG);
-
- // Incoming connection (server) or connection established (client)?
- if ( result & wxSOCKET_CONNECTION_FLAG )
+ long timeLeft = wxMilliClockToLong(timeEnd - wxGetLocalTimeMillis());
+ if ( timeLeft < 0 )
{
- m_connected = true;
- m_establishing = false;
- gotEvent = true;
- break;
+ if ( !firstTime )
+ break; // timed out
+
+ timeLeft = 0;
}
- // Data available or output buffer ready?
- if ( (result & wxSOCKET_INPUT_FLAG) || (result & wxSOCKET_OUTPUT_FLAG) )
+ // This function is only called if wxSOCKET_BLOCK flag was not used and
+ // so we should dispatch the events if there is an event loop capable
+ // of doing it.
+ wxSocketEventFlags events;
+ if ( eventLoop )
{
- gotEvent = true;
- break;
+ // reset them before starting to wait
+ m_eventsgot = 0;
+
+ eventLoop->DispatchTimeout(timeLeft);
+
+ events = m_eventsgot;
+ }
+ else // no event loop or waiting in another thread
+ {
+ // as explained below, we should always check for wxSOCKET_LOST_FLAG
+ timeval tv;
+ SetTimeValFromMS(tv, timeLeft);
+ events = m_impl->Select(flags | wxSOCKET_LOST_FLAG, &tv);
}
- // Connection lost
- if ( result & wxSOCKET_LOST_FLAG )
+ // always check for wxSOCKET_LOST_FLAG, even if flags doesn't include
+ // it, as continuing to wait for anything else after getting it is
+ // pointless
+ if ( events & wxSOCKET_LOST_FLAG )
{
m_connected = false;
m_establishing = false;
break;
}
- if ( m_interrupt )
- break;
-
- // Wait more?
- const wxMilliClock_t timeNow = wxGetLocalTimeMillis();
- if ( timeNow >= timeEnd )
- break;
+ // otherwise mask out the bits we're not interested in
+ events &= flags;
- if ( eventLoop )
+ // Incoming connection (server) or connection established (client)?
+ if ( events & wxSOCKET_CONNECTION_FLAG )
{
- // This function is only called if wxSOCKET_BLOCK flag was not used
- // and so we should dispatch the events if there is an event loop
- // capable of doing it.
- if ( eventLoop->Pending() )
- eventLoop->Dispatch();
+ m_connected = true;
+ m_establishing = false;
+ gotEvent = true;
+ break;
}
-#if wxUSE_THREADS
- else // no event loop or waiting in another thread
+
+ // Data available or output buffer ready?
+ if ( (events & wxSOCKET_INPUT_FLAG) || (events & wxSOCKET_OUTPUT_FLAG) )
{
- // We're busy waiting but at least give up the rest of our current
- // time slice.
- wxThread::Yield();
+ gotEvent = true;
+ break;
}
-#endif // wxUSE_THREADS
}
return gotEvent;
// Get local or peer address
//
-bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
+bool wxSocketBase::GetPeer(wxSockAddress& addr) const
{
- GAddress *peer;
+ wxCHECK_MSG( m_impl, false, "invalid socket" );
- if (!m_impl)
+ const wxSockAddressImpl& peer = m_impl->GetPeer();
+ if ( !peer.IsOk() )
return false;
- peer = m_impl->GetPeer();
-
- // copying a null address would just trigger an assert anyway
-
- if (!peer)
- return false;
-
- addr_man.SetAddress(peer);
- GAddress_destroy(peer);
+ addr.SetAddress(peer);
return true;
}
-bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
+bool wxSocketBase::GetLocal(wxSockAddress& addr) const
{
- GAddress *local;
+ wxCHECK_MSG( m_impl, false, "invalid socket" );
- if (!m_impl)
+ const wxSockAddressImpl& local = m_impl->GetLocal();
+ if ( !local.IsOk() )
return false;
- local = m_impl->GetLocal();
- addr_man.SetAddress(local);
- GAddress_destroy(local);
+ addr.SetAddress(local);
return true;
}
void wxSocketBase::OnRequest(wxSocketNotify notification)
{
- switch(notification)
+ wxSocketEventFlags flag = 0;
+ switch ( notification )
{
- case wxSOCKET_CONNECTION:
- m_establishing = false;
- m_connected = true;
- break;
-
- // If we are in the middle of a R/W operation, do not
- // propagate events to users. Also, filter 'late' events
- // which are no longer valid.
-
case wxSOCKET_INPUT:
- if (m_reading || !m_impl->Select(wxSOCKET_INPUT_FLAG))
- return;
+ flag = wxSOCKET_INPUT_FLAG;
break;
case wxSOCKET_OUTPUT:
- if (m_writing || !m_impl->Select(wxSOCKET_OUTPUT_FLAG))
- return;
+ flag = wxSOCKET_OUTPUT_FLAG;
+ break;
+
+ case wxSOCKET_CONNECTION:
+ flag = wxSOCKET_CONNECTION_FLAG;
break;
case wxSOCKET_LOST:
- m_connected = false;
- m_establishing = false;
+ flag = wxSOCKET_LOST_FLAG;
break;
- case wxSOCKET_MAX_EVENT:
- wxFAIL_MSG( "unexpected notification" );
- return;
+ default:
+ wxFAIL_MSG( "unknown wxSocket notification" );
}
- // Schedule the event
+ // if we lost the connection the socket is now closed
+ if ( notification == wxSOCKET_LOST )
+ m_closed = true;
- wxSocketEventFlags flag = 0;
- wxUnusedVar(flag);
- switch (notification)
- {
- case wxSOCKET_INPUT: flag = wxSOCKET_INPUT_FLAG; break;
- case wxSOCKET_OUTPUT: flag = wxSOCKET_OUTPUT_FLAG; break;
- case wxSOCKET_CONNECTION: flag = wxSOCKET_CONNECTION_FLAG; break;
- case wxSOCKET_LOST: flag = wxSOCKET_LOST_FLAG; break;
- default:
- wxLogWarning(_("wxSocket: unknown event!."));
- return;
- }
+ // remember the events which were generated for this socket, we're going to
+ // use this in DoWait()
+ m_eventsgot |= flag;
- if (((m_eventmask & flag) == flag) && m_notify)
+ // send the wx event if enabled and we're interested in it
+ if ( m_notify && (m_eventmask & flag) && m_handler )
{
- if (m_handler)
+ // If we are in the middle of a R/W operation, do not propagate events
+ // to users. Also, filter 'late' events which are no longer valid.
+ if ( notification == wxSOCKET_INPUT )
{
- wxSocketEvent event(m_id);
- event.m_event = notification;
- event.m_clientData = m_clientData;
- event.SetEventObject(this);
-
- m_handler->AddPendingEvent(event);
+ if ( m_reading || !m_impl->Select(wxSOCKET_INPUT_FLAG) )
+ return;
+ }
+ else if ( notification == wxSOCKET_OUTPUT )
+ {
+ if ( m_writing || !m_impl->Select(wxSOCKET_OUTPUT_FLAG) )
+ return;
}
+
+ wxSocketEvent event(m_id);
+ event.m_event = notification;
+ event.m_clientData = m_clientData;
+ event.SetEventObject(this);
+
+ m_handler->AddPendingEvent(event);
}
}
void wxSocketBase::Notify(bool notify)
{
m_notify = notify;
- if (m_impl)
- m_impl->Notify(notify);
}
void wxSocketBase::SetNotify(wxSocketEventFlags flags)
// Ctor
// --------------------------------------------------------------------------
-wxSocketServer::wxSocketServer(const wxSockAddress& addr_man,
+wxSocketServer::wxSocketServer(const wxSockAddress& addr,
wxSocketFlags flags)
: wxSocketBase(flags, wxSOCKET_SERVER)
{
}
// Setup the socket as server
- m_impl->Notify(m_notify);
- m_impl->SetLocal(addr_man.GetAddress());
+ m_impl->SetLocal(addr.GetAddress());
if (GetFlags() & wxSOCKET_REUSEADDR) {
m_impl->SetReusable();
bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
{
- if (!m_impl)
+ if ( !m_impl || (m_impl->m_fd == INVALID_SOCKET) || !m_impl->IsServer() )
+ {
+ wxFAIL_MSG( "can only be called for a valid server socket" );
+
+ SetError(wxSOCKET_INVSOCK);
+
return false;
+ }
- // If wait == false, then the call should be nonblocking.
- // When we are finished, we put the socket to blocking mode
- // again.
- wxSocketUnblocker unblock(m_impl, !wait);
- sock.m_impl = m_impl->WaitConnection(sock);
+ if ( wait )
+ {
+ // wait until we get a connection
+ if ( !m_impl->SelectWithTimeout(wxSOCKET_INPUT_FLAG) )
+ {
+ SetError(wxSOCKET_TIMEDOUT);
+
+ return false;
+ }
+ }
+
+ sock.m_impl = m_impl->Accept(sock);
if ( !sock.m_impl )
+ {
+ SetError(m_impl->GetLastError());
+
return false;
+ }
sock.m_type = wxSOCKET_BASE;
sock.m_connected = true;
{
wxASSERT_MSG( m_impl, _T("Socket not initialised") );
- SOCKOPTLEN_T lenreal;
+ SOCKOPTLEN_T lenreal = *optlen;
if ( getsockopt(m_impl->m_fd, level, optname,
static_cast<char *>(optval), &lenreal) != 0 )
return false;
bool wxSocketBase::SetLocal(const wxIPV4address& local)
{
- GAddress* la = local.GetAddress();
+ m_localAddress = local;
- // If the address is valid, save it for use when we call Connect
- if (la && la->m_addr)
- {
- m_localAddress = local;
-
- return true;
- }
-
- return false;
+ return true;
}
// ==========================================================================
// Connect
// --------------------------------------------------------------------------
-bool wxSocketClient::DoConnect(const wxSockAddress& addr_man,
+bool wxSocketClient::DoConnect(const wxSockAddress& remote,
const wxSockAddress* local,
bool wait)
{
- if (m_impl)
+ if ( m_impl )
{
- // Shutdown and destroy the socket
+ // Shutdown and destroy the old socket
Close();
delete m_impl;
}
- m_impl = wxSocketImpl::Create(*this);
m_connected = false;
m_establishing = false;
- if (!m_impl)
+ // Create and set up the new one
+ m_impl = wxSocketImpl::Create(*this);
+ if ( !m_impl )
return false;
- // If wait == false, then the call should be nonblocking. When we are
- // finished, we put the socket to blocking mode again.
- wxSocketUnblocker unblock(m_impl, !wait);
-
// Reuse makes sense for clients too, if we are trying to rebind to the same port
if (GetFlags() & wxSOCKET_REUSEADDR)
- {
m_impl->SetReusable();
- }
if (GetFlags() & wxSOCKET_BROADCAST)
- {
m_impl->SetBroadcast();
- }
if (GetFlags() & wxSOCKET_NOBIND)
- {
m_impl->DontDoBind();
- }
- // If no local address was passed and one has been set, use the one that was Set
- if (!local && m_localAddress.GetAddress())
- {
+ // Bind to the local IP address and port, when provided or if one had been
+ // set before
+ if ( !local && m_localAddress.GetAddress().IsOk() )
local = &m_localAddress;
- }
- // Bind to the local IP address and port, when provided
- if (local)
- {
- GAddress* la = local->GetAddress();
-
- if (la && la->m_addr)
- m_impl->SetLocal(la);
- }
+ if ( local )
+ m_impl->SetLocal(local->GetAddress());
m_impl->SetInitialSocketBuffers(m_initialRecvBufferSize, m_initialSendBufferSize);
- m_impl->SetPeer(addr_man.GetAddress());
- const wxSocketError err = m_impl->CreateClient();
+ m_impl->SetPeer(remote.GetAddress());
- //this will register for callbacks - must be called after m_impl->m_fd was initialized
- m_impl->Notify(m_notify);
+ // Finally do create the socket and connect to the peer
+ const wxSocketError err = m_impl->CreateClient(wait);
- if (err != wxSOCKET_NOERROR)
+ if ( err != wxSOCKET_NOERROR )
{
- if (err == wxSOCKET_WOULDBLOCK)
+ if ( err == wxSOCKET_WOULDBLOCK )
+ {
+ wxASSERT_MSG( !wait, "shouldn't get this for blocking connect" );
+
m_establishing = true;
+ }
return false;
}
return true;
}
-bool wxSocketClient::Connect(const wxSockAddress& addr_man, bool wait)
+bool wxSocketClient::Connect(const wxSockAddress& remote, bool wait)
{
- return DoConnect(addr_man, NULL, wait);
+ return DoConnect(remote, NULL, wait);
}
-bool wxSocketClient::Connect(const wxSockAddress& addr_man,
+bool wxSocketClient::Connect(const wxSockAddress& remote,
const wxSockAddress& local,
bool wait)
{
- return DoConnect(addr_man, &local, wait);
+ return DoConnect(remote, &local, wait);
}
bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
if (!m_impl)
return;
- m_impl->Notify(m_notify);
// Setup the socket as non connection oriented
m_impl->SetLocal(addr.GetAddress());
if (flags & wxSOCKET_REUSEADDR)
projects / wxWidgets.git / blobdiff