X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a161e10152bc5ff7d4a4c7257f64db13f81ddb..c363ead1e206e599d6564ac939ac7342d165e0e3:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 95ce875344..ba15840b28 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -4,7 +4,8 @@ // Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia // Created: April 1997 // Copyright: (C) 1999-1997, Guilhem Lavaux -// (C) 2000-1999, Guillermo Rodriguez Garcia +// (C) 1999-2000, Guillermo Rodriguez Garcia +// (C) 2008 Vadim Zeitlin // RCS_ID: $Id$ // License: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -41,7 +42,31 @@ #include "wx/stopwatch.h" #include "wx/thread.h" #include "wx/evtloop.h" + #include "wx/private/fd.h" +#include "wx/private/socket.h" + +#ifdef __UNIX__ + #include +#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" @@ -66,6 +91,21 @@ IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) 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 // -------------------------------------------------------------------------- @@ -84,39 +124,14 @@ public: DECLARE_NO_COPY_CLASS(wxSocketState) }; -// Conditionally make the socket non-blocking for the lifetime of this object. -class wxSocketUnblocker -{ -public: - wxSocketUnblocker(GSocket *socket, bool unblock = true) - : m_socket(socket), - m_unblock(unblock) - { - if ( m_unblock ) - m_socket->SetNonBlocking(true); - } - - ~wxSocketUnblocker() - { - if ( m_unblock ) - m_socket->SetNonBlocking(false); - } - -private: - GSocket * const m_socket; - bool m_unblock; - - DECLARE_NO_COPY_CLASS(wxSocketUnblocker) -}; - // ============================================================================ -// GSocketManager +// wxSocketManager // ============================================================================ -GSocketManager *GSocketManager::ms_manager = NULL; +wxSocketManager *wxSocketManager::ms_manager = NULL; /* static */ -void GSocketManager::Set(GSocketManager *manager) +void wxSocketManager::Set(wxSocketManager *manager) { wxASSERT_MSG( !ms_manager, "too late to set manager now" ); @@ -124,7 +139,7 @@ void GSocketManager::Set(GSocketManager *manager) } /* static */ -void GSocketManager::Init() +void wxSocketManager::Init() { wxASSERT_MSG( !ms_manager, "shouldn't be initialized twice" ); @@ -154,33 +169,16 @@ void GSocketManager::Init() } // ========================================================================== -// GSocketBase +// wxSocketImpl // ========================================================================== -/* static */ -GSocket *GSocketBase::Create(wxSocketBase& wxsocket) -{ - GSocket * const newsocket = new GSocket(wxsocket); - if ( !GSocketManager::Get()->Init_Socket(newsocket) ) - { - delete newsocket; - return NULL; - } - - return newsocket; -} - -GSocketBase::GSocketBase(wxSocketBase& wxsocket) +wxSocketImpl::wxSocketImpl(wxSocketBase& wxsocket) : m_wxsocket(&wxsocket) { m_fd = INVALID_SOCKET; - m_detected = 0; - m_local = NULL; - m_peer = NULL; - m_error = GSOCK_NOERROR; + m_error = wxSOCKET_NOERROR; m_server = false; m_stream = true; - m_non_blocking = false; SetTimeout(wxsocket.GetTimeout() * 1000); @@ -192,56 +190,409 @@ GSocketBase::GSocketBase(wxSocketBase& wxsocket) m_initialSendBufferSize = -1; } -GSocketBase::~GSocketBase() +wxSocketImpl::~wxSocketImpl() { - if (m_fd != INVALID_SOCKET) + if ( m_fd != INVALID_SOCKET ) Shutdown(); +} + +bool wxSocketImpl::PreCreateCheck(const wxSockAddressImpl& addr) +{ + if ( m_fd != INVALID_SOCKET ) + { + m_error = wxSOCKET_INVSOCK; + return false; + } + + if ( !addr.IsOk() ) + { + m_error = wxSOCKET_INVADDR; + return false; + } + + return true; +} + +void wxSocketImpl::PostCreation() +{ + // FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option +#ifdef SO_NOSIGPIPE + EnableSocketOption(SO_NOSIGPIPE); +#endif + + if ( m_reusable ) + EnableSocketOption(SO_REUSEADDR); - if (m_local) - GAddress_destroy(m_local); + if ( m_broadcast ) + { + wxASSERT_MSG( !m_stream, "broadcasting is for datagram sockets only" ); + + EnableSocketOption(SO_BROADCAST); + } + + if ( m_initialRecvBufferSize >= 0 ) + SetSocketOption(SO_RCVBUF, m_initialRecvBufferSize); + if ( m_initialSendBufferSize >= 0 ) + SetSocketOption(SO_SNDBUF, m_initialSendBufferSize); + + // 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 = m_local.GetLen(); + if ( getsockname(m_fd, m_local.GetWritableAddr(), &lenAddr) != 0 ) + { + Close(); + m_error = wxSOCKET_IOERR; + return m_error; + } + + return wxSOCKET_NOERROR; +} + +wxSocketError wxSocketImpl::CreateServer() +{ + if ( !PreCreateCheck(m_local) ) + return m_error; + + m_server = true; + m_stream = true; + + // do create the socket + m_fd = socket(m_local.GetFamily(), SOCK_STREAM, 0); + + if ( m_fd == INVALID_SOCKET ) + { + m_error = wxSOCKET_IOERR; + return wxSOCKET_IOERR; + } + + PostCreation(); + + // and then bind to and listen on it + // + // FIXME: should we test for m_dobind here? + if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 ) + m_error = wxSOCKET_IOERR; + + if ( IsOk() ) + { + if ( listen(m_fd, 5) != 0 ) + m_error = wxSOCKET_IOERR; + } - if (m_peer) - GAddress_destroy(m_peer); + if ( !IsOk() ) + { + Close(); + return m_error; + } - // cast is ok as all GSocketBase objects we have in our code are really - // GSockets - GSocketManager::Get()->Destroy_Socket(static_cast(this)); + // finally retrieve the address we effectively bound to + return UpdateLocalAddress(); } -/* GSocket_Shutdown: +wxSocketError wxSocketImpl::CreateClient(bool wait) +{ + if ( !PreCreateCheck(m_peer) ) + return m_error; + + m_fd = socket(m_peer.GetFamily(), SOCK_STREAM, 0); + + if ( m_fd == INVALID_SOCKET ) + { + 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.IsOk() ) + { + if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 ) + { + Close(); + m_error = wxSOCKET_IOERR; + return m_error; + } + } + + // 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; +} + + +wxSocketError wxSocketImpl::CreateUDP() +{ + if ( !PreCreateCheck(m_local) ) + return m_error; + + m_stream = false; + m_server = false; + + m_fd = socket(m_local.GetFamily(), SOCK_DGRAM, 0); + + if ( m_fd == INVALID_SOCKET ) + { + m_error = wxSOCKET_IOERR; + return wxSOCKET_IOERR; + } + + PostCreation(); + + if ( m_dobind ) + { + if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 ) + { + Close(); + m_error = wxSOCKET_IOERR; + return m_error; + } + + return UpdateLocalAddress(); + } + + 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() +{ + if ( m_fd != INVALID_SOCKET ) + { + DoClose(); + m_fd = INVALID_SOCKET; + } +} + +/* * Disallow further read/write operations on this socket, close * the fd and disable all callbacks. */ -void GSocketBase::Shutdown() +void wxSocketImpl::Shutdown() { if ( m_fd != INVALID_SOCKET ) { shutdown(m_fd, 1 /* SD_SEND */); Close(); } - - m_detected = GSOCK_LOST_FLAG; } -/* GSocket_SetTimeout: +/* * Sets the timeout for blocking calls. Time is expressed in * milliseconds. */ -void GSocketBase::SetTimeout(unsigned long millis) +void wxSocketImpl::SetTimeout(unsigned long millis) +{ + SetTimeValFromMS(m_timeout, millis); +} + +void wxSocketImpl::NotifyOnStateChange(wxSocketNotify event) +{ + m_wxsocket->OnRequest(event); +} + +/* Address handling */ +wxSocketError wxSocketImpl::SetLocal(const wxSockAddressImpl& local) { -#ifdef __WXMSW__ - m_timeout.tv_sec = (millis / 1000); - m_timeout.tv_usec = (millis % 1000) * 1000; + /* 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 ( !local.IsOk() ) + { + m_error = wxSOCKET_INVADDR; + return wxSOCKET_INVADDR; + } + + m_local = local; + + return wxSOCKET_NOERROR; +} + +wxSocketError wxSocketImpl::SetPeer(const wxSockAddressImpl& peer) +{ + if ( !peer.IsOk() ) + { + m_error = wxSOCKET_INVADDR; + return wxSOCKET_INVADDR; + } + + m_peer = peer; + + return wxSOCKET_NOERROR; +} + +const wxSockAddressImpl& wxSocketImpl::GetLocal() +{ + if ( !m_local.IsOk() ) + UpdateLocalAddress(); + + return m_local; +} + +// ---------------------------------------------------------------------------- +// 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 - m_timeout = millis; + #define DO_WHILE_EINTR( rc, syscall ) rc = (syscall) #endif + +int wxSocketImpl::RecvStream(void *buffer, int size) +{ + int ret; + DO_WHILE_EINTR( ret, recv(m_fd, static_cast(buffer), size, 0) ); + + 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); + + Shutdown(); + + // do not return an error in this case however + } + + return ret; } -void GSocketBase::NotifyOnStateChange(GSocketEvent event) +int wxSocketImpl::SendStream(const void *buffer, int size) { - // GSocketEvent and wxSocketNotify enums have the same elements with the - // same values - m_wxsocket->OnRequest(static_cast(event)); + int ret; + DO_WHILE_EINTR( ret, send(m_fd, static_cast(buffer), size, + wxSOCKET_MSG_NOSIGNAL) ); + + return ret; +} + +int wxSocketImpl::RecvDgram(void *buffer, int size) +{ + wxSockAddressStorage from; + WX_SOCKLEN_T fromlen = sizeof(from); + + int ret; + DO_WHILE_EINTR( ret, recvfrom(m_fd, static_cast(buffer), size, + 0, &from.addr, &fromlen) ); + + if ( ret == SOCKET_ERROR ) + return SOCKET_ERROR; + + m_peer = wxSockAddressImpl(from.addr, fromlen); + if ( !m_peer.IsOk() ) + return -1; + + return ret; +} + +int wxSocketImpl::SendDgram(const void *buffer, int size) +{ + if ( !m_peer.IsOk() ) + { + m_error = wxSOCKET_INVADDR; + return -1; + } + + int ret; + DO_WHILE_EINTR( ret, sendto(m_fd, static_cast(buffer), size, + 0, m_peer.GetAddr(), m_peer.GetLen()) ); + + return ret; +} + +int wxSocketImpl::Read(void *buffer, int size) +{ + // server sockets can't be used for IO, only to accept new connections + if ( m_fd == INVALID_SOCKET || m_server ) + { + m_error = wxSOCKET_INVSOCK; + return -1; + } + + int ret = m_stream ? RecvStream(buffer, size) + : RecvDgram(buffer, size); + + m_error = ret == SOCKET_ERROR ? GetLastError() : wxSOCKET_NOERROR; + + return ret; +} + +int wxSocketImpl::Write(const void *buffer, int size) +{ + if ( m_fd == INVALID_SOCKET || m_server ) + { + m_error = wxSOCKET_INVSOCK; + return -1; + } + + int ret = m_stream ? SendStream(buffer, size) + : SendDgram(buffer, size); + + m_error = ret == SOCKET_ERROR ? GetLastError() : wxSOCKET_NOERROR; + + return ret; } // ========================================================================== @@ -265,7 +616,8 @@ bool wxSocketBase::Initialize() { if ( !m_countInit++ ) { - if ( !GSocket_Init() ) + wxSocketManager * const manager = wxSocketManager::Get(); + if ( !manager || !manager->OnInit() ) { m_countInit--; @@ -282,7 +634,10 @@ void wxSocketBase::Shutdown() wxASSERT_MSG( m_countInit > 0, _T("extra call to Shutdown()") ); if ( --m_countInit == 0 ) { - GSocket_Cleanup(); + wxSocketManager * const manager = wxSocketManager::Get(); + wxCHECK_RET( manager, "should have a socket manager" ); + + manager->OnExit(); } } @@ -292,7 +647,7 @@ void wxSocketBase::Shutdown() void wxSocketBase::Init() { - m_socket = NULL; + m_impl = NULL; m_type = wxSOCKET_UNINIT; // state @@ -301,7 +656,6 @@ void wxSocketBase::Init() m_establishing = m_reading = m_writing = - m_error = m_closed = false; m_lcount = 0; m_timeout = 600; @@ -317,7 +671,8 @@ void wxSocketBase::Init() m_handler = NULL; m_clientData = NULL; m_notify = false; - m_eventmask = 0; + m_eventmask = + m_eventsgot = 0; if ( !IsInitialized() ) { @@ -353,9 +708,8 @@ wxSocketBase::~wxSocketBase() if (!m_beingDeleted) Close(); - // Destroy the GSocket object - if (m_socket) - delete m_socket; + // Destroy the implementation object + delete m_impl; // Free the pushback buffer if (m_unread) @@ -372,7 +726,7 @@ bool wxSocketBase::Destroy() // Shutdown and close the socket Close(); - // Supress events from now on + // Suppress events from now on Notify(false); // schedule this object for deletion @@ -391,22 +745,33 @@ bool wxSocketBase::Destroy() return true; } +// ---------------------------------------------------------------------------- +// 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 InterruptWait(); - if (m_socket) - m_socket->Shutdown(); + if (m_impl) + m_impl->Shutdown(); m_connected = false; m_establishing = false; @@ -420,12 +785,6 @@ wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes) 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; @@ -445,7 +804,7 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes) buffer += total; // If it's indeed closed or if read everything, there is nothing more to do. - if ( !m_socket || !nbytes ) + if ( !m_impl || !nbytes ) return total; wxCHECK_MSG( buffer, 0, "NULL buffer" ); @@ -455,24 +814,26 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes) // polling the socket and don't block at all. if ( m_flags & wxSOCKET_NOWAIT ) { - wxSocketUnblocker unblock(m_socket); - int ret = m_socket->Read(buffer, nbytes); - if ( ret < 0 ) - return 0; - - total += ret; + int ret = m_impl->Read(buffer, nbytes); + 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_socket->Read(buffer, nbytes); + const int ret = m_impl->Read(buffer, nbytes); if ( ret == 0 ) { // for connection-oriented (e.g. TCP) sockets we can only read @@ -483,10 +844,10 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 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; @@ -504,6 +865,11 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes) 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; @@ -511,9 +877,6 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes) wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes) { - wxUint32 len, len2, sig, total; - bool error; - int old_flags; struct { unsigned char sig[4]; @@ -523,86 +886,69 @@ wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes) // 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; - } + if ( !ok ) + SetError(wxSOCKET_IOERR); - // everything was OK - error = false; - -exit: - m_error = error; - m_lcount = total; m_reading = false; SetFlags(old_flags); @@ -617,12 +963,6 @@ wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes) 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; @@ -636,12 +976,6 @@ wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes) 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; @@ -655,7 +989,7 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes) const char *buffer = static_cast(buffer_); // Return if there is nothing to read or the socket is (already?) closed. - if ( !m_socket || !nbytes ) + if ( !m_impl || !nbytes ) return 0; wxCHECK_MSG( buffer, 0, "NULL buffer" ); @@ -663,27 +997,36 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes) wxUint32 total = 0; if ( m_flags & wxSOCKET_NOWAIT ) { - wxSocketUnblocker unblock(m_socket); - const int ret = m_socket->Write(buffer, nbytes); - if ( ret > 0 ) + const int ret = m_impl->Write(buffer, nbytes); + 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_socket->Write(buffer, nbytes); + const int ret = m_impl->Write(buffer, nbytes); if ( ret == 0 ) { m_closed = true; break; } - if ( ret < 0 ) - return 0; + if ( ret == -1 ) + { + SetError(wxSOCKET_IOERR); + break; + } total += ret; if ( !(m_flags & wxSOCKET_WAITALL) ) @@ -695,6 +1038,9 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes) buffer += ret; } + + if ( ((m_flags & wxSOCKET_WAITALL) && nbytes) || !total ) + SetError(wxSOCKET_IOERR); } return total; @@ -702,8 +1048,6 @@ wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes) wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes) { - wxUint32 total; - bool error; struct { unsigned char sig[4]; @@ -713,8 +1057,7 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes) // 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; @@ -727,33 +1070,31 @@ wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes) 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; } @@ -763,7 +1104,7 @@ wxSocketBase& wxSocketBase::Unread(const void *buffer, wxUint32 nbytes) if (nbytes != 0) Pushback(buffer, nbytes); - m_error = false; + SetError(wxSOCKET_NOERROR); m_lcount = nbytes; return *this; @@ -778,6 +1119,7 @@ wxSocketBase& wxSocketBase::Discard() // Mask read events m_reading = true; + const int old_flags = m_flags; SetFlags(wxSOCKET_NOWAIT); do @@ -789,11 +1131,13 @@ wxSocketBase& wxSocketBase::Discard() delete[] buffer; m_lcount = total; - m_error = false; + SetError(wxSOCKET_NOERROR); // Allow read events again m_reading = false; + SetFlags(old_flags); + return *this; } @@ -801,122 +1145,94 @@ wxSocketBase& wxSocketBase::Discard() // Wait functions // -------------------------------------------------------------------------- -/* GSocket_Select: - * 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. */ -GSocketEventFlags GSocketBase::Select(GSocketEventFlags flags) -{ - assert(this); - - GSocketEventFlags result = 0; - fd_set readfds; - fd_set writefds; - fd_set exceptfds; - struct timeval tv; - - if (m_fd == -1) - return (GSOCK_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 & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG) - wxFD_SET(m_fd, &writefds); - wxFD_SET(m_fd, &exceptfds); - - /* Check 'sticky' CONNECTION flag first */ - result |= GSOCK_CONNECTION_FLAG & m_detected; - - /* If we have already detected a LOST event, then don't try - * to do any further processing. - */ - if ((m_detected & GSOCK_LOST_FLAG) != 0) - { - m_establishing = false; - return (GSOCK_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 = GSOCK_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 (GSOCK_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 |= GSOCK_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 |= GSOCK_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); - - if (error) - { - m_detected = GSOCK_LOST_FLAG; - - /* LOST event: Abort any further processing */ - return (GSOCK_LOST_FLAG & flags); - } - else - { - m_detected |= GSOCK_CONNECTION_FLAG; - } + pwritefds = &writefds; + wxFD_ZERO(pwritefds); + wxFD_SET(m_fd, pwritefds); } - else + + wxFD_ZERO(&exceptfds); + wxFD_SET(m_fd, &exceptfds); + + 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; + } + + 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 |= GSOCK_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 GSocket_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) { - wxCHECK_MSG( m_socket, false, "can't wait on invalid socket" ); + wxCHECK_MSG( m_impl, false, "can't wait on invalid socket" ); // This can be set to true from Interrupt() to exit this function a.s.a.p. m_interrupt = false; @@ -931,9 +1247,10 @@ 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(); } @@ -943,67 +1260,72 @@ wxSocketBase::DoWait(long seconds, long milliseconds, wxSocketEventFlags flags) 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 GSOCK_LOST_FLAG is not - // specified in flags to wait for. - const GSocketEventFlags - result = m_socket->Select(flags | GSOCK_LOST_FLAG); - - // Incoming connection (server) or connection established (client)? - if ( result & GSOCK_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 & GSOCK_INPUT_FLAG) || (result & GSOCK_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 & GSOCK_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; - if ( flags & GSOCK_LOST_FLAG ) + if ( flags & wxSOCKET_LOST_FLAG ) gotEvent = true; 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; @@ -1012,10 +1334,10 @@ wxSocketBase::DoWait(long seconds, long milliseconds, wxSocketEventFlags flags) bool wxSocketBase::Wait(long seconds, long milliseconds) { return DoWait(seconds, milliseconds, - GSOCK_INPUT_FLAG | - GSOCK_OUTPUT_FLAG | - GSOCK_CONNECTION_FLAG | - GSOCK_LOST_FLAG + wxSOCKET_INPUT_FLAG | + wxSOCKET_OUTPUT_FLAG | + wxSOCKET_CONNECTION_FLAG | + wxSOCKET_LOST_FLAG ); } @@ -1025,22 +1347,22 @@ bool wxSocketBase::WaitForRead(long seconds, long milliseconds) if ( m_unread ) return true; - // Note that GSOCK_INPUT_LOST has to be explicitly passed to DoWait + // Note that wxSOCKET_INPUT_LOST has to be explicitly passed to DoWait // because of the semantics of WaitForRead: a return value of true means - // that a GSocket_Read call will return immediately, not that there is + // that a Read call will return immediately, not that there is // actually data to read. - return DoWait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG); + return DoWait(seconds, milliseconds, wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG); } bool wxSocketBase::WaitForWrite(long seconds, long milliseconds) { - return DoWait(seconds, milliseconds, GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG); + return DoWait(seconds, milliseconds, wxSOCKET_OUTPUT_FLAG | wxSOCKET_LOST_FLAG); } bool wxSocketBase::WaitForLost(long seconds, long milliseconds) { - return DoWait(seconds, milliseconds, GSOCK_LOST_FLAG); + return DoWait(seconds, milliseconds, wxSOCKET_LOST_FLAG); } // -------------------------------------------------------------------------- @@ -1051,36 +1373,28 @@ bool wxSocketBase::WaitForLost(long seconds, long milliseconds) // 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_socket) + const wxSockAddressImpl& peer = m_impl->GetPeer(); + if ( !peer.IsOk() ) return false; - peer = m_socket->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_socket) + const wxSockAddressImpl& local = m_impl->GetLocal(); + if ( !local.IsOk() ) return false; - local = m_socket->GetLocal(); - addr_man.SetAddress(local); - GAddress_destroy(local); + addr.SetAddress(local); return true; } @@ -1131,8 +1445,8 @@ void wxSocketBase::SetTimeout(long seconds) { m_timeout = seconds; - if (m_socket) - m_socket->SetTimeout(m_timeout * 1000); + if (m_impl) + m_impl->SetTimeout(m_timeout * 1000); } void wxSocketBase::SetFlags(wxSocketFlags flags) @@ -1152,97 +1466,67 @@ void wxSocketBase::SetFlags(wxSocketFlags flags) // Event handling // -------------------------------------------------------------------------- -// A note on how events are processed, which is probably the most -// difficult thing to get working right while keeping the same API -// and functionality for all platforms. -// -// When GSocket detects an event, it calls wx_socket_callback, which in -// turn just calls wxSocketBase::OnRequest in the corresponding wxSocket -// object. OnRequest does some housekeeping, and if the event is to be -// propagated to the user, it creates a new wxSocketEvent object and -// posts it. The event is not processed immediately, but delayed with -// AddPendingEvent instead. This is necessary in order to decouple the -// event processing from wx_socket_callback; otherwise, subsequent IO -// calls made from the user event handler would fail, as gtk callbacks -// are not reentrant. -// -// Note that, unlike events, user callbacks (now deprecated) are _not_ -// decoupled from wx_socket_callback and thus they suffer from a variety -// of problems. Avoid them where possible and use events instead. - -extern "C" -void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket), - GSocketEvent notification, - char *cdata) -{ - wxSocketBase *sckobj = (wxSocketBase *)cdata; - - sckobj->OnRequest((wxSocketNotify) notification); -} - 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_socket->Select(GSOCK_INPUT_FLAG)) - return; + flag = wxSOCKET_INPUT_FLAG; break; case wxSOCKET_OUTPUT: - if (m_writing || !m_socket->Select(GSOCK_OUTPUT_FLAG)) - return; + flag = wxSOCKET_OUTPUT_FLAG; break; - case wxSOCKET_LOST: - m_connected = false; - m_establishing = false; + case wxSOCKET_CONNECTION: + flag = wxSOCKET_CONNECTION_FLAG; break; - } - // Schedule the event + case wxSOCKET_LOST: + flag = wxSOCKET_LOST_FLAG; + break; - wxSocketEventFlags flag = 0; - wxUnusedVar(flag); - switch (notification) - { - case GSOCK_INPUT: flag = GSOCK_INPUT_FLAG; break; - case GSOCK_OUTPUT: flag = GSOCK_OUTPUT_FLAG; break; - case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break; - case GSOCK_LOST: flag = GSOCK_LOST_FLAG; break; default: - wxLogWarning(_("wxSocket: unknown event!.")); - return; + wxFAIL_MSG( "unknown wxSocket notification" ); } - if (((m_eventmask & flag) == flag) && m_notify) + // if we lost the connection the socket is now closed + if ( notification == wxSOCKET_LOST ) + m_closed = true; + + // remember the events which were generated for this socket, we're going to + // use this in DoWait() + m_eventsgot |= flag; + + // 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_socket) - m_socket->Notify(notify); } void wxSocketBase::SetNotify(wxSocketEventFlags flags) @@ -1318,44 +1602,43 @@ wxUint32 wxSocketBase::GetPushback(void *buffer, wxUint32 size, bool peek) // Ctor // -------------------------------------------------------------------------- -wxSocketServer::wxSocketServer(const wxSockAddress& addr_man, +wxSocketServer::wxSocketServer(const wxSockAddress& addr, wxSocketFlags flags) : wxSocketBase(flags, wxSOCKET_SERVER) { wxLogTrace( wxTRACE_Socket, _T("Opening wxSocketServer") ); - m_socket = GSocket::Create(*this); + m_impl = wxSocketImpl::Create(*this); - if (!m_socket) + if (!m_impl) { - wxLogTrace( wxTRACE_Socket, _T("*** GSocket_new failed") ); + wxLogTrace( wxTRACE_Socket, _T("*** Failed to create m_impl") ); return; } // Setup the socket as server - m_socket->Notify(m_notify); - m_socket->SetLocal(addr_man.GetAddress()); + m_impl->SetLocal(addr.GetAddress()); if (GetFlags() & wxSOCKET_REUSEADDR) { - m_socket->SetReusable(); + m_impl->SetReusable(); } if (GetFlags() & wxSOCKET_BROADCAST) { - m_socket->SetBroadcast(); + m_impl->SetBroadcast(); } if (GetFlags() & wxSOCKET_NOBIND) { - m_socket->DontDoBind(); + m_impl->DontDoBind(); } - if (m_socket->SetServer() != GSOCK_NOERROR) + if (m_impl->CreateServer() != wxSOCKET_NOERROR) { - delete m_socket; - m_socket = NULL; + delete m_impl; + m_impl = NULL; - wxLogTrace( wxTRACE_Socket, _T("*** GSocket_SetServer failed") ); + wxLogTrace( wxTRACE_Socket, _T("*** CreateServer() failed") ); return; } - wxLogTrace( wxTRACE_Socket, _T("wxSocketServer on fd %d"), m_socket->m_fd ); + wxLogTrace( wxTRACE_Socket, _T("wxSocketServer on fd %d"), m_impl->m_fd ); } // -------------------------------------------------------------------------- @@ -1364,17 +1647,34 @@ wxSocketServer::wxSocketServer(const wxSockAddress& addr_man, bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait) { - if (!m_socket) + 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 ) + { + // wait until we get a connection + if ( !m_impl->SelectWithTimeout(wxSOCKET_INPUT_FLAG) ) + { + SetError(wxSOCKET_TIMEDOUT); + + 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_socket, !wait); - sock.m_socket = m_socket->WaitConnection(sock); + sock.m_impl = m_impl->Accept(sock); + + if ( !sock.m_impl ) + { + SetError(m_impl->GetLastError()); - if ( !sock.m_socket ) return false; + } sock.m_type = wxSOCKET_BASE; sock.m_connected = true; @@ -1399,47 +1699,37 @@ wxSocketBase *wxSocketServer::Accept(bool wait) bool wxSocketServer::WaitForAccept(long seconds, long milliseconds) { - return DoWait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); + return DoWait(seconds, milliseconds, wxSOCKET_CONNECTION_FLAG); } bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen) { - wxASSERT_MSG( m_socket, _T("Socket not initialised") ); + wxASSERT_MSG( m_impl, _T("Socket not initialised") ); - if (m_socket->GetSockOpt(level, optname, optval, optlen) - != GSOCK_NOERROR) - { + SOCKOPTLEN_T lenreal = *optlen; + if ( getsockopt(m_impl->m_fd, level, optname, + static_cast(optval), &lenreal) != 0 ) return false; - } + + *optlen = lenreal; + return true; } -bool wxSocketBase::SetOption(int level, int optname, const void *optval, - int optlen) +bool +wxSocketBase::SetOption(int level, int optname, const void *optval, int optlen) { - wxASSERT_MSG( m_socket, _T("Socket not initialised") ); + wxASSERT_MSG( m_impl, _T("Socket not initialised") ); - if (m_socket->SetSockOpt(level, optname, optval, optlen) - != GSOCK_NOERROR) - { - return false; - } - return true; + return setsockopt(m_impl->m_fd, level, optname, + static_cast(optval), optlen) == 0; } bool wxSocketBase::SetLocal(const wxIPV4address& local) { - GAddress* la = local.GetAddress(); - - // If the address is valid, save it for use when we call Connect - if (la && la->m_addr) - { - m_localAddress = local; + m_localAddress = local; - return true; - } - - return false; + return true; } // ========================================================================== @@ -1465,71 +1755,56 @@ wxSocketClient::~wxSocketClient() // Connect // -------------------------------------------------------------------------- -bool wxSocketClient::DoConnect(const wxSockAddress& addr_man, +bool wxSocketClient::DoConnect(const wxSockAddress& remote, const wxSockAddress* local, bool wait) { - if (m_socket) + if ( m_impl ) { - // Shutdown and destroy the socket + // Shutdown and destroy the old socket Close(); - delete m_socket; + delete m_impl; } - m_socket = GSocket::Create(*this); m_connected = false; m_establishing = false; - if (!m_socket) + // 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_socket, !wait); - // Reuse makes sense for clients too, if we are trying to rebind to the same port if (GetFlags() & wxSOCKET_REUSEADDR) - { - m_socket->SetReusable(); - } + m_impl->SetReusable(); if (GetFlags() & wxSOCKET_BROADCAST) - { - m_socket->SetBroadcast(); - } + m_impl->SetBroadcast(); if (GetFlags() & wxSOCKET_NOBIND) - { - m_socket->DontDoBind(); - } + 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_socket->SetLocal(la); - } + if ( local ) + m_impl->SetLocal(local->GetAddress()); -#if defined(__WXMSW__) || defined(__WXGTK__) - m_socket->SetInitialSocketBuffers(m_initialRecvBufferSize, m_initialSendBufferSize); -#endif + m_impl->SetInitialSocketBuffers(m_initialRecvBufferSize, m_initialSendBufferSize); - m_socket->SetPeer(addr_man.GetAddress()); - const GSocketError err = m_socket->Connect(GSOCK_STREAMED); + m_impl->SetPeer(remote.GetAddress()); - //this will register for callbacks - must be called after m_socket->m_fd was initialized - m_socket->Notify(m_notify); + // Finally do create the socket and connect to the peer + const wxSocketError err = m_impl->CreateClient(wait); - if (err != GSOCK_NOERROR) + if ( err != wxSOCKET_NOERROR ) { - if (err == GSOCK_WOULDBLOCK) + if ( err == wxSOCKET_WOULDBLOCK ) + { + wxASSERT_MSG( !wait, "shouldn't get this for blocking connect" ); + m_establishing = true; + } return false; } @@ -1538,16 +1813,16 @@ bool wxSocketClient::DoConnect(const wxSockAddress& addr_man, 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) @@ -1559,52 +1834,50 @@ bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds) return true; } - wxCHECK_MSG( m_establishing && m_socket, false, + wxCHECK_MSG( m_establishing && m_impl, false, "No connection establishment attempt in progress" ); - // we must specify GSOCK_LOST_FLAG here explicitly because we must return + // we must specify wxSOCKET_LOST_FLAG here explicitly because we must return // true if the connection establishment process is finished, whether it is // over because we successfully connected or because we were not able to // connect return DoWait(seconds, milliseconds, - GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG); + wxSOCKET_CONNECTION_FLAG | wxSOCKET_LOST_FLAG); } // ========================================================================== // wxDatagramSocket // ========================================================================== -/* NOTE: experimental stuff - might change */ - wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr, wxSocketFlags flags ) : wxSocketBase( flags, wxSOCKET_DATAGRAM ) { // Create the socket - m_socket = GSocket::Create(*this); + m_impl = wxSocketImpl::Create(*this); - if (!m_socket) + if (!m_impl) return; - m_socket->Notify(m_notify); // Setup the socket as non connection oriented - m_socket->SetLocal(addr.GetAddress()); + m_impl->SetLocal(addr.GetAddress()); if (flags & wxSOCKET_REUSEADDR) { - m_socket->SetReusable(); + m_impl->SetReusable(); } if (GetFlags() & wxSOCKET_BROADCAST) { - m_socket->SetBroadcast(); + m_impl->SetBroadcast(); } if (GetFlags() & wxSOCKET_NOBIND) { - m_socket->DontDoBind(); + m_impl->DontDoBind(); } - if ( m_socket->SetNonOriented() != GSOCK_NOERROR ) + + if ( m_impl->CreateUDP() != wxSOCKET_NOERROR ) { - delete m_socket; - m_socket = NULL; + delete m_impl; + m_impl = NULL; return; } @@ -1626,9 +1899,9 @@ wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr, const void* buf, wxUint32 nBytes ) { - wxASSERT_MSG( m_socket, _T("Socket not initialised") ); + wxASSERT_MSG( m_impl, _T("Socket not initialised") ); - m_socket->SetPeer(addr.GetAddress()); + m_impl->SetPeer(addr.GetAddress()); Write(buf, nBytes); return (*this); } @@ -1642,7 +1915,8 @@ class wxSocketModule : public wxModule public: virtual bool OnInit() { - // wxSocketBase will call GSocket_Init() itself when/if needed + // wxSocketBase will call Initialize() itself only if sockets are + // really used, don't do it from here return true; }