X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46ccb5107ff22cb5cc1b36ef2a28ea1e31b0fc91..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 414efb7b8e..0f7a633165 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -1,18 +1,17 @@ -//////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// // Name: socket.cpp // Purpose: Socket handler classes -// Authors: Guilhem Lavaux (completely rewritten from a basic API of Andrew -// Davidson(1995) in wxWeb) +// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia // Created: April 1997 -// Updated: March 1998 -// Copyright: (C) 1998, 1997, Guilhem Lavaux +// Updated: September 1999 +// Copyright: (C) 1999, 1998, 1997, Guilhem Lavaux +// (C) 1999, Guillermo Rodriguez Garcia // RCS_ID: $Id$ // License: see wxWindows license -//////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// + #ifdef __GNUG__ #pragma implementation "socket.h" -// #pragma interface -// #pragma implementation "socket.cpp" #endif // For compilers that support precompilation, includes "wx.h". @@ -22,136 +21,37 @@ #pragma hdrstop #endif +#if wxUSE_SOCKETS + ///////////////////////////////////////////////////////////////////////////// // wxWindows headers ///////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include - -// Not enough OS behaviour defined for wxStubs -#ifndef __WXSTUBS__ +#include "wx/defs.h" +#include "wx/object.h" +#include "wx/string.h" +#include "wx/timer.h" +#include "wx/utils.h" +#include "wx/module.h" +#include "wx/log.h" #include #include #include -///////////////////////////////////////////////////////////////////////////// -// System specific headers -///////////////////////////////////////////////////////////////////////////// -#if defined(__WINDOWS__) -#include -#endif // __WINDOWS__ - -#if defined(__UNIX__) - -#ifdef VMS -#include -#else -#include -#endif -#include - -#include -#include - -#ifdef sun -#include -#endif - -#endif // __UNIX__ - -#include -#include - -#ifdef _MSC_VER -#include -#endif - -#if defined(__WXMOTIF__) || defined(__WXXT__) -#include - -///////////////////////////// -// Needs internal variables -///////////////////////////// -#ifdef __WXXT__ -#define Uses_XtIntrinsic -#endif - -#endif - -#if defined(__WXGTK__) -#include -#endif - ///////////////////////////////////////////////////////////////////////////// // wxSocket headers ///////////////////////////////////////////////////////////////////////////// -#define WXSOCK_INTERNAL #include "wx/sckaddr.h" #include "wx/socket.h" -///////////////////////////////////////////////////////////////////////////// -// Some patch ///// BEGIN -///////////////////////////////////////////////////////////////////////////// -#ifdef __WINDOWS__ -#define close closesocket -#define ioctl ioctlsocket -#ifdef errno -#undef errno -#endif -#define errno WSAGetLastError() -#ifdef EWOULDBLOCK -#undef EWOULDBLOCK -#endif -#define EWOULDBLOCK WSAEWOULDBLOCK -#define ETIMEDOUT WSAETIMEDOUT -#undef EINTR -#define EINTR WSAEINTR -#endif - -#ifndef __WINDOWS__ -#define INVALID_SOCKET -1 -#endif - -#ifdef __WXMOTIF__ -#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext()) -#endif - -#ifdef __WINDOWS__ -// This is an MS TCP/IP routine and is not needed here. Some WinSock -// implementations (such as PC-NFS) will require you to include this -// or a similar routine (see appendix in WinSock doc or help file). - -#if defined( NEED_WSAFDIsSet ) || defined( _MSC_VER ) -int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set) -{ - int i = set->fd_count; - - while (i--) - { - if (set->fd_array[i] == fd) - return 1; - } - - return 0; -} -#endif -#endif -#if defined(__WINDOWS__) -#define PROCESS_EVENTS() wxYield() -#elif defined(__WXXT__) || defined(__WXMOTIF__) -#define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll) +#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMOTIF__) || defined(__WXMAC__) + #define PROCESS_EVENTS() wxYield() #elif defined(__WXGTK__) -#define PROCESS_EVENTS() gtk_main_iteration() + #include + #define PROCESS_EVENTS() gtk_main_iteration() #endif -///////////////////////////////////////////////////////////////////////////// -// Some patch ///// END -///////////////////////////////////////////////////////////////////////////// // -------------------------------------------------------------- // ClassInfos @@ -160,342 +60,682 @@ int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set) IMPLEMENT_CLASS(wxSocketBase, wxObject) IMPLEMENT_CLASS(wxSocketServer, wxSocketBase) IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) -IMPLEMENT_CLASS(wxSocketHandler, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent) #endif -class wxSockWakeUp : public wxTimer { +class wxSocketState : public wxObject +{ public: - int *my_id; - int n_val; - wxSocketBase *sock; - - wxSockWakeUp(wxSocketBase *_sock, int *id, int new_val) { - my_id = id; n_val = new_val; - sock = _sock; - } - virtual void Notify() { - *my_id = n_val; - if (sock) sock->Notify(FALSE); - } -}; + bool notify_state; + GSocketEventFlags evt_notify_state; + wxSockFlags socket_flags; + wxSocketBase::wxSockCbk c_callback; + char *c_callback_data; -/// Socket request -class SockRequest : public wxObject { public: - char *buffer; - size_t size, nbytes; - bool done; - int error; - wxSockWakeUp *auto_wakeup; - wxSocketBase::wxRequestNotify type; + wxSocketState() : wxObject() {} }; - -///////////////////////////////////////////////////////////////////////////// -// Some internal define -///////////////////////////////////////////////////////////////////////////// - // -------------------------------------------------------------- -// --------- wxSocketBase CONSTRUCTOR --------------------------- +// wxSocketBase ctor and dtor // -------------------------------------------------------------- -wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags, - wxSocketBase::wxSockType _type) : + +wxSocketBase::wxSocketBase(wxSockFlags _flags, wxSockType _type) : wxEvtHandler(), - m_flags(_flags), m_type(_type), m_connected(FALSE), m_connecting(FALSE), - m_fd(INVALID_SOCKET), m_waitflags(0), m_cbk(0), m_cdata(0), m_id(-1), - m_handler(0), - m_neededreq((wxRequestNotify)(REQ_READ | REQ_LOST)), - m_cbkon(FALSE), - m_unread(NULL), m_unrd_size(0), - m_processing(FALSE), - m_timeout(3600), m_wantbuf(0) + m_socket(NULL), m_id(-1), + m_flags(_flags), m_type(_type), + m_neededreq(0), m_notify_state(FALSE), + m_connected(FALSE), m_establishing(FALSE), + m_reading(FALSE), m_writing(FALSE), + m_error(FALSE), m_lcount(0), m_timeout(600), m_states(), + m_unread(NULL), m_unrd_size(0), m_unrd_cur(0), + m_defering(NO_DEFER), m_defer_buffer(NULL), m_defer_timer(NULL), + m_cbk(NULL), m_cdata(NULL) { - m_internal = new wxSockInternal; -#if defined(__WXXT__) || defined(__WXMOTIF__) || defined(__WXGTK__) - m_internal->sock_inputid = 0; - m_internal->sock_outputid = 0; - m_internal->sock_exceptid = 0; -#endif -#ifdef __WINDOWS__ - m_internal->my_msg = 0; -#endif } wxSocketBase::wxSocketBase() : wxEvtHandler(), - m_flags(WAITALL), m_type(SOCK_UNINIT), m_connected(FALSE), - m_connecting(FALSE), m_fd(INVALID_SOCKET), m_waitflags(0), - m_cbk(0), m_cdata(0), - m_id(-1), m_handler(0), - m_neededreq((wxRequestNotify)(REQ_READ | REQ_LOST)), - m_cbkon(FALSE), - m_unread(NULL), m_unrd_size(0), - m_processing(FALSE), - m_timeout(3600), m_wantbuf(0) + m_socket(NULL), m_id(-1), + m_flags(NONE), m_type(SOCK_UNINIT), + m_neededreq(0), m_notify_state(FALSE), + m_connected(FALSE), m_establishing(FALSE), + m_reading(FALSE), m_writing(FALSE), + m_error(FALSE), m_lcount(0), m_timeout(600), m_states(), + m_unread(NULL), m_unrd_size(0), m_unrd_cur(0), + m_defering(NO_DEFER), m_defer_buffer(NULL), m_defer_timer(NULL), + m_cbk(NULL), m_cdata(NULL) { - m_internal = new wxSockInternal; -#if defined(__WXXT__) || defined(__WXMOTIF__) || defined(__WXGTK__) - m_internal->sock_inputid = 0; - m_internal->sock_outputid = 0; - m_internal->sock_exceptid = 0; -#endif -#ifdef __WINDOWS__ - m_internal->my_msg = 0; -#endif } -// -------------------------------------------------------------- -// --------- wxSocketBase CONSTRUCTOR --------------------------- -// -------------------------------------------------------------- wxSocketBase::~wxSocketBase() { - DestroyCallbacks(); - Close(); - if (m_unread) free(m_unread); - if (m_handler) { -#ifdef __WINDOWS__ - if (m_internal->my_msg) - m_handler->DestroyMessage(m_internal->my_msg); -#endif - m_handler->UnRegister(this); - } - m_states.DeleteContents(TRUE); - delete m_internal; + // Shutdown and close the socket + Close(); + + // Destroy the GSocket object + if (m_socket) + GSocket_destroy(m_socket); } bool wxSocketBase::Close() { - if (m_fd != INVALID_SOCKET) { - for (int i=0;i<3;i++) { - wxNode *n, *node = req_list[i].First(); - - while (node) { - SockRequest *req = (SockRequest *)node->Data(); - req->done = TRUE; - - n = node->Next(); - delete node; - node = n; - } - } + if (m_socket) + { + // Disable callbacks + GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG); - DestroyCallbacks(); - shutdown(m_fd, 2); - close(m_fd); - m_fd = INVALID_SOCKET; + // Shutdown the connection + GSocket_Shutdown(m_socket); m_connected = FALSE; + m_establishing = FALSE; } return TRUE; } // -------------------------------------------------------------- -// --------- wxSocketBase base IO functions --------------------- +// wxSocketBase basic IO operations // -------------------------------------------------------------- -wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes) -{ - m_lcount = GetPushback(buffer, nbytes, FALSE); - // If we have got the whole needed buffer or if we don't want to - // wait then it returns immediately. - if (!nbytes || (m_lcount && !(m_flags & WAITALL)) ) - return *this; +// All IO operations {Read, Write, ReadMsg, WriteMsg, Peek, +// Unread, Discard} update m_error and m_lcount. +// +// TODO: Should Connect, Accept and AcceptWith update m_error? - WantBuffer(buffer, nbytes, EVT_READ); +class _wxSocketInternalTimer: public wxTimer +{ +public: + int *m_state; + unsigned long m_new_val; - return *this; -} + void Notify() + { + *m_state = m_new_val; // Change the value + } +}; -wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes) +wxUint32 wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes) { - size_t nbytes_old = nbytes; + // Timer for timeout + _wxSocketInternalTimer timer; + + //wxLogMessage("Entrando a DeferRead, nbytes = %d", nbytes); + wxASSERT(m_defering == NO_DEFER); + + // Set the defering mode to READ. + m_defering = DEFER_READ; - nbytes -= GetPushback(buffer, nbytes, TRUE); - if (!nbytes) { - m_lcount = nbytes_old; - return *this; + // Set the current buffer. + m_defer_buffer = buffer; + m_defer_nbytes = nbytes; + m_defer_timer = &timer; + + timer.m_state = (int *)&m_defer_buffer; + timer.m_new_val = 0; + + timer.Start(m_timeout * 1000, FALSE); + + // If the socket is readable, call DoDefer for the first time + if (GSocket_Select(m_socket, GSOCK_INPUT_FLAG)) + { + //wxLogMessage("Llamando al primer DoDefer"); + DoDefer(); } - WantBuffer(buffer, nbytes, EVT_PEEK); + // Wait for buffer completion. + while (m_defer_buffer != NULL) + PROCESS_EVENTS(); + + timer.Stop(); - return *this; + // Disable defering mode. + m_defering = NO_DEFER; + m_defer_timer = NULL; + + // Return the number of bytes read from the socket. + //wxLogMessage("Saliendo de DeferRead: total: %d bytes", nbytes - m_defer_nbytes); + return nbytes-m_defer_nbytes; } -wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes) +wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes) { - WantBuffer((char *)buffer, nbytes, EVT_WRITE); + // Mask read events + m_reading = TRUE; + + m_lcount = _Read(buffer, nbytes); + + // If in WAITALL mode, all bytes should have been read. + if (m_flags & WAITALL) + m_error = (m_lcount != nbytes); + else + m_error = (m_lcount == 0); + + // Trigger another read event if there is still data available. + m_reading = FALSE; + // TODO: TriggerRead + return *this; } -wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes) +wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes) +{ + int total; + int ret = 1; + + // we try this even if the connection has already been closed. + total = GetPushback(buffer, nbytes, FALSE); + nbytes -= total; + buffer += total; + + // If the socket is not connected, or we have got the whole + // needed buffer, return immedately + if (!m_connected || !m_socket || !nbytes) + return total; + + // Possible combinations (they are checked in this order) + // NOWAIT + // SPEED | WAITALL + // SPEED + // WAITALL + // NONE + // + if (m_flags & NOWAIT) // NOWAIT + { + GSocket_SetNonBlocking(m_socket, TRUE); + ret = GSocket_Read(m_socket, buffer, nbytes); + GSocket_SetNonBlocking(m_socket, FALSE); + + if (ret > 0) + total += ret; + } + else if ((m_flags & SPEED) && (m_flags & WAITALL)) // SPEED, WAITALL + { + while (ret > 0 && nbytes > 0) + { + ret = GSocket_Read(m_socket, buffer, nbytes); + total += ret; + buffer += ret; + nbytes -= ret; + } + // In case the last call was an error ... + if (ret < 0) + total++; + } + else if (m_flags & SPEED) // SPEED, !WAITALL + { + ret = GSocket_Read(m_socket, buffer, nbytes); + + if (ret > 0) + total += ret; + } + else // NONE or WAITALL + { + ret = DeferRead(buffer, nbytes); + + if (ret > 0) + total += ret; + } + + return total; +} + +wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) { - SockMsg msg; - size_t len, len2, sig; +#define MAX_DISCARD_SIZE (10 * 1024) + + wxUint32 len, len2, sig, total; + bool error; + int old_flags; + struct + { + unsigned char sig[4]; + unsigned char len[4]; + } msg; + + // Mask read events + m_reading = TRUE; - Read((char *)&msg, sizeof(msg)); - if (m_lcount != sizeof(msg)) - return *this; + total = 0; + error = TRUE; + old_flags = m_flags; + SetFlags((m_flags & SPEED) | WAITALL); - sig = msg.sig[0] & 0xff; - sig |= (size_t)(msg.sig[1] & 0xff) << 8; - sig |= (size_t)(msg.sig[2] & 0xff) << 16; - sig |= (size_t)(msg.sig[3] & 0xff) << 24; + if (_Read((char *)&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) - return *this; - len = msg.len[0] & 0xff; - len |= (size_t)(msg.len[1] & 0xff) << 8; - len |= (size_t)(msg.len[2] & 0xff) << 16; - len |= (size_t)(msg.len[3] & 0xff) << 24; - len2 = len; + { + wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg")); + goto exit; + } + + len = (wxUint32)msg.len[0]; + len |= (wxUint32)(msg.len[1] << 8); + len |= (wxUint32)(msg.len[2] << 16); + len |= (wxUint32)(msg.len[3] << 24); + + //wxLogMessage("Readmsg: %d %d %d %d -> len == %d", + // msg.len[0], msg.len[1], msg.len[2], msg.len[3], len); + if (len > nbytes) + { + len2 = len - nbytes; len = nbytes; + } else len2 = 0; - if (Read(buffer, len).LastCount() != len) - return *this; - if (len2 && (Read(NULL, len2).LastCount() != len2)) - return *this; - if (Read((char *)&msg, sizeof(msg)).LastCount() != sizeof(msg)) - return *this; - - sig = msg.sig[0] & 0xff; - sig |= (size_t)(msg.sig[1] & 0xff) << 8; - sig |= (size_t)(msg.sig[2] & 0xff) << 16; - sig |= (size_t)(msg.sig[3] & 0xff) << 24; -// ERROR + // This check is necessary so that we don't attemp to read if + // the msg was zero bytes long. + if (len) + { + total = _Read(buffer, len); + + if (total != len) + goto exit; + } + if (len2) + { + char *discard_buffer = new char[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 = _Read(discard_buffer, discard_len); + len2 -= discard_len; + } + while ((discard_len > 0) && len2); + + delete [] discard_buffer; + + if (len2 != 0) + goto exit; + } + if (_Read((char *)&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) - return *this; + { + //wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg")); + goto exit; + } + + // everything was OK + error = FALSE; + +exit: + m_error = error; + m_lcount = total; + m_reading = FALSE; + SetFlags(old_flags); + + // TODO: TriggerRead + return *this; + +#undef MAX_DISCARD_SIZE +} + +wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes) +{ + // Mask read events + m_reading = TRUE; + + m_lcount = _Read(buffer, nbytes); + Pushback(buffer, nbytes); + // If in WAITALL mode, all bytes should have been read. + if (m_flags & WAITALL) + m_error = (m_lcount != nbytes); + else + m_error = (m_lcount == 0); + + // Trigger another read event if there is still data available. + m_reading = FALSE; + + // TODO: TriggerRead + return *this; +} + +wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes) +{ + // Timer for timeout + _wxSocketInternalTimer timer; + + wxASSERT(m_defering == NO_DEFER); + //wxLogMessage("Entrando a DeferWrite"); + + m_defering = DEFER_WRITE; + + // Set the current buffer + m_defer_buffer = (char *)buffer; + m_defer_nbytes = nbytes; + m_defer_timer = &timer; + + // Start timer + timer.m_state = (int *)&m_defer_buffer; + timer.m_new_val = 0; + + timer.Start(m_timeout * 1000, FALSE); + + // If the socket is writable, call DoDefer for the first time + if (GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG)) + { + //wxLogMessage("Llamando al primer DoDefer"); + DoDefer(); + } + + // Wait for buffer completion. + while (m_defer_buffer != NULL) + PROCESS_EVENTS(); + + timer.Stop(); + + // Disable defering mode + m_defer_timer = NULL; + m_defering = NO_DEFER; + + wxString s; + s.Printf(wxT("Saliendo de DeferWrite: total %d bytes"), nbytes-m_defer_nbytes); + //wxLogMessage(s); + + return nbytes-m_defer_nbytes; +} + +wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes) +{ + // Mask write events + m_writing = TRUE; + + m_lcount = _Write(buffer, nbytes); + + // If in WAITALL mode, all bytes should have been written. + if (m_flags & WAITALL) + m_error = (m_lcount != nbytes); + else + m_error = (m_lcount == 0); + + // Trigger another write event if the socket is still writable + m_writing = FALSE; + + // TODO: TriggerWrite return *this; } -wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes) +wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes) +{ + wxUint32 total = 0; + int ret = 1; + + if (!m_connected || !m_socket) + return 0; + + // Possible combinations (they are checked in this order) + // NOWAIT + // SPEED | WAITALL + // SPEED + // WAITALL + // NONE + // + if (m_flags & NOWAIT) // NOWAIT + { + GSocket_SetNonBlocking(m_socket, TRUE); + ret = GSocket_Write(m_socket, buffer, nbytes); + GSocket_SetNonBlocking(m_socket, FALSE); + + if (ret > 0) + total = ret; + } + else if ((m_flags & SPEED) && (m_flags & WAITALL)) // SPEED, WAITALL + { + while (ret > 0 && nbytes > 0) + { + ret = GSocket_Write(m_socket, buffer, nbytes); + total += ret; + buffer += ret; + nbytes -= ret; + } + // In case the last call was an error ... + if (ret < 0) + total ++; + } + else if (m_flags & SPEED) // SPEED, !WAITALL + { + ret = GSocket_Write(m_socket, buffer, nbytes); + + if (ret > 0) + total = ret; + } + else // NONE or WAITALL + { + ret = DeferWrite(buffer, nbytes); + + if (ret > 0) + total = ret; + } + + return total; +} + +wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes) { - SockMsg msg; - - msg.sig[0] = (char) 0xad; - msg.sig[1] = (char) 0xde; - msg.sig[2] = (char) 0xed; - msg.sig[3] = (char) 0xfe; - - msg.len[0] = (char) nbytes & 0xff; - msg.len[1] = (char) (nbytes >> 8) & 0xff; - msg.len[2] = (char) (nbytes >> 16) & 0xff; - msg.len[3] = (char) (nbytes >> 24) & 0xff; - - if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg)) - return *this; - if (Write(buffer, nbytes).LastCount() < nbytes) - return *this; - - msg.sig[0] = (char) 0xed; - msg.sig[1] = (char) 0xfe; - msg.sig[2] = (char) 0xad; - msg.sig[3] = (char) 0xde; + wxUint32 total; + bool error; + int old_flags; + struct { + unsigned char sig[4]; + unsigned char len[4]; + } msg; + + // Mask write events + m_writing = TRUE; + + error = TRUE; + total = 0; + old_flags = m_flags; + SetFlags((m_flags & SPEED) | WAITALL); + + // warning about 'cast truncates constant value' +#ifdef __VISUALC__ +# pragma warning(disable: 4310) +#endif // __VISUALC__ + + msg.sig[0] = (unsigned char) 0xad; + msg.sig[1] = (unsigned char) 0xde; + msg.sig[2] = (unsigned char) 0xed; + msg.sig[3] = (unsigned char) 0xfe; + + msg.len[0] = (unsigned char) nbytes & 0xff; + msg.len[1] = (unsigned char) (nbytes >> 8) & 0xff; + msg.len[2] = (unsigned char) (nbytes >> 16) & 0xff; + msg.len[3] = (unsigned char) (nbytes >> 24) & 0xff; + + //wxLogMessage("Writemsg: %d %d %d %d -> %d", + // nbytes & 0xff, + // (nbytes >> 8) & 0xff, + // (nbytes >> 16) & 0xff, + // (nbytes >> 24) & 0xff, + // nbytes + // ); + + if (_Write((char *)&msg, sizeof(msg)) < sizeof(msg)) + goto exit; + + total = _Write(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; - Write((char *)&msg, sizeof(msg)); + if ((_Write((char *)&msg, sizeof(msg))) < sizeof(msg)) + goto exit; + + // everything was OK + error = FALSE; + +exit: + m_error = error; + m_lcount = total; + m_writing = FALSE; + + // TODO: TriggerWrite return *this; + +#ifdef __VISUALC__ +# pragma warning(default: 4310) +#endif // __VISUALC__ } -wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes) +wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes) { - CreatePushbackAfter(buffer, nbytes); + if (nbytes != 0) + Pushback(buffer, nbytes); + + m_error = FALSE; + m_lcount = nbytes; + return *this; } -bool wxSocketBase::IsData() const +void wxSocketBase::DoDefer() { - struct timeval tv; - fd_set sock_set; + int ret; - if (m_fd < 0) - return FALSE; - if (m_unrd_size > 0) - return TRUE; + if (!m_defer_buffer) + return; + + switch(m_defering) + { + case DEFER_READ: + ret = GSocket_Read(m_socket, m_defer_buffer, m_defer_nbytes); + break; + case DEFER_WRITE: + ret = GSocket_Write(m_socket, m_defer_buffer, m_defer_nbytes); + break; + default: + ret = -1; + } + + if (ret >= 0) + m_defer_nbytes -= ret; + + // If we are waiting for all bytes to be acquired, keep the defering + // mode enabled. + if (!(m_flags & WAITALL) || !m_defer_nbytes || ret < 0) + { + m_defer_buffer = NULL; + } + else + { + m_defer_buffer += ret; + m_defer_timer->Start(m_timeout * 1000, FALSE); + } - tv.tv_sec = 0; - tv.tv_usec = 0; - FD_ZERO(&sock_set); - FD_SET(m_fd, &sock_set); - select(FD_SETSIZE, &sock_set, NULL, NULL, &tv); - return (FD_ISSET(m_fd, &sock_set) != 0); + //wxLogMessage("DoDefer ha transferido %d bytes", ret); } -// --------------------------------------------------------------------- -// --------- wxSocketBase Discard(): deletes all byte in the input queue -// --------------------------------------------------------------------- -void wxSocketBase::Discard() +wxSocketBase& wxSocketBase::Discard() { #define MAX_BUFSIZE (10*1024) + + int old_flags; char *my_data = new char[MAX_BUFSIZE]; - size_t recv_size = MAX_BUFSIZE; + wxUint32 recv_size = MAX_BUFSIZE; + wxUint32 total = 0; - SaveState(); - SetFlags((wxSockFlags)(NOWAIT | SPEED)); + // Mask read events + m_reading = TRUE; - while (recv_size == MAX_BUFSIZE) { - recv_size = Read(my_data, MAX_BUFSIZE).LastCount(); + old_flags = m_flags; + SetFlags(NOWAIT); + + while (recv_size == MAX_BUFSIZE) + { + recv_size = _Read(my_data, MAX_BUFSIZE); + total += recv_size; } - RestoreState(); delete [] my_data; + m_lcount = total; + m_error = FALSE; + + // Trigger another read event if there is still data available. + m_reading = FALSE; + + // TODO: TriggerRead + return *this; #undef MAX_BUFSIZE } // -------------------------------------------------------------- -// --------- wxSocketBase socket info functions ----------------- +// wxSocketBase get local or peer addresses // -------------------------------------------------------------- + bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const { - struct sockaddr my_addr; - size_t len_addr = sizeof(my_addr); + GAddress *peer; - if (m_fd < 0) + if (!m_socket) return FALSE; - if (getpeername(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0) - return FALSE; + peer = GSocket_GetPeer(m_socket); + addr_man.SetAddress(peer); + GAddress_destroy(peer); - addr_man.Disassemble(&my_addr, len_addr); return TRUE; } bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const { - struct sockaddr my_addr; - size_t len_addr = sizeof(my_addr); + GAddress *local; - if (m_fd < 0) + if (!m_socket) return FALSE; - if (getsockname(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0) - return FALSE; + local = GSocket_GetLocal(m_socket); + addr_man.SetAddress(local); + GAddress_destroy(local); - addr_man.Disassemble(&my_addr, len_addr); return TRUE; } // -------------------------------------------------------------- -// --------- wxSocketBase wait functions ------------------------ +// wxSocketBase save and restore socket state // -------------------------------------------------------------- + void wxSocketBase::SaveState() { - wxSockState *state = new wxSockState; + wxSocketState *state; - state->cbk_on = m_cbkon; - state->cbk_set= m_neededreq; - state->cbk = m_cbk; - state->cdata = m_cdata; - state->flags = m_flags; - state->notif = m_notifyme; + state = new wxSocketState(); + + state->notify_state = m_notify_state; + state->evt_notify_state = m_neededreq; + state->socket_flags = m_flags; + state->c_callback = m_cbk; + state->c_callback_data = m_cdata; m_states.Append(state); } @@ -503,393 +743,288 @@ void wxSocketBase::SaveState() void wxSocketBase::RestoreState() { wxNode *node; + wxSocketState *state; node = m_states.Last(); if (!node) return; - wxSockState *state = (wxSockState *)node->Data(); + state = (wxSocketState *)node->Data(); - SetFlags(state->flags); - m_neededreq = state->cbk_set; - m_cbk = state->cbk; - m_cdata = state->cdata; - m_notifyme = state->notif; - if (state->cbk_on) - SetupCallbacks(); - else - DestroyCallbacks(); + SetFlags(state->socket_flags); + m_neededreq = state->evt_notify_state; + m_cbk = state->c_callback; + m_cdata = state->c_callback_data; + Notify(state->notify_state); delete node; delete state; } + // -------------------------------------------------------------- -// --------- wxSocketBase wait functions ------------------------ +// wxSocketBase Wait functions // -------------------------------------------------------------- -// -bool wxSocketBase::_Wait(long seconds, long microseconds, int type) + +// GRG: I have completely rewritten this family of functions +// so that they don't depend on event notifications; instead, +// they poll the socket, using GSocket_Select(), to check for +// the specified combination of event flags, until an event +// occurs or until the timeout ellapses. The polling loop +// calls PROCESS_EVENTS(), so this won't block the GUI. + +bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags) { - if ((!m_connected && !m_connecting) || m_fd < 0) - return FALSE; + GSocketEventFlags result; + _wxSocketInternalTimer timer; + long timeout; + int state = -1; - wxSockWakeUp wakeup(this, &m_waitflags, 0); + // Check for valid socket + if (!m_socket) + return FALSE; - SaveState(); - SetNotify((wxRequestNotify)type); - SetupCallbacks(); + // If it is not a server, it must be connected or establishing connection + if ((m_type != SOCK_SERVER) && (!m_connected && !m_establishing)) + return FALSE; + // Check for valid timeout value if (seconds != -1) - wakeup.Start((int)(seconds*1000 + (microseconds / 1000)), TRUE); + timeout = seconds * 1000 + milliseconds; + else + timeout = m_timeout * 1000; + + // Activate timer + if (timeout) + { + timer.m_state = &state; + timer.m_new_val = 0; + timer.Start(timeout, TRUE); + } - m_waitflags = 0x80 | type; - while (m_waitflags & 0x80) - PROCESS_EVENTS(); + // Active polling (without using events) + // + // NOTE: this duplicates some of the code in OnRequest (lost + // connection and connection establishment handling) but this + // doesn't hurt. It has to be here because the event might + // be a bit delayed, and it has to be in OnRequest as well + // because maybe the WaitXXX functions are not being used. + // + // Do this at least once (important if timeout == 0, when + // we are just polling) + do + { + result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG); + + // Connection lost + if (result & GSOCK_LOST_FLAG) + { + timer.Stop(); + m_defer_buffer = NULL; + Close(); + return TRUE; + } - RestoreState(); + // Incoming connection (server) or connection established (client) + if (result & GSOCK_CONNECTION_FLAG) + { + timer.Stop(); + m_connected = TRUE; + m_establishing = FALSE; + return TRUE; + } - if (m_waitflags & 0x40) { - m_waitflags = 0; - return TRUE; + // If we are in the middle of a R/W operation, do not propagate + // to users. + if ( ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG)) + && (!m_writing) && (!m_reading) ) + { +/* TODO: remove this + if (m_defer_buffer == NULL) +*/ + { + timer.Stop(); + return TRUE; + } + } + + if (timeout != 0) + PROCESS_EVENTS(); } - m_waitflags = 0; + while ((state == -1) && timeout); + timer.Stop(); return FALSE; } -bool wxSocketBase::Wait(long seconds, long microseconds) +bool wxSocketBase::Wait(long seconds, long milliseconds) +{ + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | + GSOCK_OUTPUT_FLAG | + GSOCK_CONNECTION_FLAG | + GSOCK_LOST_FLAG); +} + +bool wxSocketBase::WaitForRead(long seconds, long milliseconds) { - return _Wait(seconds, microseconds, REQ_ACCEPT | REQ_CONNECT | - REQ_READ | REQ_WRITE | REQ_LOST); + // Check pushback buffer + if (m_unread) + return TRUE; + + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG); } -bool wxSocketBase::WaitForRead(long seconds, long microseconds) +bool wxSocketBase::WaitForWrite(long seconds, long milliseconds) { - return _Wait(seconds, microseconds, REQ_READ | REQ_LOST); + return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG); } -bool wxSocketBase::WaitForWrite(long seconds, long microseconds) +bool wxSocketBase::WaitForLost(long seconds, long milliseconds) { - return _Wait(seconds, microseconds, REQ_WRITE); + return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG); } -bool wxSocketBase::WaitForLost(long seconds, long microseconds) +void wxSocketBase::SetTimeout(long seconds) { - return _Wait(seconds, microseconds, REQ_LOST); + m_timeout = seconds; + + if (m_socket) + GSocket_SetTimeout(m_socket, m_timeout); } // -------------------------------------------------------------- -// --------- wxSocketBase callback management ------------------- +// wxSocketBase flags // -------------------------------------------------------------- -#if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__) -#if defined(__WXMOTIF__) || defined(__WXXT__) -static void wx_socket_read(XtPointer client, int *fid, - XtInputId *WXUNUSED(id)) -#define fd *fid -#else -static void wx_socket_read(gpointer client, gint fd, - GdkInputCondition WXUNUSED(cond)) -#define fd fd -#endif +void wxSocketBase::SetFlags(wxSockFlags _flags) { - wxSocketBase *sock = (wxSocketBase *)client; - char c; - int i; + m_flags = _flags; +} - i = recv(fd, &c, 1, MSG_PEEK); +// -------------------------------------------------------------- +// wxSocketBase callback management +// -------------------------------------------------------------- - if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) { - sock->OnRequest(wxSocketBase::EVT_ACCEPT); - return; - } +wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_) +{ + wxSockCbk old_cbk = cbk_; - if (i != 0) { - if (!(sock->NeededReq() & wxSocketBase::REQ_READ)) - return; + m_cbk = cbk_; + return old_cbk; +} - sock->OnRequest(wxSocketBase::EVT_READ); - } else { - if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) { - sock->Close(); - return; - } +char *wxSocketBase::CallbackData(char *data) +{ + char *old_data = m_cdata; - sock->OnRequest(wxSocketBase::EVT_LOST); - } + m_cdata = data; + return old_data; } -#undef fd - -#if defined(__WXMOTIF__) || defined(__WXXT__) -static void wx_socket_write(XtPointer client, int *WXUNUSED(fid), - XtInputId *WXUNUSED(id)) -#else -static void wx_socket_write(gpointer client, gint WXUNUSED(fd), - GdkInputCondition WXUNUSED(cond)) -#endif + +// -------------------------------------------------------------- +// wxSocketBase automatic notifier +// -------------------------------------------------------------- + +// All events (INPUT, OUTPUT, CONNECTION, LOST) are now always +// internally watched; but users will only be notified of those +// events they are interested in. + +static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket), + GSocketEvent event, char *cdata) { - wxSocketBase *sock = (wxSocketBase *)client; + wxSocketBase *sckobj = (wxSocketBase *)cdata; - if (!sock->IsConnected()) - sock->OnRequest(wxSocketBase::EVT_CONNECT); - else - sock->OnRequest(wxSocketBase::EVT_WRITE); + sckobj->OnRequest((wxSocketNotify)event); } -#endif -#ifdef wx_xview -Notify_value wx_sock_read_xview (Notify_client client, int fd) +wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt) { - wxSocketBase *sock = (wxSocketBase *)client; - char c; - int i; - - i = recv(fd, &c, 1, MSG_PEEK); - - if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) { - sock->OnRequest(wxSocketBase::EVT_ACCEPT); - return; - } - - /* Bytes arrived */ - if (i != 0) { - if (!(sock->NeededReq() & wxSocketBase::REQ_READ)) - return (Notify_value) FALSE; - - sock->OnRequest(wxSocketBase::EVT_READ); - } else { - if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) - return; - - sock->OnRequest(wxSocketBase::EVT_LOST); - } - - return (Notify_value) FALSE; -} - -Notify_value wx_sock_write_xview (Notify_client client, int fd) -{ - wxSocketBase *sock = (wxSocketBase *)client; - - if (!sock->IsConnected()) - sock->OnRequest(wxSocketBase::EVT_CONNECT); - else - sock->OnRequest(wxSocketBase::EVT_WRITE); - - return (Notify_value) TRUE; -} -#endif - -wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt) -{ - switch (evt) { - case EVT_READ: - return REQ_READ; - case EVT_PEEK: - return REQ_PEEK; - case EVT_WRITE: - return REQ_WRITE; - case EVT_LOST: - return REQ_LOST; - case EVT_ACCEPT: - return REQ_ACCEPT; - case EVT_CONNECT: - return REQ_CONNECT; + switch (evt) + { + case GSOCK_INPUT: return GSOCK_INPUT_FLAG; + case GSOCK_OUTPUT: return GSOCK_OUTPUT_FLAG; + case GSOCK_CONNECTION: return GSOCK_CONNECTION_FLAG; + case GSOCK_LOST: return GSOCK_LOST_FLAG; } return 0; } -void wxSocketBase::SetFlags(wxSockFlags _flags) -{ - m_flags = _flags; - if (_flags & SPEED) { - unsigned long flag = 0; - ioctl(m_fd, FIONBIO, &flag); - - // SPEED and WAITALL are antagonists. - m_flags = (wxSockFlags)(m_flags & ~WAITALL); - - Notify(FALSE); - } else { - unsigned long flag = 1; - ioctl(m_fd, FIONBIO, &flag); - } -} - -void wxSocketBase::SetNotify(wxRequestNotify flags) +void wxSocketBase::SetNotify(wxSocketEventFlags flags) { - wxRequestNotify old_needed_req = m_neededreq; - if (flags & REQ_ACCEPT) { - /* Check if server */ - if (!(GetClassInfo()->IsKindOf(CLASSINFO(wxSocketServer)))) - flags &= ~REQ_ACCEPT; - } m_neededreq = flags; - if (m_cbkon && old_needed_req != flags) - SetupCallbacks(); -} - -void wxSocketBase::SetupCallbacks() -{ - if (m_fd == INVALID_SOCKET || !m_handler || (m_flags & SPEED)) - return; - -#if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__) - if (m_cbkon) - DestroyCallbacks(); - if (m_neededreq & (REQ_ACCEPT | REQ_READ | REQ_LOST)) { -#ifdef __WXGTK__ - m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_READ, - wx_socket_read, (gpointer)this); -#else - m_internal->sock_inputid = XtAppAddInput (wxAPP_CONTEXT, m_fd, - (XtPointer *) XtInputReadMask, - (XtInputCallbackProc) wx_socket_read, - (XtPointer) this); -#endif - } - if (m_neededreq & (REQ_CONNECT | REQ_WRITE)) { -#ifdef __WXGTK__ - m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_WRITE, - wx_socket_write, (gpointer)this); -#else - m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd, - (XtPointer *) XtInputWriteMask, - (XtInputCallbackProc) wx_socket_write, - (XtPointer) this); -#endif - } -#endif -#ifdef __WINDOWS__ - WORD mask = 0; - - if (m_neededreq & REQ_READ) - mask |= FD_READ; - if (m_neededreq & REQ_WRITE) - mask |= FD_WRITE; - if (m_neededreq & REQ_LOST) - mask |= FD_CLOSE; - if (m_neededreq & REQ_ACCEPT) - mask |= FD_ACCEPT; - if (m_neededreq & REQ_CONNECT) - mask |= FD_CONNECT; - - if (!m_internal->my_msg) - m_internal->my_msg = m_handler->NewMessage(this); - WSAAsyncSelect(m_fd, m_handler->GetHWND(), m_internal->my_msg, mask); -#endif - m_cbkon = TRUE; - m_processing = FALSE; -} - -void wxSocketBase::DestroyCallbacks() -{ - if (!m_cbkon || !m_handler) - return; - m_cbkon = FALSE; - m_processing = FALSE; -#if defined(__WXMOTIF__) || defined(__WXXT__) - if (m_internal->sock_inputid > 0) - XtRemoveInput(m_internal->sock_inputid); - m_internal->sock_inputid = 0; - if (m_internal->sock_outputid > 0) - XtRemoveInput(m_internal->sock_outputid); - m_internal->sock_outputid = 0; -#endif -#ifdef __WXGTK__ - if (m_internal->sock_inputid > 0) - gdk_input_remove(m_internal->sock_inputid); - m_internal->sock_inputid = 0; - if (m_internal->sock_outputid > 0) - gdk_input_remove(m_internal->sock_outputid); - m_internal->sock_outputid = 0; -#endif -#ifdef __WINDOWS__ - WSAAsyncSelect(m_fd, m_handler->GetHWND(), 0, 0); -#endif } void wxSocketBase::Notify(bool notify) { - if (m_notifyme == notify) - return; - if (notify) - SetupCallbacks(); - else - DestroyCallbacks(); - m_notifyme = notify; + m_notify_state = notify; } -void wxSocketBase::OnRequest(wxRequestEvent req_evt) +void wxSocketBase::OnRequest(wxSocketNotify req_evt) { - wxRequestNotify req_notif = EventToNotify(req_evt); - - // Mask the current event - SetNotify(m_neededreq & ~req_notif); - - if (req_evt <= EVT_WRITE && DoRequests(req_evt)) - return; + wxSocketEvent event(m_id); + wxSocketEventFlags flag = EventToNotify(req_evt); + + // fprintf(stderr, "%s: Entering OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt); + + // NOTE: this duplicates some of the code in _Wait (lost + // connection and connection establishment handling) but + // this doesn't hurt. It has to be here because maybe the + // WaitXXX are not being used, and it has to be in _Wait + // as well because the event might be a bit delayed. + // + switch(req_evt) + { + case wxSOCKET_CONNECTION: + m_establishing = FALSE; + m_connected = TRUE; + break; + case wxSOCKET_LOST: + m_defer_buffer = NULL; + Close(); + break; + case wxSOCKET_INPUT: + case wxSOCKET_OUTPUT: + if (m_defer_buffer) + { + // fprintf(stderr, "%s: Habia buffer, evt %d skipped\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt); + DoDefer(); + // Do not notify to user + return; + } + break; + } - if (m_waitflags & 0xF0) { - // Wake up - if ((m_waitflags & 0x0F) == req_evt) { - m_waitflags = 0x80; -#ifndef __WXGTK__ - DestroyCallbacks(); // I disable it to prevent infinite loop on X11. -#endif - } + // If we are in the middle of a R/W operation, do not + // propagate events to users. + if (((req_evt == wxSOCKET_INPUT) && m_reading) || + ((req_evt == wxSOCKET_OUTPUT) && m_writing)) + { + // fprintf(stderr, "%s: Swallowed evt %d\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt); return; } - if (req_evt == EVT_LOST) { - m_connected = FALSE; - Close(); - } - if (m_notifyme) + if (((m_neededreq & flag) == flag) && m_notify_state) + { + // fprintf(stderr, "%s: Evt %d delivered\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt); + event.m_socket = this; + event.m_skevt = req_evt; + ProcessEvent(event); OldOnNotify(req_evt); - // Unmask - SetNotify(m_neededreq | req_notif); -} - -wxSocketEvent::wxSocketEvent(int id) - : wxEvent(id) -{ - wxEventType type = (wxEventType)wxEVT_SOCKET; + if (m_cbk) + m_cbk(*this, req_evt, m_cdata); + } - SetEventType(type); + // fprintf(stderr, "%s: Exiting OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt); } -void wxSocketBase::OldOnNotify(wxRequestEvent evt) +void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt)) { - wxSocketEvent event(m_id); - - event.SetEventObject(this); - event.m_skevt = evt; - ProcessEvent(event); - - if (m_cbk) - m_cbk(*this, evt, m_cdata); } // -------------------------------------------------------------- -// --------- wxSocketBase functions [Callback, CallbackData] ---- +// wxSocketBase set event handler // -------------------------------------------------------------- -wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSocketBase::wxSockCbk _cbk) -{ - wxSockCbk old_cbk = m_cbk; - - m_cbk = _cbk; - return old_cbk; -} - -char *wxSocketBase::CallbackData(char *cdata_) -{ - char *old_cdata = m_cdata; - - m_cdata = cdata_; - return old_cdata; -} void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id) { @@ -898,48 +1033,45 @@ void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id) } // -------------------------------------------------------------- -// --------- wxSocketBase pushback library ---------------------- +// wxSocketBase pushback // -------------------------------------------------------------- -void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size) -{ - char *curr_pos; - - m_unread = (char *) realloc(m_unread, m_unrd_size+size); - curr_pos = m_unread + m_unrd_size; - - memcpy(curr_pos, buffer, size); - m_unrd_size += size; -} -void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size) +void wxSocketBase::Pushback(const char *buffer, wxUint32 size) { - char *curr_pos, *new_buf; + if (m_unread == NULL) + m_unread = (char *)malloc(size); + else { + char *tmp; - new_buf = (char *) malloc(m_unrd_size+size); - curr_pos = new_buf + size; + tmp = (char *)malloc(m_unrd_size + size); + memcpy(tmp+size, m_unread, m_unrd_size); + free(m_unread); - memcpy(new_buf, buffer, size); - memcpy(curr_pos, m_unread, m_unrd_size); + m_unread = tmp; + } - free(m_unread); - m_unread = new_buf; m_unrd_size += size; + + memcpy(m_unread, buffer, size); } -size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek) +wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek) { if (!m_unrd_size) return 0; - if (size > m_unrd_size) - size = m_unrd_size; - memcpy(buffer, m_unread, size); + if (size > (m_unrd_size-m_unrd_cur)) + size = m_unrd_size-m_unrd_cur; + + memcpy(buffer, (m_unread+m_unrd_cur), size); if (!peek) { - m_unrd_size -= size; - if (!m_unrd_size) { + m_unrd_cur += size; + if (m_unrd_size == m_unrd_cur) { free(m_unread); m_unread = NULL; + m_unrd_size = 0; + m_unrd_cur = 0; } } @@ -947,599 +1079,212 @@ size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek) } // -------------------------------------------------------------- -// --------- wxSocketBase "multi-thread" core ------------------- +// wxSocketServer // -------------------------------------------------------------- -bool wxSocketBase::DoRequests(wxRequestEvent req_flag) -{ - wxNode *node = req_list[req_flag].First(); - size_t len; - int ret; - - if (!node) - return FALSE; - - SockRequest *req = (SockRequest *)node->Data(); - - delete node; - - switch (req->type) { - case EVT_READ: - case EVT_PEEK: - ret = recv(m_fd, req->buffer, req->size, - (req->type == EVT_PEEK) ? MSG_PEEK : 0); - if (ret < 0) { - req->error = errno; - req->done = TRUE; - break; - } - len = ret; - if ((len < req->size) && (m_flags & WAITALL)) { - req->size -= len; - req->nbytes += len; - req->buffer += len; - req->auto_wakeup->Start(m_timeout*1000, TRUE); - req_list[req_flag].Insert(req); - break; - } - req->done = TRUE; - req->nbytes += len; -#ifndef __WXGTK__ - DestroyCallbacks(); -#endif - break; - case EVT_WRITE: - ret = send(m_fd, req->buffer, req->size, 0); - if (ret < 0) { - req->error = errno; - req->done = TRUE; - break; - } - len = ret; - if ((len < req->size) && (m_flags & WAITALL)) { - req->size -= len; - req->nbytes += len; - req->buffer += len; - req->auto_wakeup->Start(m_timeout*1000, TRUE); - req_list[req_flag].Insert(req); - break; - } - req->done = TRUE; - req->nbytes += len; -#ifndef __WXGTK__ - DestroyCallbacks(); -#endif - break; - default: - return FALSE; - } - return TRUE; -} - -void wxSocketBase::WantSpeedBuffer(char *buffer, size_t nbytes, - wxRequestEvent evt) -{ - int ret = 0; - - switch (evt) { - case EVT_PEEK: - case EVT_READ: - ret = recv(m_fd, buffer, nbytes, - (evt == EVT_PEEK) ? MSG_PEEK : 0); - break; - case EVT_WRITE: - ret = send(m_fd, buffer, nbytes, 0); - break; - } - if (ret < 0) { - m_lcount = 0; - m_error = errno; - } else - m_lcount = ret; -} - -void wxSocketBase::WantBuffer(char *buffer, size_t nbytes, - wxRequestEvent evt) -{ - bool buf_timed_out; - - if (m_fd == INVALID_SOCKET || !m_handler || !m_connected) - return; - - if (m_flags & SPEED) { - WantSpeedBuffer(buffer, nbytes, evt); - return; - } - - SockRequest *buf = new SockRequest; - wxSockWakeUp s_wake(NULL, (int *)&buf_timed_out, (int)TRUE); - - m_wantbuf++; - req_list[evt].Append(buf); - - SaveState(); - SetNotify(REQ_LOST | EventToNotify(evt)); - SetupCallbacks(); - buf->buffer = buffer; - buf->size = nbytes; - buf->done = FALSE; - buf->type = evt; - buf->nbytes = 0; - buf->auto_wakeup = &s_wake; - buf->error = 0; - buf_timed_out = FALSE; - - s_wake.Start(m_timeout*1000, TRUE); - if (m_flags & NOWAIT) { - DoRequests(evt); - } else { - while (!buf->done && !buf_timed_out) - PROCESS_EVENTS(); - } - m_wantbuf--; - m_lcount = buf->nbytes; - if (buf_timed_out) - m_error = ETIMEDOUT; - else - m_error = buf->error; - - delete buf; - RestoreState(); -} - // -------------------------------------------------------------- -// wxSocketServer /////////////////////////////////////////////// +// wxSocketServer ctor and dtor // -------------------------------------------------------------- -// -------------------------------------------------------------- -// --------- wxSocketServer CONSTRUCTOR ------------------------- -// -------------------------------------------------------------- wxSocketServer::wxSocketServer(wxSockAddress& addr_man, - wxSockFlags flags) : + wxSockFlags flags) : wxSocketBase(flags, SOCK_SERVER) { - m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0); - - if (m_fd == INVALID_SOCKET) - return; - - int flag = 1; - setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int)); - - struct sockaddr *myaddr; - size_t len; + // Create the socket + m_socket = GSocket_new(); - addr_man.Build(myaddr, len); - if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0) + if (!m_socket) return; - if (listen(m_fd, 5) < 0) { - m_fd = INVALID_SOCKET; + // Setup the socket as server + GSocket_SetLocal(m_socket, addr_man.GetAddress()); + if (GSocket_SetServer(m_socket) != GSOCK_NOERROR) + { + GSocket_destroy(m_socket); + m_socket = NULL; return; } + + GSocket_SetTimeout(m_socket, m_timeout); + GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, + wx_socket_callback, (char *)this); + } // -------------------------------------------------------------- -// --------- wxSocketServer Accept ------------------------------ +// wxSocketServer Accept // -------------------------------------------------------------- -bool wxSocketServer::AcceptWith(wxSocketBase& sock) + +bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait) { - int fd2; + GSocket *child_socket; - if ((fd2 = accept(m_fd, 0, 0)) < 0) + if (!m_socket) return FALSE; - struct linger linger; - linger.l_onoff = 0; - linger.l_linger = 1; + // GRG: If wait == FALSE, then the call should be nonblocking. + // When we are finished, we put the socket to blocking mode + // again. - setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); + if (!wait) + GSocket_SetNonBlocking(m_socket, TRUE); - int flag = 0; - setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int)); + child_socket = GSocket_WaitConnection(m_socket); - if (!(sock.m_flags & SPEED)) { - unsigned long flag2 = 1; - ioctl(fd2, FIONBIO, &flag2); - } + if (!wait) + GSocket_SetNonBlocking(m_socket, FALSE); + + // GRG: this was not being handled! + if (child_socket == NULL) + return FALSE; sock.m_type = SOCK_INTERNAL; - sock.m_fd = fd2; + sock.m_socket = child_socket; sock.m_connected = TRUE; + GSocket_SetTimeout(sock.m_socket, sock.m_timeout); + GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, + wx_socket_callback, (char *)&sock); + return TRUE; } -wxSocketBase *wxSocketServer::Accept() +wxSocketBase *wxSocketServer::Accept(bool wait) { wxSocketBase* sock = new wxSocketBase(); sock->SetFlags((wxSockFlags)m_flags); - if (!AcceptWith(*sock)) + if (!AcceptWith(*sock, wait)) return NULL; - if (m_handler) - m_handler->Register(sock); - return sock; } -// -------------------------------------------------------------- -// --------- wxSocketServer callbacks --------------------------- -// -------------------------------------------------------------- -void wxSocketServer::OnRequest(wxRequestEvent evt) +bool wxSocketServer::WaitForAccept(long seconds, long milliseconds) { - if (evt == EVT_ACCEPT) { - OldOnNotify(EVT_ACCEPT); - } + return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); } // -------------------------------------------------------------- -// wxSocketClient /////////////////////////////////////////////// +// wxSocketClient // -------------------------------------------------------------- -// --------- wxSocketClient CONSTRUCTOR ------------------------- // -------------------------------------------------------------- +// wxSocketClient ctor and dtor +// -------------------------------------------------------------- + wxSocketClient::wxSocketClient(wxSockFlags _flags) : - wxSocketBase(_flags, SOCK_CLIENT) + wxSocketBase(_flags, SOCK_CLIENT) { } -// -------------------------------------------------------------- -// --------- wxSocketClient DESTRUCTOR -------------------------- -// -------------------------------------------------------------- wxSocketClient::~wxSocketClient() { } // -------------------------------------------------------------- -// --------- wxSocketClient Connect functions ------------------- +// wxSocketClient Connect functions // -------------------------------------------------------------- -bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) ) +bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait) { - struct linger linger; + GSocketError err; if (IsConnected()) Close(); - m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0); - - if (m_fd < 0) - return FALSE; + // This should never happen. + if (m_socket) + GSocket_destroy(m_socket); + // Initialize all socket stuff ... + m_socket = GSocket_new(); m_connected = FALSE; + m_establishing = FALSE; - linger.l_onoff = 1; - linger.l_linger = 5; - setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); + if (!m_socket) + return FALSE; - // Stay in touch with the state of things... + GSocket_SetTimeout(m_socket, m_timeout); + GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, + wx_socket_callback, (char *)this); - unsigned long flag = 1; - setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int)); + // GRG: If wait == FALSE, then the call should be nonblocking. + // When we are finished, we put the socket to blocking mode + // again. - // Disable the nagle algorithm, which delays sends till the - // buffer is full (or a certain time period has passed?)... + if (!wait) + GSocket_SetNonBlocking(m_socket, TRUE); -#if defined(__WINDOWS__) || (defined(IPPROTO_TCP) && defined(TCP_NODELAY)) - flag = 1; - setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int)); -#endif + GSocket_SetPeer(m_socket, addr_man.GetAddress()); + err = GSocket_Connect(m_socket, GSOCK_STREAMED); - struct sockaddr *remote; - size_t len; + if (!wait) + GSocket_SetNonBlocking(m_socket, FALSE); - addr_man.Build(remote, len); + if (err != GSOCK_NOERROR) + { + if (err == GSOCK_WOULDBLOCK) + m_establishing = TRUE; - if (connect(m_fd, remote, len) != 0) return FALSE; - - if (!(m_flags & SPEED)) { - flag = 1; - ioctl(m_fd, FIONBIO, &flag); } - Notify(TRUE); - m_connected = TRUE; return TRUE; } -bool wxSocketClient::WaitOnConnect(long seconds) -{ - int ret = _Wait(seconds, 0, REQ_CONNECT | REQ_LOST); - - if (ret) - m_connected = TRUE; - - return m_connected; -} - -void wxSocketClient::OnRequest(wxRequestEvent evt) -{ - if (evt == EVT_CONNECT) { - if (m_connected) { - SetNotify(m_neededreq & ~REQ_CONNECT); - return; - } - m_waitflags = 0x40; - m_connected = TRUE; - OldOnNotify(EVT_CONNECT); - DestroyCallbacks(); - return; - } - wxSocketBase::OnRequest(evt); -} - -///////////////////////////////////////////////////////////////// -// wxSocketHandler /////////////////////////////////////////////// -///////////////////////////////////////////////////////////////// - -wxSocketHandler *wxSocketHandler::master = NULL; -#if defined(__WINDOWS__) -static int win_initialized = 0; -#endif - -// -------------------------------------------------------------- -// --------- wxSocketHandler CONSTRUCTOR ------------------------ -// -------------------------------------------------------------- -#ifdef __WINDOWS__ - -extern char wxPanelClassName[]; - -LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message, - WPARAM wParam, LPARAM lParam) -{ - wxSocketHandler *h_sock = (wxSocketHandler *)GetWindowLong(hWnd, GWL_USERDATA); - wxNode *node = h_sock->smsg_list->Find(message); - wxSocketBase *sock; - wxSocketBase::wxRequestEvent sk_req; - UINT event = WSAGETSELECTEVENT(lParam); - - if (!node) - return DefWindowProc(hWnd, message, wParam, lParam); - - sock = (wxSocketBase *)node->Data(); - - switch (event) { - case FD_READ: - sk_req = wxSocketBase::EVT_READ; - break; - case FD_WRITE: - sk_req = wxSocketBase::EVT_WRITE; - break; - case FD_CLOSE: - sk_req = wxSocketBase::EVT_LOST; - break; - case FD_ACCEPT: - sk_req = wxSocketBase::EVT_ACCEPT; - break; - case FD_CONNECT: - sk_req = wxSocketBase::EVT_CONNECT; - break; - } - sock->OnRequest(sk_req); - - return (LRESULT)0; -} - -FARPROC wxSocketSubClassProc = NULL; - -#endif - -wxSocketHandler::wxSocketHandler() -{ -#if defined(__WINDOWS__) - if (!win_initialized) { - WSADATA wsaData; - - WSAStartup((1 << 8) | 1, &wsaData); - win_initialized = 1; - } - internal = new wxSockHandlerInternal; - internal->sockWin = ::CreateWindow(wxPanelClassName, NULL, 0, - 0, 0, 0, 0, NULL, (HMENU) NULL, - wxhInstance, 0); - - // Subclass the window - if (!wxSocketSubClassProc) - wxSocketSubClassProc = MakeProcInstance((FARPROC) wxSocketHandlerWndProc, wxhInstance); - ::SetWindowLong(internal->sockWin, GWL_WNDPROC, (LONG) wxSocketSubClassProc); - ::SetWindowLong(internal->sockWin, GWL_USERDATA, (LONG) this); - - internal->firstAvailableMsg = 5000; - smsg_list = new wxList(wxKEY_INTEGER); -#endif - - socks = new wxList; - -#ifndef __WINDOWS__ - signal(SIGPIPE, SIG_IGN); -#endif -} - -// -------------------------------------------------------------- -// --------- wxSocketHandler DESTRUCTOR ------------------------- -// -------------------------------------------------------------- -wxSocketHandler::~wxSocketHandler() +bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds) { - wxNode *next_node, *node = socks->First(); - - while (node) { - wxSocketBase* sock = (wxSocketBase*)node->Data(); - - delete sock; - next_node = node->Next(); - delete node; - node = next_node; - } - - delete socks; - -#ifdef __WINDOWS__ - delete smsg_list; + if (m_connected) // Already connected + return TRUE; - ::DestroyWindow(internal->sockWin); - WSACleanup(); - win_initialized = 0; + if (!m_establishing || !m_socket) // No connection in progress + return FALSE; - delete internal; -#endif + return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); } // -------------------------------------------------------------- -// --------- wxSocketHandler registering functions -------------- +// wxSocketEvent // -------------------------------------------------------------- -void wxSocketHandler::Register(wxSocketBase* sock) -{ - wxNode *node; - - for (node = socks->First(); node != NULL; node = node->Next()) { - wxSocketBase* s = (wxSocketBase*)node->Data(); - - if (s == sock) - return; - } - if (sock) { - socks->Append(sock); - sock->SetHandler(this); - sock->SetupCallbacks(); - } -} - -void wxSocketHandler::UnRegister(wxSocketBase* sock) +wxSocketEvent::wxSocketEvent(int id) + : wxEvent(id) { - wxNode *node; - - for (node = socks->First(); node; node = node->Next()) { - wxSocketBase* s = (wxSocketBase*)node->Data(); + wxEventType type = (wxEventType)wxEVT_SOCKET; - if (s == sock) { - delete node; - sock->DestroyCallbacks(); - sock->SetHandler(NULL); - return; - } - } + SetEventType(type); } -unsigned long wxSocketHandler::Count() const +void wxSocketEvent::CopyObject(wxObject& obj_d) const { - return socks->Number(); -} + wxSocketEvent *event = (wxSocketEvent *)&obj_d; -// -------------------------------------------------------------- -// --------- wxSocketHandler "big" wait functions --------------- -// -------------------------------------------------------------- -void handler_cbk(wxSocketBase& sock, - wxSocketBase::wxRequestEvent WXUNUSED(flags), - char *cdata) -{ - int *a_wait = (int *)cdata; + wxEvent::CopyObject(obj_d); - (*a_wait)++; - sock.Notify(FALSE); + event->m_skevt = m_skevt; + event->m_socket = m_socket; } -int wxSocketHandler::Wait(long seconds, long microseconds) -{ - int i; - int on_wait; - wxSockWakeUp s_wake(NULL, &on_wait, -2); - wxNode *node; - - for (node = socks->First(), i=0; node; node = node->Next(), i++) { - wxSocketBase *sock = (wxSocketBase *)node->Data(); - - sock->SaveState(); - - sock->SetupCallbacks(); - - sock->Callback(handler_cbk); - sock->CallbackData((char *)&on_wait); +// -------------------------------------------------------------------------- +// wxSocketModule +// -------------------------------------------------------------------------- +class WXDLLEXPORT wxSocketModule: public wxModule { + DECLARE_DYNAMIC_CLASS(wxSocketModule) + public: + bool OnInit() { + return GSocket_Init(); } - on_wait = 0; - if (seconds != -1) - s_wake.Start((seconds*1000) + (microseconds/1000), TRUE); - - while (!on_wait) - PROCESS_EVENTS(); - - for (node = socks->First(), i=0; node; node = node->Next(), i++) { - wxSocketBase *sock = (wxSocketBase *)node->Data(); - - sock->RestoreState(); - } - - if (on_wait == -2) - return 0; - - return on_wait; -} - -void wxSocketHandler::YieldSock() -{ - wxNode *node; - - for (node = socks->First(); node; node = node->Next() ) { - wxSocketBase *sock = (wxSocketBase *)node->Data(); - - sock->SaveState(); - - sock->SetFlags(wxSocketBase::SPEED); - if (sock->IsData()) - sock->DoRequests(wxSocketBase::EVT_READ); - sock->DoRequests(wxSocketBase::EVT_WRITE); - - sock->RestoreState(); + void OnExit() { + GSocket_Cleanup(); } -} - -// -------------------------------------------------------------- -// --------- wxSocketHandler: create and register the socket ---- -// -------------------------------------------------------------- -wxSocketServer *wxSocketHandler::CreateServer(wxSockAddress& addr, - wxSocketBase::wxSockFlags flags) -{ - wxSocketServer *serv = new wxSocketServer(addr, flags); - - Register(serv); - return serv; -} - -wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags) -{ - wxSocketClient *client = new wxSocketClient(flags); - - Register(client); - return client; -} - -#ifdef __WINDOWS__ -// -------------------------------------------------------------- -// --------- wxSocketHandler: Windows specific methods ---------- -// -------------------------------------------------------------- -UINT wxSocketHandler::NewMessage(wxSocketBase *sock) -{ - internal->firstAvailableMsg++; - smsg_list->Append(internal->firstAvailableMsg, sock); - return internal->firstAvailableMsg; -} - -void wxSocketHandler::DestroyMessage(UINT msg) -{ - wxNode *node = smsg_list->Find(msg); - delete node; -} - -HWND wxSocketHandler::GetHWND() const -{ - return internal->sockWin; -} +}; -#endif +IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule) #endif - // __WXSTUBS__ + // wxUSE_SOCKETS