X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b412f9be504e07559a98ae234f30bb1bd0b2aa1f..af547d51b7494fd365ae29e048d458ff72b27056:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 186a49a22c..a39f5fff48 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -1,22 +1,16 @@ -//////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// // 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 +// Copyright: (C) 1999-1997, Guilhem Lavaux +// (C) 2000-1999, Guillermo Rodriguez Garcia // RCS_ID: $Id$ // License: see wxWindows license -//////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// + #ifdef __GNUG__ #pragma implementation "socket.h" -// #pragma interface -// #pragma implementation "socket.cpp" -#endif - -#ifdef __MWERKS__ -typedef int socklen_t ; #endif // For compilers that support precompilation, includes "wx.h". @@ -26,1836 +20,1204 @@ typedef int socklen_t ; #pragma hdrstop #endif -///////////////////////////////////////////////////////////////////////////// -// wxWindows headers -///////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include - -// Not enough OS behaviour defined for wxStubs -#ifndef __WXSTUBS__ - -#include -#include -#include - -///////////////////////////////////////////////////////////////////////////// -// System specific headers -///////////////////////////////////////////////////////////////////////////// -#ifdef __WXMAC__ -// in order to avoid problems with our c library and double definitions -#define close closesocket -#define ioctl ioctlsocket - -#include -extern GUSISpinFn GUSISpin; -#define PROCESS_EVENTS() wxMacProcessEvents() -const short kwxMacNetEventsMax = 1000 ; -short wxMacNetEventsTop = 0 ; -short wxMacNetEventsBottom = 0 ; -short wxMacNetEventsEvents[kwxMacNetEventsMax] ; -void *wxMacNetEventsReferences[kwxMacNetEventsMax] ; - -#define FD_READ 1 -#define FD_WRITE 2 -#define FD_CLOSE 4 -#define FD_ACCEPT 8 -#define FD_CONNECT 16 -#define FD_READY 32 - -extern "C" void wxMacSocketHandlerProc( void *refcon , short event ) ; // adds events -extern "C" void wxMacSocketOnRequestProc( void *refcon , short event ) ; // consumes them -extern "C" void GUSISetReference( short sock , short eventmask , void * data ) ; -void wxMacProcessEvents() ; -#endif - -#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 +#if wxUSE_SOCKETS -///////////////////////////// -// Needs internal variables -///////////////////////////// -#ifdef __WXXT__ -#define Uses_XtIntrinsic -#endif +// ========================================================================== +// Headers and constants +// ========================================================================== -#endif +#include "wx/app.h" +#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 "wx/intl.h" -#if defined(__WXGTK__) -#include -#endif +#if wxUSE_GUI + #include "wx/gdicmn.h" // for wxPendingDelete +#endif // wxUSE_GUI -///////////////////////////////////////////////////////////////////////////// -// wxSocket headers -///////////////////////////////////////////////////////////////////////////// -#include "wx/module.h" -#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 +// discard buffer +#define MAX_DISCARD_SIZE (10 * 1024) -#if defined(__WINDOWS__) +// what to do within waits #define PROCESS_EVENTS() wxYield() -#elif defined(__WXXT__) || defined(__WXMOTIF__) -#define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll) -#elif defined(__WXGTK__) -#define PROCESS_EVENTS() gtk_main_iteration() -#endif -///////////////////////////////////////////////////////////////////////////// -// Some patch ///// END -///////////////////////////////////////////////////////////////////////////// +// use wxPostEvent or not +#define USE_DELAYED_EVENTS 1 -// -------------------------------------------------------------- -// Module -// -------------------------------------------------------------- -class wxSocketModule: public wxModule -{ - DECLARE_DYNAMIC_CLASS(wxSocketModule) -public: - wxSocketModule() {} - bool OnInit(); - void OnExit(); -}; - -// -------------------------------------------------------------- +// -------------------------------------------------------------------------- // ClassInfos -// -------------------------------------------------------------- -#if !USE_SHARED_LIBRARY +// -------------------------------------------------------------------------- + IMPLEMENT_CLASS(wxSocketBase, wxObject) IMPLEMENT_CLASS(wxSocketServer, wxSocketBase) IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) -IMPLEMENT_CLASS(wxSocketHandler, wxObject) +IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase) IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent) -IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule) -#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 m_notify_state; + wxSocketEventFlags m_neededreq; + wxSockFlags m_flags; + wxSocketBase::wxSockCbk m_cbk; + char *m_cdata; -/// 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 +// ========================================================================== + +// -------------------------------------------------------------------------- +// Ctor and dtor +// -------------------------------------------------------------------------- -// -------------------------------------------------------------- -// --------- wxSocketBase CONSTRUCTOR --------------------------- -// -------------------------------------------------------------- -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_evt_handler(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_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_evt_handler(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_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::~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() +/* +bool wxSocketBase::Destroy() { - if (m_fd != INVALID_SOCKET) - { - for (int i=0;i<3;i++) - { - wxNode *n, *node = req_list[i].First(); + // Delayed destruction: the socket will be deleted during the next + // idle loop iteration. This ensures that all pending events have + // been processed. - while (node) - { - SockRequest *req = (SockRequest *)node->Data(); - req->done = TRUE; - - n = node->Next(); - delete node; - node = n; - } - } + m_beingDeleted = TRUE; + Close(); - DestroyCallbacks(); - shutdown(m_fd, 2); - close(m_fd); - m_fd = INVALID_SOCKET; - m_connected = FALSE; - } + if ( !wxPendingDelete.Member(this) ) + wxPendingDelete.Append(this); return TRUE; } +*/ -// -------------------------------------------------------------- -// wxSocketBase base IO function -// -------------------------------------------------------------- - -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; - - WantBuffer(buffer, nbytes, EVT_READ); +// -------------------------------------------------------------------------- +// Basic IO operations +// -------------------------------------------------------------------------- - return *this; -} +// The following IO operations update m_error and m_lcount: +// {Read, Write, ReadMsg, WriteMsg, Peek, Unread, Discard} +// +// TODO: Should Connect, Accept and AcceptWith update m_error? -wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes) +bool wxSocketBase::Close() { - size_t nbytes_old = nbytes; + // Interrupt pending waits + InterruptAllWaits(); - nbytes -= GetPushback(buffer, nbytes, TRUE); - if (!nbytes) + if (m_socket) { - m_lcount = nbytes_old; - return *this; - } + // Disable callbacks + GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG); - WantBuffer(buffer, nbytes, EVT_PEEK); - - return *this; -} + // Shutdown the connection + GSocket_Shutdown(m_socket); + } -wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes) -{ - WantBuffer((char *)buffer, nbytes, EVT_WRITE); - return *this; + m_connected = FALSE; + m_establishing = FALSE; + return TRUE; } -wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes) +wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes) { - SockMsg msg; - size_t len, len2, sig; + // Mask read events + m_reading = TRUE; - Read((char *)&msg, sizeof(msg)); - if (m_lcount != sizeof(msg)) - return *this; + m_lcount = _Read(buffer, nbytes); - 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 (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; - if (len > nbytes) - len = nbytes; + // If in wxSOCKET_WAITALL mode, all bytes should have been read. + if (m_flags & wxSOCKET_WAITALL) + m_error = (m_lcount != nbytes); else - len2 = 0; + m_error = (m_lcount == 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 - if (sig != 0xdeadfeed) - return *this; + // Allow read events from now on + m_reading = FALSE; return *this; } -wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t 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; - msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0; - Write((char *)&msg, sizeof(msg)); - - return *this; -} - -wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes) -{ - CreatePushbackAfter(buffer, nbytes); - return *this; -} - -bool wxSocketBase::IsData() const +wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes) { - struct timeval tv; - fd_set sock_set; + int total; + int ret = 1; - if (m_fd < 0) - return FALSE; - if (m_unrd_size > 0) - return TRUE; + // Try the pushback buffer first + total = GetPushback(buffer, nbytes, FALSE); + nbytes -= total; + buffer += total; - 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); -} + // If the socket is invalid or we got all the data, return now + if (!m_socket || !nbytes) + return total; -// --------------------------------------------------------------------- -// --------- wxSocketBase Discard(): deletes all byte in the input queue -// --------------------------------------------------------------------- -void wxSocketBase::Discard() -{ -#define MAX_BUFSIZE (10*1024) - char *my_data = new char[MAX_BUFSIZE]; - size_t recv_size = MAX_BUFSIZE; - - SaveState(); - SetFlags((wxSockFlags)(NOWAIT | SPEED)); - - while (recv_size == MAX_BUFSIZE) + // Possible combinations (they are checked in this order) + // wxSOCKET_NOWAIT + // wxSOCKET_WAITALL | wxSOCKET_BLOCK + // wxSOCKET_WAITALL + // wxSOCKET_BLOCK + // wxSOCKET_NONE + // + if (m_flags & wxSOCKET_NOWAIT) { - recv_size = Read(my_data, MAX_BUFSIZE).LastCount(); - } - - RestoreState(); - delete [] my_data; - -#undef MAX_BUFSIZE -} - -// If what? Who seems to need unsigned int? -// BTW uint isn't even defined on wxMSW for VC++ for some reason. Even if it -// were, getpeername/getsockname don't take unsigned int*, they take int*. -#if 0 -#define wxSOCKET_INT unsigned int -#else -#define wxSOCKET_INT int -#endif + GSocket_SetNonBlocking(m_socket, TRUE); + ret = GSocket_Read(m_socket, buffer, nbytes); + GSocket_SetNonBlocking(m_socket, FALSE); -// -------------------------------------------------------------- -// wxSocketBase socket info functions -// -------------------------------------------------------------- - -bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const -{ - struct sockaddr my_addr; - wxSOCKET_INT len_addr = sizeof(my_addr); - - if (m_fd < 0) - return FALSE; - - if (getpeername(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0) - return FALSE; - - addr_man.Disassemble(&my_addr, len_addr); - return TRUE; -} - -bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const -{ - struct sockaddr my_addr; - wxSOCKET_INT len_addr = sizeof(my_addr); - - if (m_fd < 0) - return FALSE; - - if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0) - - return FALSE; - - addr_man.Disassemble(&my_addr, len_addr); - return TRUE; -} - -// -------------------------------------------------------------- -// wxSocketBase wait functions -// -------------------------------------------------------------- - -void wxSocketBase::SaveState() -{ - wxSockState *state = new wxSockState; - - 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; - - m_states.Append(state); -} - -void wxSocketBase::RestoreState() -{ - wxNode *node; - - node = m_states.Last(); - if (!node) - return; + if (ret > 0) + total += ret; + } + else if (m_flags & wxSOCKET_WAITALL) + { + while (ret > 0 && nbytes > 0) + { + if (!(m_flags & wxSOCKET_BLOCK) && !WaitForRead()) + break; - wxSockState *state = (wxSockState *)node->Data(); + ret = GSocket_Read(m_socket, buffer, nbytes); - 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(); + if (ret > 0) + { + total += ret; + buffer += ret; + nbytes -= ret; + } + } + } else - DestroyCallbacks(); - - delete node; - delete state; -} - -// -------------------------------------------------------------- -// --------- wxSocketBase wait functions ------------------------ -// -------------------------------------------------------------- - -bool wxSocketBase::_Wait(long seconds, long microseconds, int type) -{ - if ((!m_connected && !m_connecting) || m_fd < 0) - return FALSE; - - wxSockWakeUp wakeup(this, &m_waitflags, 0); - - SaveState(); - SetNotify((wxRequestNotify)type); - SetupCallbacks(); - - if (seconds != -1) - wakeup.Start((int)(seconds*1000 + (microseconds / 1000)), TRUE); - - m_waitflags = 0x80 | type; - while (m_waitflags & 0x80) - PROCESS_EVENTS(); - - RestoreState(); - - if (m_waitflags & 0x40) { - m_waitflags = 0; - return TRUE; + if ((m_flags & wxSOCKET_BLOCK) || WaitForRead()) + { + ret = GSocket_Read(m_socket, buffer, nbytes); + + if (ret > 0) + total += ret; + } } - m_waitflags = 0; - return FALSE; + return total; } -bool wxSocketBase::Wait(long seconds, long microseconds) +wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) { - return _Wait(seconds, microseconds, REQ_ACCEPT | REQ_CONNECT | - REQ_READ | REQ_WRITE | REQ_LOST); -} + wxUint32 len, len2, sig, total; + bool error; + int old_flags; + struct + { + unsigned char sig[4]; + unsigned char len[4]; + } msg; -bool wxSocketBase::WaitForRead(long seconds, long microseconds) -{ - return _Wait(seconds, microseconds, REQ_READ | REQ_LOST); -} + // Mask read events + m_reading = TRUE; -bool wxSocketBase::WaitForWrite(long seconds, long microseconds) -{ - return _Wait(seconds, microseconds, REQ_WRITE); -} + total = 0; + error = TRUE; + old_flags = m_flags; + SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL); -bool wxSocketBase::WaitForLost(long seconds, long microseconds) -{ - return _Wait(seconds, microseconds, REQ_LOST); -} + if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg)) + goto exit; -// -------------------------------------------------------------- -// --------- wxSocketBase callback management ------------------- -// -------------------------------------------------------------- + sig = (wxUint32)msg.sig[0]; + sig |= (wxUint32)(msg.sig[1] << 8); + sig |= (wxUint32)(msg.sig[2] << 16); + sig |= (wxUint32)(msg.sig[3] << 24); -#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 -{ - wxSocketBase *sock = (wxSocketBase *)client; - char c; - int i; + if (sig != 0xfeeddead) + { + wxLogWarning( _("wxSocket: invalid signature in ReadMsg.")); + goto exit; + } - i = recv(fd, &c, 1, MSG_PEEK); + len = (wxUint32)msg.len[0]; + len |= (wxUint32)(msg.len[1] << 8); + len |= (wxUint32)(msg.len[2] << 16); + len |= (wxUint32)(msg.len[3] << 24); - if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) + if (len > nbytes) { - sock->OnRequest(wxSocketBase::EVT_ACCEPT); - return; + len2 = len - nbytes; + len = nbytes; } + else + len2 = 0; - if (i != 0) + // Don't attemp to read if the msg was zero bytes long. + if (len) { - if (!(sock->NeededReq() & wxSocketBase::REQ_READ)) - { - return; - } + total = _Read(buffer, len); - sock->OnRequest(wxSocketBase::EVT_READ); - } - else + if (total != len) + goto exit; + } + if (len2) { - if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) + char *discard_buffer = new char[MAX_DISCARD_SIZE]; + long discard_len; + + // NOTE: discarded bytes don't add to m_lcount. + do { - sock->Close(); - return; + discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2); + discard_len = _Read(discard_buffer, (wxUint32)discard_len); + len2 -= (wxUint32)discard_len; } + while ((discard_len > 0) && len2); - sock->OnRequest(wxSocketBase::EVT_LOST); - } -} -#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 *sock = (wxSocketBase *)client; - - if (!sock->IsConnected()) - sock->OnRequest(wxSocketBase::EVT_CONNECT); - else - sock->OnRequest(wxSocketBase::EVT_WRITE); -} -#endif + delete [] discard_buffer; -#ifdef wx_xview -Notify_value wx_sock_read_xview (Notify_client client, int fd) -{ - wxSocketBase *sock = (wxSocketBase *)client; - char c; - int i; + if (len2 != 0) + goto exit; + } + if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg)) + goto exit; - i = recv(fd, &c, 1, MSG_PEEK); + sig = (wxUint32)msg.sig[0]; + sig |= (wxUint32)(msg.sig[1] << 8); + sig |= (wxUint32)(msg.sig[2] << 16); + sig |= (wxUint32)(msg.sig[3] << 24); - if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) + if (sig != 0xdeadfeed) { - sock->OnRequest(wxSocketBase::EVT_ACCEPT); - return; + wxLogWarning( _("wxSocket: invalid signature in ReadMsg.")); + goto exit; } - /* 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; + // everything was OK + error = FALSE; - sock->OnRequest(wxSocketBase::EVT_LOST); - } +exit: + m_error = error; + m_lcount = total; + m_reading = FALSE; + SetFlags(old_flags); - return (Notify_value) FALSE; + return *this; } -Notify_value wx_sock_write_xview (Notify_client client, int fd) +wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes) { - wxSocketBase *sock = (wxSocketBase *)client; + // Mask read events + m_reading = TRUE; + + m_lcount = _Read(buffer, nbytes); + Pushback(buffer, m_lcount); - if (!sock->IsConnected()) - sock->OnRequest(wxSocketBase::EVT_CONNECT); + // If in wxSOCKET_WAITALL mode, all bytes should have been read. + if (m_flags & wxSOCKET_WAITALL) + m_error = (m_lcount != nbytes); else - sock->OnRequest(wxSocketBase::EVT_WRITE); + m_error = (m_lcount == 0); - return (Notify_value) TRUE; -} -#endif + // Allow read events again + m_reading = FALSE; -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; - } - return 0; + return *this; } -void wxSocketBase::SetFlags(wxSockFlags _flags) +wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes) { - m_flags = _flags; - if (_flags & SPEED) - { - unsigned long flag = 0; - ioctl(m_fd, FIONBIO, &flag); + // Mask write events + m_writing = TRUE; - // SPEED and WAITALL are antagonists. - m_flags = (wxSockFlags)(m_flags & ~WAITALL); + m_lcount = _Write(buffer, nbytes); - Notify(FALSE); - } - else - { - unsigned long flag = 1; - ioctl(m_fd, FIONBIO, &flag); - } -} - -void wxSocketBase::SetNotify(wxRequestNotify 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 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); -/* - if (m_cbkon && old_needed_req != flags) seems to be wrong, Robert Roebling - SetupCallbacks(); -*/ + // Allow write events again + m_writing = FALSE; - if (old_needed_req != flags) - SetupCallbacks(); + return *this; } -void wxSocketBase::SetupCallbacks() +wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes) { - if (m_fd == INVALID_SOCKET || !m_handler || (m_flags & SPEED)) - return; + wxUint32 total = 0; + int ret = 1; -#if defined(__WXMOTIF__) || defined(__WXXT__) - if (m_neededreq & (REQ_ACCEPT | REQ_READ | REQ_LOST)) - { - if (m_internal->sock_inputid <= 0) - { - m_internal->sock_inputid = XtAppAddInput (wxAPP_CONTEXT, m_fd, - (XtPointer *) XtInputReadMask, - (XtInputCallbackProc) wx_socket_read, - (XtPointer) this); - } - } - else - { - if (m_internal->sock_inputid > 0) - { - XtRemoveInput(m_internal->sock_inputid); - m_internal->sock_inputid = 0; - } - } - - if (m_neededreq & (REQ_CONNECT | REQ_WRITE)) + // If the socket is invalid, return immediately + if (!m_socket) + return 0; + + // Possible combinations (they are checked in this order) + // wxSOCKET_NOWAIT + // wxSOCKET_WAITALL | wxSOCKET_BLOCK + // wxSOCKET_WAITALL + // wxSOCKET_BLOCK + // wxSOCKET_NONE + // + if (m_flags & wxSOCKET_NOWAIT) { - if (m_internal->sock_outputid <= 0) - { - m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd, - (XtPointer *) XtInputWriteMask, - (XtInputCallbackProc) wx_socket_write, - (XtPointer) this); - } + GSocket_SetNonBlocking(m_socket, TRUE); + ret = GSocket_Write(m_socket, buffer, nbytes); + GSocket_SetNonBlocking(m_socket, FALSE); + + if (ret > 0) + total = ret; } - else + else if (m_flags & wxSOCKET_WAITALL) { - if (m_internal->sock_outputid > 0) + while (ret > 0 && nbytes > 0) { - XtRemoveInput(m_internal->sock_outputid); - m_internal->sock_outputid = 0; - } - } -#endif + if (!(m_flags & wxSOCKET_BLOCK) && !WaitForWrite()) + break; + ret = GSocket_Write(m_socket, buffer, nbytes); -#ifdef __WXGTK__ - if (m_neededreq & (REQ_ACCEPT | REQ_READ | REQ_LOST)) - { - if (m_internal->sock_inputid <= 0) - { - m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_READ, - wx_socket_read, (gpointer)this); - } - } - else - { - if (m_internal->sock_inputid > 0) - { -/* - gdk_input_remove(m_internal->sock_inputid); - m_internal->sock_inputid = 0; -*/ - } - } - - if (m_neededreq & (REQ_CONNECT | REQ_WRITE)) - { - if (m_internal->sock_outputid <= 0) - { - m_internal->sock_outputid = gdk_input_add(m_fd, GDK_INPUT_WRITE, - wx_socket_write, (gpointer)this); + if (ret > 0) + { + total += ret; + buffer += ret; + nbytes -= ret; + } } } else { - if (m_internal->sock_outputid > 0) + if ((m_flags & wxSOCKET_BLOCK) || WaitForWrite()) { -/* - gdk_input_remove(m_internal->sock_outputid); - m_internal->sock_outputid = 0; -*/ - } - } -#endif - - -#ifdef __WXMSW__ - 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 -#ifdef __WXMAC__ - short 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; - - GUSISetReference( m_fd ,mask, this ) ; - unsigned long flag = 1; - ioctl(m_fd, FIONBIO, &flag); -#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 -#ifdef __WXMAC__ - GUSISetReference( m_fd , 0 , 0 ) ; - int bottom = wxMacNetEventsBottom ; - while ( wxMacNetEventsTop != bottom ) - { - // set all events that reference this socket to nil - if ( wxMacNetEventsReferences[bottom] == (void*) this ) - wxMacNetEventsReferences[bottom] = NULL ; - bottom++ ; - if ( bottom == kwxMacNetEventsMax ) - bottom = 0 ; - } - SetFlags( m_flags ) ; -#endif -} - -void wxSocketBase::Notify(bool notify) -{ - if (m_notifyme == notify) - return; - if (notify) - SetupCallbacks(); - else - DestroyCallbacks(); - m_notifyme = notify; -} - -void wxSocketBase::OnRequest(wxRequestEvent req_evt) -{ - wxRequestNotify req_notif = EventToNotify(req_evt); + ret = GSocket_Write(m_socket, buffer, nbytes); - // Mask the current event - SetNotify(m_neededreq & ~req_notif); - - if (req_evt <= EVT_WRITE && DoRequests(req_evt)) - return; - - if (m_waitflags & 0xF0) - { - // Wake up - if ((m_waitflags & 0x0F) == req_evt) - { - m_waitflags = 0x80; -#ifndef __WXGTK__ - DestroyCallbacks(); -#endif + if (ret > 0) + total = ret; } - return; } - if (req_evt == EVT_LOST) - { - m_connected = FALSE; - Close(); - } - if (m_notifyme) - OldOnNotify(req_evt); - - // Unmask - SetNotify(m_neededreq | req_notif); -} - -wxSocketEvent::wxSocketEvent(int id) - : wxEvent(id) -{ - wxEventType type = (wxEventType)wxEVT_SOCKET; - - SetEventType(type); + return total; } -void wxSocketBase::OldOnNotify(wxRequestEvent evt) +wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes) { - wxSocketEvent event(m_id); + wxUint32 total; + bool error; + int old_flags; + struct { + unsigned char sig[4]; + unsigned char len[4]; + } msg; - event.SetEventObject(this); - event.m_skevt = evt; - ProcessEvent(event); + // Mask write events + m_writing = TRUE; - if (m_cbk) - m_cbk(*this, evt, m_cdata); -} + error = TRUE; + total = 0; + old_flags = m_flags; + SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL); -// -------------------------------------------------------------- -// --------- wxSocketBase functions [Callback, CallbackData] ---- -// -------------------------------------------------------------- + msg.sig[0] = (unsigned char) 0xad; + msg.sig[1] = (unsigned char) 0xde; + msg.sig[2] = (unsigned char) 0xed; + msg.sig[3] = (unsigned char) 0xfe; -wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSocketBase::wxSockCbk _cbk) -{ - wxSockCbk old_cbk = m_cbk; + 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); - m_cbk = _cbk; - return old_cbk; -} + if (_Write((char *)&msg, sizeof(msg)) < sizeof(msg)) + goto exit; -char *wxSocketBase::CallbackData(char *cdata_) -{ - char *old_cdata = m_cdata; + total = _Write(buffer, nbytes); - m_cdata = cdata_; - return old_cdata; -} + if (total < nbytes) + goto exit; -void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id) -{ - SetNextHandler(&h_evt); - m_id = id; -} + 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; -// -------------------------------------------------------------- -// --------- wxSocketBase pushback library ---------------------- -// -------------------------------------------------------------- + if ((_Write((char *)&msg, sizeof(msg))) < sizeof(msg)) + goto exit; -void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size) -{ - char *curr_pos; + // everything was OK + error = FALSE; - m_unread = (char *) realloc(m_unread, m_unrd_size+size); - curr_pos = m_unread + m_unrd_size; +exit: + m_error = error; + m_lcount = total; + m_writing = FALSE; - memcpy(curr_pos, buffer, size); - m_unrd_size += size; + return *this; } -void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size) +wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes) { - char *curr_pos, *new_buf; - - new_buf = (char *) malloc(m_unrd_size+size); - curr_pos = new_buf + size; + if (nbytes != 0) + Pushback(buffer, nbytes); - memcpy(new_buf, buffer, size); - memcpy(curr_pos, m_unread, m_unrd_size); + m_error = FALSE; + m_lcount = nbytes; - free(m_unread); - m_unread = new_buf; - m_unrd_size += size; + return *this; } -size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek) +wxSocketBase& wxSocketBase::Discard() { - if (!m_unrd_size) - return 0; + int old_flags; + char *buffer = new char[MAX_DISCARD_SIZE]; + wxUint32 ret; + wxUint32 total = 0; - if (size > m_unrd_size) - size = m_unrd_size; - memcpy(buffer, m_unread, size); + // Mask read events + m_reading = TRUE; - if (!peek) { - m_unrd_size -= size; - if (!m_unrd_size) { - free(m_unread); - m_unread = NULL; - } + old_flags = m_flags; + SetFlags(wxSOCKET_NOWAIT); + + do + { + ret = _Read(buffer, MAX_DISCARD_SIZE); + total += ret; } + while (ret == MAX_DISCARD_SIZE); - return size; -} + delete[] buffer; + m_lcount = total; + m_error = FALSE; -// -------------------------------------------------------------- -// --------- wxSocketBase "multi-thread" core ------------------- -// -------------------------------------------------------------- + // Allow read events again + m_reading = FALSE; -bool wxSocketBase::DoRequests(wxRequestEvent req_flag) -{ - wxNode *node = req_list[req_flag].First(); - size_t len; - int ret; + return *this; +} - if (!node) - return FALSE; +// -------------------------------------------------------------------------- +// Wait functions +// -------------------------------------------------------------------------- - SockRequest *req = (SockRequest *)node->Data(); +// 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 calls PROCESS_EVENTS(), so +// this won't block the GUI. - delete node; +#if wxUSE_GUI - 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) +class _wxSocketInternalTimer: public wxTimer { - 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 +public: + int *m_state; + unsigned long m_new_val; + + void Notify() { - m_lcount = ret; - m_error = 0; + *m_state = (int)m_new_val; // Change the value } -} +}; + +#endif // wxUSE_GUI -void wxSocketBase::WantBuffer(char *buffer, size_t nbytes, - wxRequestEvent evt) +bool wxSocketBase::_Wait(long seconds, long milliseconds, + wxSocketEventFlags flags) { - bool buf_timed_out; + GSocketEventFlags result; +#if wxUSE_GUI + _wxSocketInternalTimer timer; + wxTimerRunner runTimer(timer); +#endif // wxUSE_GUI - if (m_fd == INVALID_SOCKET || !m_handler || !m_connected) - return; + long timeout; + int state = -1; + + // Set this to TRUE to interrupt ongoing waits + m_interrupt = FALSE; + + // Check for valid socket + if (!m_socket) + return FALSE; - if (m_flags & SPEED) + // Check for valid timeout value + if (seconds != -1) + timeout = seconds * 1000 + milliseconds; + else + timeout = m_timeout * 1000; + + // Activate timer + if (timeout) { - WantSpeedBuffer(buffer, nbytes, evt); - return; +#if wxUSE_GUI + timer.m_state = &state; + timer.m_new_val = 0; + runTimer.Start((int)timeout, TRUE); +#endif // wxUSE_GUI } - 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) + // 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 Wait functions are not being + // used. + // + // Do this at least once (important if timeout == 0, when + // we are just polling). Also, if just polling, do not yield. + + while (state == -1) { - DoRequests(evt); - } - else - { - while (!buf->done && !buf_timed_out) + result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG); + + // Incoming connection (server) or connection established (client) + if (result & GSOCK_CONNECTION_FLAG) + { + m_connected = TRUE; + m_establishing = FALSE; + return TRUE; + } + + // Data available or output buffer ready + if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG)) + { + return TRUE; + } + + // Connection lost + if (result & GSOCK_LOST_FLAG) + { + m_connected = FALSE; + m_establishing = FALSE; + return (flags & GSOCK_LOST_FLAG); + } + + // Wait more? + if ((timeout == 0) || (m_interrupt)) + break; + else PROCESS_EVENTS(); } - m_wantbuf--; - m_lcount = buf->nbytes; - if (buf_timed_out) - m_error = ETIMEDOUT; - else - m_error = buf->error; - delete buf; - RestoreState(); + return FALSE; } -// -------------------------------------------------------------- -// wxSocketServer -// -------------------------------------------------------------- - -wxSocketServer::wxSocketServer(wxSockAddress& addr_man, - wxSockFlags flags) : - wxSocketBase(flags, SOCK_SERVER) +bool wxSocketBase::Wait(long seconds, long milliseconds) { - 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)); + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | + GSOCK_OUTPUT_FLAG | + GSOCK_CONNECTION_FLAG | + GSOCK_LOST_FLAG); +} - struct sockaddr *myaddr; - size_t len; +bool wxSocketBase::WaitForRead(long seconds, long milliseconds) +{ + // Check pushback buffer before entering _Wait + if (m_unread) + return TRUE; - addr_man.Build(myaddr, len); - if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0) - return; + // Note that GSOCK_INPUT_LOST has to be explicitly passed to + // _Wait becuase of the semantics of WaitForRead: a return + // value of TRUE means that a GSocket_Read call will return + // immediately, not that there is actually data to read. - if (listen(m_fd, 5) < 0) { - m_fd = INVALID_SOCKET; - return; - } + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | + GSOCK_LOST_FLAG); } -// -------------------------------------------------------------- -// wxSocketServer Accept -// -------------------------------------------------------------- - -bool wxSocketServer::AcceptWith(wxSocketBase& sock) +bool wxSocketBase::WaitForWrite(long seconds, long milliseconds) { - int fd2; + return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG); +} - if ((fd2 = accept(m_fd, 0, 0)) < 0) - return FALSE; +bool wxSocketBase::WaitForLost(long seconds, long milliseconds) +{ + return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG); +} - struct linger linger; - linger.l_onoff = 0; - linger.l_linger = 1; +// -------------------------------------------------------------------------- +// Miscellaneous +// -------------------------------------------------------------------------- - setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); +// +// Get local or peer address +// - int flag = 0; - setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int)); +bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const +{ + GAddress *peer; - if (!(sock.m_flags & SPEED)) - { - unsigned long flag2 = 1; - ioctl(fd2, FIONBIO, &flag2); - } + if (!m_socket) + return FALSE; - sock.m_type = SOCK_INTERNAL; - sock.m_fd = fd2; - sock.m_connected = TRUE; + peer = GSocket_GetPeer(m_socket); + addr_man.SetAddress(peer); + GAddress_destroy(peer); return TRUE; } -wxSocketBase *wxSocketServer::Accept() +bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const { - wxSocketBase* sock = new wxSocketBase(); - - sock->SetFlags((wxSockFlags)m_flags); + GAddress *local; - if (!AcceptWith(*sock)) - return NULL; + if (!m_socket) + return FALSE; - if (m_handler) - m_handler->Register(sock); + local = GSocket_GetLocal(m_socket); + addr_man.SetAddress(local); + GAddress_destroy(local); - return sock; + return TRUE; } -// -------------------------------------------------------------- -// wxSocketServer callbacks -// -------------------------------------------------------------- +// +// Save and restore socket state +// -void wxSocketServer::OnRequest(wxRequestEvent evt) +void wxSocketBase::SaveState() { - if (evt == EVT_ACCEPT) - { - OldOnNotify(EVT_ACCEPT); - } -} + wxSocketState *state; -// -------------------------------------------------------------- -// wxSocketClient -// -------------------------------------------------------------- + state = new wxSocketState(); -// --------- wxSocketClient CONSTRUCTOR ------------------------- -// -------------------------------------------------------------- -wxSocketClient::wxSocketClient(wxSockFlags _flags) : - wxSocketBase(_flags, SOCK_CLIENT) -{ -} + state->m_notify_state = m_notify_state; + state->m_neededreq = m_neededreq; + state->m_flags = m_flags; + state->m_cbk = m_cbk; + state->m_cdata = m_cdata; -// -------------------------------------------------------------- -// --------- wxSocketClient DESTRUCTOR -------------------------- -// -------------------------------------------------------------- -wxSocketClient::~wxSocketClient() -{ + m_states.Append(state); } -// -------------------------------------------------------------- -// --------- wxSocketClient Connect functions ------------------- -// -------------------------------------------------------------- -bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) ) +void wxSocketBase::RestoreState() { - struct linger linger; + wxNode *node; + wxSocketState *state; - if (IsConnected()) - Close(); + node = m_states.Last(); + if (!node) + return; - m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0); + state = (wxSocketState *)node->Data(); - if (m_fd < 0) - return FALSE; + SetFlags(state->m_flags); + m_cbk = state->m_cbk; + m_cdata = state->m_cdata; + m_neededreq = state->m_neededreq; + Notify(state->m_notify_state); - m_connected = FALSE; + delete node; + delete state; +} - linger.l_onoff = 1; - linger.l_linger = 5; - setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); +// +// Timeout and flags +// - // Stay in touch with the state of things... +void wxSocketBase::SetTimeout(long seconds) +{ + m_timeout = seconds; - unsigned long flag = 1; - setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int)); + if (m_socket) + GSocket_SetTimeout(m_socket, m_timeout * 1000); +} - // Disable the nagle algorithm, which delays sends till the - // buffer is full (or a certain time period has passed?)... +void wxSocketBase::SetFlags(wxSockFlags _flags) +{ + m_flags = _flags; +} -#if defined(__WINDOWS__) || (defined(IPPROTO_TCP) && defined(TCP_NODELAY)) - flag = 1; - setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int)); -#endif +// -------------------------------------------------------------------------- +// Callbacks (now obsolete - use events instead) +// -------------------------------------------------------------------------- - struct sockaddr *remote; - size_t len; +wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_) +{ + wxSockCbk old_cbk = cbk_; - addr_man.Build(remote, len); + m_cbk = cbk_; + return old_cbk; +} - if (connect(m_fd, remote, len) != 0) - return FALSE; +char *wxSocketBase::CallbackData(char *data) +{ + char *old_data = m_cdata; - if (!(m_flags & SPEED)) - { - flag = 1; - ioctl(m_fd, FIONBIO, &flag); - } + m_cdata = data; + return old_data; +} - Notify(TRUE); +// -------------------------------------------------------------------------- +// Event system +// -------------------------------------------------------------------------- - m_connected = TRUE; - return TRUE; -} +// All events (INPUT, OUTPUT, CONNECTION, LOST) are now always +// internally watched; but users will only be notified of those +// events they are interested in. -bool wxSocketClient::WaitOnConnect(long seconds, long microseconds) +static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket), + GSocketEvent event, + char *cdata) { - int ret = _Wait(seconds, microseconds, REQ_CONNECT | REQ_LOST); + wxSocketBase *sckobj = (wxSocketBase *)cdata; - if (ret) - m_connected = TRUE; - - return m_connected; + sckobj->OnRequest((wxSocketNotify)event); } -void wxSocketClient::OnRequest(wxRequestEvent evt) +wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt) { - if (evt == EVT_CONNECT) + switch (evt) { - if (m_connected) - { -#ifndef __WXGTK__ - SetNotify(m_neededreq & ~REQ_CONNECT); -#endif - return; - } - m_waitflags = 0x40; - m_connected = TRUE; - OldOnNotify(EVT_CONNECT); -#ifndef __WXGTK__ - DestroyCallbacks(); -#endif - return; + 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; } - wxSocketBase::OnRequest(evt); + return 0; } -///////////////////////////////////////////////////////////////// -// wxSocketHandler /////////////////////////////////////////////// -///////////////////////////////////////////////////////////////// +void wxSocketBase::SetNotify(wxSocketEventFlags flags) +{ + m_neededreq = flags; +} -wxSocketHandler *wxSocketHandler::master = NULL; -#if defined(__WINDOWS__) -static int win_initialized = 0; -#endif +void wxSocketBase::Notify(bool notify) +{ + m_notify_state = notify; +} -// -------------------------------------------------------------- -// --------- wxSocketHandler CONSTRUCTOR ------------------------ -// -------------------------------------------------------------- -#ifdef __WXMAC__ +void wxSocketBase::OnRequest(wxSocketNotify req_evt) +{ + wxSocketEvent event(m_id); + wxSocketEventFlags flag = EventToNotify(req_evt); -extern "C" int updatestatus(int s) ; + // This duplicates some code in _Wait, but this doesn't + // hurt. It has to be here because we don't know whether + // the Wait functions will be used, and it has to be in + // _Wait as well because the event might be a bit delayed. -void wxMacSocketOnRequestProc( void *refcon , short event ) -{ - if ( refcon ) + switch(req_evt) { - wxSocketBase *sock = (wxSocketBase *) refcon ; - - wxSocketBase::wxRequestEvent sk_req; - - int canRead ; - int canWrite ; - int exception ; - - switch (event) { - case FD_READ: - sk_req = wxSocketBase::EVT_READ; - sock->OnRequest(sk_req); + case wxSOCKET_CONNECTION: + m_establishing = FALSE; + m_connected = TRUE; break; - case FD_WRITE: - sk_req = wxSocketBase::EVT_WRITE; - sock->OnRequest(sk_req); + + // 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 || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG)) + return; break; - case FD_CLOSE: - sk_req = wxSocketBase::EVT_LOST; - sock->OnRequest(sk_req); + + case wxSOCKET_OUTPUT: + if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG)) + return; break; - case FD_ACCEPT: - sk_req = wxSocketBase::EVT_ACCEPT; - sock->OnRequest(sk_req); + + case wxSOCKET_LOST: + m_connected = FALSE; + m_establishing = FALSE; break; - case FD_CONNECT: - sk_req = wxSocketBase::EVT_CONNECT; - sock->OnRequest(sk_req); + + default: break; - case FD_READY : - break ; + } + + if (((m_neededreq & flag) == flag) && m_notify_state) + { + event.m_socket = this; + event.m_skevt = req_evt; + + if (m_evt_handler) + { +#if USE_DELAYED_EVENTS + wxPostEvent(m_evt_handler, event); +#else + ProcessEvent(event); +#endif } - updatestatus ( sock->m_fd ) ; + + OldOnNotify(req_evt); + if (m_cbk) + m_cbk(*this, req_evt, m_cdata); } } -void wxMacSocketHandlerProc( void *refcon , short event ) +void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt)) { - wxMacNetEventsReferences[wxMacNetEventsTop] = refcon ; - wxMacNetEventsEvents[wxMacNetEventsTop] = event ; +} - // clumsy construct in order to never have a incorrect wxMacNetEventsTop (above limits) +void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id) +{ + m_evt_handler = &h_evt; + m_id = id; - if ( wxMacNetEventsTop + 1 == kwxMacNetEventsMax ) - wxMacNetEventsTop = 0 ; - else - wxMacNetEventsTop++ ; + SetNextHandler(&h_evt); } -#endif -#ifdef __WINDOWS__ - -extern char wxPanelClassName[]; +// -------------------------------------------------------------------------- +// Pushback buffer +// -------------------------------------------------------------------------- -LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message, - WPARAM wParam, LPARAM lParam) +void wxSocketBase::Pushback(const char *buffer, wxUint32 size) { - if(message==WM_DESTROY) + if (!size) return; + + if (m_unread == NULL) + m_unread = (char *)malloc(size); + else { - ::SetWindowLong(hWnd, GWL_WNDPROC, (LONG) DefWindowProc); - return DefWindowProc(hWnd, message, wParam, lParam); + char *tmp; + + tmp = (char *)malloc(m_unrd_size + size); + memcpy(tmp+size, m_unread, m_unrd_size); + free(m_unread); + + m_unread = tmp; } - 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; + m_unrd_size += size; + + memcpy(m_unread, buffer, size); +} + +wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek) +{ + if (!m_unrd_size) + return 0; + + 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_cur += size; + if (m_unrd_size == m_unrd_cur) + { + free(m_unread); + m_unread = NULL; + m_unrd_size = 0; + m_unrd_cur = 0; + } } - sock->OnRequest(sk_req); - return (LRESULT)0; + return size; } -FARPROC wxSocketSubClassProc = NULL; +// ========================================================================== +// wxSocketServer +// ========================================================================== -#endif +// -------------------------------------------------------------------------- +// Ctor +// -------------------------------------------------------------------------- -wxSocketHandler::wxSocketHandler() +wxSocketServer::wxSocketServer(wxSockAddress& addr_man, + wxSockFlags flags) + : wxSocketBase(flags, SOCK_SERVER) { -#if defined(__WINDOWS__) - if (!win_initialized) - { - WSADATA wsaData; + // Create the socket + m_socket = GSocket_new(); + + if (!m_socket) + return; - WSAStartup((1 << 8) | 1, &wsaData); - win_initialized = 1; + // 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; } - 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; + GSocket_SetTimeout(m_socket, m_timeout * 1000); + GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, + wx_socket_callback, (char *)this); -#ifndef __WINDOWS__ - signal(SIGPIPE, SIG_IGN); -#endif } -// -------------------------------------------------------------- -// --------- wxSocketHandler DESTRUCTOR ------------------------- -// -------------------------------------------------------------- -wxSocketHandler::~wxSocketHandler() +// -------------------------------------------------------------------------- +// Accept +// -------------------------------------------------------------------------- + +bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait) { - wxNode *next_node, *node = socks->First(); + GSocket *child_socket; - while (node) - { - wxSocketBase* sock = (wxSocketBase*)node->Data(); + if (!m_socket) + return FALSE; - delete sock; - next_node = node->Next(); - delete node; - node = next_node; - } + // If wait == FALSE, then the call should be nonblocking. + // When we are finished, we put the socket to blocking mode + // again. - delete socks; + if (!wait) + GSocket_SetNonBlocking(m_socket, TRUE); -#ifdef __WINDOWS__ - delete smsg_list; + child_socket = GSocket_WaitConnection(m_socket); - ::DestroyWindow(internal->sockWin); - WSACleanup(); - win_initialized = 0; + if (!wait) + GSocket_SetNonBlocking(m_socket, FALSE); - delete internal; -#endif -} + if (!child_socket) + return FALSE; -// -------------------------------------------------------------- -// --------- wxSocketHandler registering functions -------------- -// -------------------------------------------------------------- + sock.m_type = SOCK_INTERNAL; + sock.m_socket = child_socket; + sock.m_connected = TRUE; + + GSocket_SetTimeout(sock.m_socket, sock.m_timeout * 1000); + GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, + wx_socket_callback, (char *)&sock); + + return TRUE; +} -void wxSocketHandler::Register(wxSocketBase* sock) +wxSocketBase *wxSocketServer::Accept(bool wait) { - wxNode *node; + wxSocketBase* sock = new wxSocketBase(); - for (node = socks->First(); node != NULL; node = node->Next()) - { - wxSocketBase* s = (wxSocketBase*)node->Data(); + sock->SetFlags((wxSockFlags)m_flags); - if (s == sock) - return; - } + if (!AcceptWith(*sock, wait)) + return NULL; - if (sock) - { - socks->Append(sock); - sock->SetHandler(this); - sock->SetupCallbacks(); - } + return sock; } -void wxSocketHandler::UnRegister(wxSocketBase* sock) +bool wxSocketServer::WaitForAccept(long seconds, long milliseconds) { - wxNode *node; + return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); +} - for (node = socks->First(); node; node = node->Next()) - { - wxSocketBase* s = (wxSocketBase*)node->Data(); +// ========================================================================== +// wxSocketClient +// ========================================================================== - if (s == sock) - { - delete node; - sock->DestroyCallbacks(); - sock->SetHandler(NULL); - return; - } - } -} +// -------------------------------------------------------------------------- +// Ctor and dtor +// -------------------------------------------------------------------------- -unsigned long wxSocketHandler::Count() const +wxSocketClient::wxSocketClient(wxSockFlags _flags) + : wxSocketBase(_flags, SOCK_CLIENT) { - return socks->Number(); } -// -------------------------------------------------------------- -// --------- wxSocketHandler "big" wait functions --------------- -// -------------------------------------------------------------- -void handler_cbk(wxSocketBase& sock, - wxSocketBase::wxRequestEvent WXUNUSED(flags), - char *cdata) +// XXX: What is this for ? +wxSocketClient::~wxSocketClient() { - int *a_wait = (int *)cdata; - - (*a_wait)++; - sock.Notify(FALSE); } -int wxSocketHandler::Wait(long seconds, long microseconds) +// -------------------------------------------------------------------------- +// Connect +// -------------------------------------------------------------------------- + +bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait) { - int i; - int on_wait; - wxSockWakeUp s_wake(NULL, &on_wait, -2); - wxNode *node; + GSocketError err; - for (node = socks->First(), i=0; node; node = node->Next(), i++) + if (m_socket) { - wxSocketBase *sock = (wxSocketBase *)node->Data(); + // Shutdown and destroy the socket + Close(); + GSocket_destroy(m_socket); + } - sock->SaveState(); + m_socket = GSocket_new(); + m_connected = FALSE; + m_establishing = FALSE; - sock->SetupCallbacks(); + if (!m_socket) + return FALSE; - sock->Callback(handler_cbk); - sock->CallbackData((char *)&on_wait); - } - on_wait = 0; - if (seconds != -1) - s_wake.Start((seconds*1000) + (microseconds/1000), TRUE); + GSocket_SetTimeout(m_socket, m_timeout * 1000); + GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, + wx_socket_callback, (char *)this); + + // If wait == FALSE, then the call should be nonblocking. + // When we are finished, we put the socket to blocking mode + // again. + + if (!wait) + GSocket_SetNonBlocking(m_socket, TRUE); + + GSocket_SetPeer(m_socket, addr_man.GetAddress()); + err = GSocket_Connect(m_socket, GSOCK_STREAMED); - while (!on_wait) - PROCESS_EVENTS(); + if (!wait) + GSocket_SetNonBlocking(m_socket, FALSE); - for (node = socks->First(), i=0; node; node = node->Next(), i++) + if (err != GSOCK_NOERROR) { - wxSocketBase *sock = (wxSocketBase *)node->Data(); + if (err == GSOCK_WOULDBLOCK) + m_establishing = TRUE; - sock->RestoreState(); + return FALSE; } - if (on_wait == -2) - return 0; - - return on_wait; + m_connected = TRUE; + return TRUE; } -void wxSocketHandler::YieldSock() +bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds) { - wxNode *node; - - for (node = socks->First(); node; node = node->Next() ) - { - wxSocketBase *sock = (wxSocketBase *)node->Data(); - - sock->SaveState(); + if (m_connected) // Already connected + return TRUE; - sock->SetFlags(wxSocketBase::SPEED); - if (sock->IsData()) - sock->DoRequests(wxSocketBase::EVT_READ); - sock->DoRequests(wxSocketBase::EVT_WRITE); + if (!m_establishing || !m_socket) // No connection in progress + return FALSE; - sock->RestoreState(); - } + return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); } -// -------------------------------------------------------------- -// --------- wxSocketHandler: create and register the socket ---- -// -------------------------------------------------------------- -wxSocketServer *wxSocketHandler::CreateServer(wxSockAddress& addr, - wxSocketBase::wxSockFlags flags) -{ - wxSocketServer *serv = new wxSocketServer(addr, flags); +// ========================================================================== +// wxDatagramSocket +// ========================================================================== - Register(serv); - return serv; -} +/* NOTE: experimental stuff - might change */ -wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags) +wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr, wxSockFlags flags ) + : wxSocketBase( flags, SOCK_DATAGRAM ) { - wxSocketClient *client = new wxSocketClient(flags); + // Create the socket + m_socket = GSocket_new(); - Register(client); - return client; -} + if(!m_socket) + return; -#ifdef __WINDOWS__ -// -------------------------------------------------------------- -// --------- wxSocketHandler: Windows specific methods ---------- -// -------------------------------------------------------------- + // Setup the socket as non connection oriented + GSocket_SetLocal(m_socket, addr.GetAddress()); + if( GSocket_SetNonOriented(m_socket) != GSOCK_NOERROR ) + { + GSocket_destroy(m_socket); + m_socket = NULL; + return; + } + + // Initialize all stuff + m_connected = FALSE; + m_establishing = FALSE; + 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 ); -UINT wxSocketHandler::NewMessage(wxSocketBase *sock) -{ - internal->firstAvailableMsg++; - smsg_list->Append(internal->firstAvailableMsg, sock); - return internal->firstAvailableMsg; } -void wxSocketHandler::DestroyMessage(UINT msg) +wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr, + char* buf, + wxUint32 nBytes ) { - wxNode *node = smsg_list->Find(msg); - delete node; + Read(buf, nBytes); + GetPeer(addr); + return (*this); } -HWND wxSocketHandler::GetHWND() const +wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr, + const char* buf, + wxUint32 nBytes ) { - return internal->sockWin; + GSocket_SetPeer(m_socket, addr.GetAddress()); + Write(buf, nBytes); + return (*this); } -#endif +// ========================================================================== +// wxSocketEvent +// ========================================================================== -bool wxSocketModule::OnInit() -{ - wxSocketHandler::master = new wxSocketHandler(); - return TRUE; -} +// XXX: Should be moved to event.cpp ? -void wxSocketModule::OnExit() +wxSocketEvent::wxSocketEvent(int id) + : wxEvent(id) { - delete wxSocketHandler::master; - wxSocketHandler::master = NULL; + wxEventType type = (wxEventType)wxEVT_SOCKET; + + SetEventType(type); } -#ifdef __WXMAC__ -void wxMacProcessSocketEvents() ; -void wxMacProcessEvents() +void wxSocketEvent::CopyObject(wxObject& obj_d) const { - wxMacProcessSocketEvents() ; - (*GUSISpin)(SP_MISC, 0) ; + wxSocketEvent *event = (wxSocketEvent *)&obj_d; + + wxEvent::CopyObject(obj_d); + + event->m_skevt = m_skevt; + event->m_socket = m_socket; } -void wxMacProcessSocketEvents() +// ========================================================================== +// wxSocketModule +// ========================================================================== + +class WXDLLEXPORT wxSocketModule: public wxModule { - while ( wxMacNetEventsTop != wxMacNetEventsBottom ) - { - // consume event at wxMacNetEventsBottom - wxMacSocketOnRequestProc(wxMacNetEventsReferences[wxMacNetEventsBottom] , wxMacNetEventsEvents[wxMacNetEventsBottom] ) ; - wxMacNetEventsBottom++ ; - if ( wxMacNetEventsBottom == kwxMacNetEventsMax ) - wxMacNetEventsBottom = 0 ; - } -} -#endif + DECLARE_DYNAMIC_CLASS(wxSocketModule) + +public: + bool OnInit() { return GSocket_Init(); } + void OnExit() { GSocket_Cleanup(); } +}; + +IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule) #endif - // __WXSTUBS__ + // wxUSE_SOCKETS