X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f42cff13eaba35dda3527b2ca658dd00b9e7a46..c49245f8baabd69afd7302c43474d3bdd247fb89:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 9d3dffd789..4e12e8971b 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -1,22 +1,15 @@ //////////////////////////////////////////////////////////////////////////////// // 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 // Created: April 1997 -// Updated: March 1998 -// Copyright: (C) 1998, 1997, Guilhem Lavaux +// Updated: July 1999 +// Copyright: (C) 1999, 1998, 1997, Guilhem Lavaux // 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,6 +19,8 @@ typedef int socklen_t ; #pragma hdrstop #endif +#if wxUSE_SOCKETS + ///////////////////////////////////////////////////////////////////////////// // wxWindows headers ///////////////////////////////////////////////////////////////////////////// @@ -34,172 +29,18 @@ typedef int socklen_t ; #include #include #include - -// Not enough OS behaviour defined for wxStubs -#ifndef __WXSTUBS__ +#include #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 __VISUALC__ -#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 ///////////////////////////////////////////////////////////////////////////// -#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( __VISUALC__ ) -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) -#elif defined(__WXGTK__) -#define PROCESS_EVENTS() gtk_main_iteration() -#endif - -///////////////////////////////////////////////////////////////////////////// -// Some patch ///// END -///////////////////////////////////////////////////////////////////////////// - -#ifdef GetClassInfo -#undef GetClassInfo -#endif - -// -------------------------------------------------------------- -// Module -// -------------------------------------------------------------- -class wxSocketModule: public wxModule -{ - DECLARE_DYNAMIC_CLASS(wxSocketModule) -public: - wxSocketModule() {} - bool OnInit(); - void OnExit(); -}; +#include +#include +#include // -------------------------------------------------------------- // ClassInfos @@ -208,143 +49,76 @@ public: IMPLEMENT_CLASS(wxSocketBase, wxObject) IMPLEMENT_CLASS(wxSocketServer, wxSocketBase) IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) -IMPLEMENT_CLASS(wxSocketHandler, wxObject) 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 notify_state; + GSocketEventFlags evt_notify_state; + wxSocketBase::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::wxSocketBase(wxSocketBase::wxSockFlags _flags, wxSocketBase::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_flags(_flags), m_type(_type), + m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG), + m_lcount(0), m_timeout(3600), + m_unread(NULL), m_unrd_size(0), m_unrd_cur(0), + m_cbk(NULL), m_cdata(NULL), + m_connected(FALSE), m_notify_state(FALSE), m_id(-1), + m_defering(NO_DEFER), + m_states() { - 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_flags((wxSockFlags)SPEED | WAITALL), m_type(SOCK_UNINIT), + m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG), + m_lcount(0), m_timeout(3600), + m_unread(NULL), m_unrd_size(0), m_unrd_cur(0), + m_cbk(NULL), m_cdata(NULL), + m_connected(FALSE), m_notify_state(FALSE), m_id(-1), + m_defering(NO_DEFER), + m_states() { - 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 destructor // -------------------------------------------------------------- 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; + // At last, close the file descriptor. + Close(); + + if (m_socket) + GSocket_destroy(m_socket); } bool wxSocketBase::Close() { - if (m_fd != INVALID_SOCKET) + if (m_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_notify_state == TRUE) + Notify(FALSE); - DestroyCallbacks(); - shutdown(m_fd, 2); - close(m_fd); - m_fd = INVALID_SOCKET; + // Shutdown the connection. + GSocket_Shutdown(m_socket); m_connected = FALSE; } @@ -355,47 +129,89 @@ bool wxSocketBase::Close() // wxSocketBase base IO function // -------------------------------------------------------------- +int wxSocketBase::DeferRead(char *buffer, size_t nbytes) +{ + GSocketEventFlags old_event_flags; + bool old_notify_state; + + wxASSERT(m_defering == NO_DEFER); + + m_defering = DEFER_READ; + + old_event_flags = NeededReq(); + old_notify_state = m_notify_state; + + SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG); + Notify(TRUE); + + m_defer_buffer = buffer; + m_defer_nbytes = nbytes; + while (m_defer_buffer != NULL) + wxYield(); + + Notify(old_notify_state); + SetNotify(old_event_flags); + + m_defering = NO_DEFER; + + return nbytes-m_defer_nbytes; +} + wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes) { + int ret = 1; + m_lcount = GetPushback(buffer, nbytes, FALSE); nbytes -= m_lcount; + buffer += m_lcount; + + if (!m_connected) + return *this; // 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)) ) + if (!nbytes || (m_lcount && !(m_flags & WAITALL)) ) { return *this; + } - WantBuffer(buffer, nbytes, EVT_READ); + if ((m_flags & SPEED) != 0) { - return *this; -} + if ((m_flags & WAITALL) != 0) { + while (ret > 0 && nbytes > 0) { + ret = GSocket_Read(m_socket, buffer, nbytes); + m_lcount += ret; + buffer += ret; + nbytes -= ret; + } + // In case the last call was an error ... + if (ret < 0) + m_lcount ++; + } else { + ret = GSocket_Read(m_socket, buffer, nbytes); + if (ret > 0) + m_lcount += ret; + } -wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes) -{ - size_t nbytes_old = nbytes; + } else { + ret = DeferRead(buffer, nbytes); - nbytes -= GetPushback(buffer, nbytes, TRUE); - if (!nbytes) - { - m_lcount = nbytes_old; - return *this; + if (ret > 0) + m_lcount += ret; } - WantBuffer(buffer, nbytes, EVT_PEEK); - - return *this; -} - -wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes) -{ - WantBuffer((char *)buffer, nbytes, EVT_WRITE); return *this; } wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes) { - SockMsg msg; - size_t len, len2, sig; + unsigned long len, len2, sig; + struct { + char sig[4]; + char len[4]; + } msg; + + // sig should be an explicit 32-bit unsigned integer; I've seen + // compilers in which size_t was actually a 16-bit unsigned integer Read((char *)&msg, sizeof(msg)); if (m_lcount != sizeof(msg)) @@ -412,13 +228,20 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes) 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) + + // len2 is incorrectly computed in the original; this sequence is + // the fix + if (len > nbytes) { + len2 = len - nbytes; len = nbytes; + } else len2 = 0; - if (Read(buffer, len).LastCount() != len) + // the "len &&" in the following statement is necessary so that + // we don't attempt to read (and possibly hang the system) + // if the message was zero bytes long + if (len && Read(buffer, len).LastCount() != len) return *this; if (len2 && (Read(NULL, len2).LastCount() != len2)) return *this; @@ -429,16 +252,71 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes) 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; + wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n")); + + return *this; +} + +wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes) +{ + Read(buffer, nbytes); + CreatePushbackAfter(buffer, nbytes); + + return *this; +} + +int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes) +{ + GSocketEventFlags old_event_flags; + bool old_notify_state; + + wxASSERT(m_defering == NO_DEFER); + + m_defering = DEFER_WRITE; + + old_event_flags = NeededReq(); + old_notify_state = m_notify_state; + + SetNotify(GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG); + Notify(TRUE); + + m_defer_buffer = (char *)buffer; + m_defer_nbytes = nbytes; + while (m_defer_buffer != NULL) + wxYield(); + + Notify(old_notify_state); + SetNotify(old_event_flags); + + m_defering = NO_DEFER; + + return nbytes-m_defer_nbytes; +} + +wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes) +{ + int ret; + + if ((m_flags & SPEED) != 0) + ret = GSocket_Write(m_socket, buffer, nbytes); + else + ret = DeferWrite(buffer, nbytes); + + if (ret != -1) + m_lcount += ret; return *this; } wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes) { - SockMsg msg; + struct { + char sig[4]; + char len[4]; + } msg; // warning about 'cast truncates constant value' #ifdef __VISUALC__ @@ -450,7 +328,7 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes) msg.sig[2] = (char) 0xed; msg.sig[3] = (char) 0xfe; - msg.len[0] = (char) nbytes & 0xff; + 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; @@ -476,26 +354,53 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes) wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes) { - CreatePushbackAfter(buffer, nbytes); + m_lcount = 0; + if (nbytes != 0) { + CreatePushbackAfter(buffer, nbytes); + m_lcount = nbytes; + } return *this; } bool wxSocketBase::IsData() const { - struct timeval tv; - fd_set sock_set; - - if (m_fd < 0) + if (!m_socket) return FALSE; - if (m_unrd_size > 0) - return TRUE; - - 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); + + return (GSocket_DataAvailable(m_socket)); +} + +void wxSocketBase::DoDefer(GSocketEvent req_evt) +{ + int ret; + + if (req_evt == GSOCK_LOST) { + Close(); + m_defer_buffer = NULL; + 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; + break; + } + + m_defer_nbytes -= ret; + + if (ret < 0) + m_defer_nbytes++; + + if ((m_flags & WAITALL) == 0 || m_defer_nbytes == 0 || ret < 0) { + m_defer_buffer = NULL; + Notify(FALSE); + } else + m_defer_buffer += ret; } // --------------------------------------------------------------------- @@ -521,55 +426,35 @@ void wxSocketBase::Discard() #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*. -// -// Under glibc 2.0.7, socketbits.h declares socklen_t to be unsigned int -// and it uses *socklen_t as the 3rd parameter. Robert. - -// JACS - How can we detect this? -// Meanwhile, if your compiler complains about socklen_t, -// switch lines below. - -#if wxHAVE_GLIBC2 -# define wxSOCKET_INT socklen_t -#else -# define wxSOCKET_INT int -#endif - // -------------------------------------------------------------- // wxSocketBase socket info functions // -------------------------------------------------------------- bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const { - struct sockaddr my_addr; - wxSOCKET_INT len_addr = sizeof(my_addr); + GAddress *peer; - if (m_fd < 0) + if (!m_socket) return FALSE; - if (getpeername(m_fd, (struct sockaddr *)&my_addr, &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; - wxSOCKET_INT len_addr = sizeof(my_addr); + GAddress *local; - if (m_fd < 0) + if (!m_socket) return FALSE; - if (getsockname(m_fd, (struct sockaddr *)&my_addr, &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; } @@ -579,14 +464,15 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const void wxSocketBase::SaveState() { - wxSockState *state = new wxSockState; + wxSocketState *state; + + state = new wxSocketState(); - 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->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); } @@ -594,510 +480,212 @@ 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 callback functions -------------------- +// -------------------------------------------------------------- + +wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_) +{ + wxSockCbk old_cbk = cbk_; + + m_cbk = cbk_; + return old_cbk; +} + +char *wxSocketBase::CallbackData(char *data) +{ + char *old_data = m_cdata; + + m_cdata = data; + return old_data; +} + // -------------------------------------------------------------- // --------- wxSocketBase wait functions ------------------------ // -------------------------------------------------------------- -bool wxSocketBase::_Wait(long seconds, long microseconds, int type) +class _wxSocketInternalTimer: public wxTimer { + public: + int *m_state; + + void Notify() + { + *m_state = GSOCK_MAX_EVENT; // Just to say it's a timeout. + } +}; + +static void wx_socket_wait(GSocket *socket, GSocketEvent event, char *cdata) +{ + int *state = (int *)cdata; + + *state = event; +} + +bool wxSocketBase::_Wait(long seconds, long milliseconds, int type) { - if ((!m_connected && !m_connecting) || m_fd < 0) + bool old_notify_state = m_notify_state; + int state = 0; + _wxSocketInternalTimer timer; + + if (!m_connected || !m_socket) return FALSE; - wxSockWakeUp wakeup(this, &m_waitflags, 0); + timer.m_state = &state; - SaveState(); - SetNotify((wxRequestNotify)type); - SetupCallbacks(); + Notify(FALSE); - if (seconds != -1) - wakeup.Start((int)(seconds*1000 + (microseconds / 1000)), TRUE); + timer.Start(seconds * 1000 + milliseconds, TRUE); + GSocket_SetFallback(m_socket, type, wx_socket_wait, (char *)&state); - m_waitflags = 0x80 | type; - while (m_waitflags & 0x80) - PROCESS_EVENTS(); + while (state == 0) + wxYield(); - RestoreState(); + GSocket_UnsetFallback(m_socket, type); + timer.Stop(); - if (m_waitflags & 0x40) - { - m_waitflags = 0; - return TRUE; - } - m_waitflags = 0; + Notify(old_notify_state); - return FALSE; + return (state != GSOCK_MAX_EVENT); } -bool wxSocketBase::Wait(long seconds, long microseconds) +bool wxSocketBase::Wait(long seconds, long milliseconds) { - return _Wait(seconds, microseconds, REQ_ACCEPT | REQ_CONNECT | - REQ_READ | REQ_WRITE | REQ_LOST); + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG); } -bool wxSocketBase::WaitForRead(long seconds, long microseconds) +bool wxSocketBase::WaitForRead(long seconds, long milliseconds) { - return _Wait(seconds, microseconds, REQ_READ | REQ_LOST); + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG); } -bool wxSocketBase::WaitForWrite(long seconds, long microseconds) +bool wxSocketBase::WaitForWrite(long seconds, long milliseconds) { - return _Wait(seconds, microseconds, REQ_WRITE); + return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG); } -bool wxSocketBase::WaitForLost(long seconds, long microseconds) +bool wxSocketBase::WaitForLost(long seconds, long milliseconds) { - return _Wait(seconds, microseconds, REQ_LOST); + return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG); } // -------------------------------------------------------------- // --------- wxSocketBase callback management ------------------- // -------------------------------------------------------------- -#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 +GSocketEventFlags wxSocketBase::EventToNotify(GSocketEvent evt) { - wxSocketBase *sock = (wxSocketBase *)client; - char c; - int i; - - i = recv(fd, &c, 1, MSG_PEEK); - - if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) + switch (evt) { - sock->OnRequest(wxSocketBase::EVT_ACCEPT); - 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_FLAG: + return GSOCK_LOST_FLAG; + default: + return 0; } + return 0; +} - if (i != 0) - { - if (!(sock->NeededReq() & wxSocketBase::REQ_READ)) - { - return; - } - - sock->OnRequest(wxSocketBase::EVT_READ); - } - else - { - if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) - { - sock->Close(); - return; - } +void wxSocketBase::SetFlags(wxSockFlags _flags) +{ + m_flags = _flags; +} - sock->OnRequest(wxSocketBase::EVT_LOST); - } +wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const +{ + return m_flags; } -#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 + +void wxSocketBase::SetNotify(GSocketEventFlags flags) { - wxSocketBase *sock = (wxSocketBase *)client; + /* Check if server */ + if (m_type != SOCK_SERVER) + flags &= ~GSOCK_CONNECTION_FLAG; - if (!sock->IsConnected()) - sock->OnRequest(wxSocketBase::EVT_CONNECT); + m_neededreq = flags; + if (m_neededreq == 0) + Notify(FALSE); else - sock->OnRequest(wxSocketBase::EVT_WRITE); + Notify(m_notify_state); } -#endif -#ifdef wx_xview -Notify_value wx_sock_read_xview (Notify_client client, int fd) +// -------------------------------------------------------------- +// Automatic notifier +// -------------------------------------------------------------- + +static void wx_socket_fallback(GSocket *socket, GSocketEvent event, char *cdata) { - wxSocketBase *sock = (wxSocketBase *)client; - char c; - int i; + wxSocketBase *sckobj = (wxSocketBase *)cdata; - i = recv(fd, &c, 1, MSG_PEEK); + sckobj->OnRequest(event); +} - if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) - { - sock->OnRequest(wxSocketBase::EVT_ACCEPT); +void wxSocketBase::Notify(bool notify) +{ + m_notify_state = notify; + if (!m_socket) return; - } - /* Bytes arrived */ - if (i != 0) - { - if (!(sock->NeededReq() & wxSocketBase::REQ_READ)) - return (Notify_value) FALSE; + GSocket_UnsetFallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG); + if (!notify) + return; - sock->OnRequest(wxSocketBase::EVT_READ); - } - else - { - if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) - return; + GSocket_SetFallback(m_socket, m_neededreq, wx_socket_fallback, (char *)this); +} + +void wxSocketBase::OnRequest(GSocketEvent req_evt) +{ + wxSocketEvent event(m_id); + GSocketEventFlags notify = EventToNotify(req_evt); + + if (m_defering != NO_DEFER) { + DoDefer(req_evt); + return; + } - sock->OnRequest(wxSocketBase::EVT_LOST); + if ((m_neededreq & notify) == notify) { + event.m_socket = this; + event.m_skevt = req_evt; + ProcessEvent(event); + OldOnNotify(req_evt); } - return (Notify_value) FALSE; + if (req_evt == GSOCK_LOST) + Close(); } -Notify_value wx_sock_write_xview (Notify_client client, int fd) +void wxSocketBase::OldOnNotify(GSocketEvent evt) { - 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; - } - 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) -{ - 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) seems to be wrong, Robert Roebling - SetupCallbacks(); -*/ - - if (old_needed_req != flags) - SetupCallbacks(); -} - -void wxSocketBase::SetupCallbacks() -{ - if (m_fd == INVALID_SOCKET || !m_handler || (m_flags & SPEED)) - return; - -#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 (m_internal->sock_outputid <= 0) - { - m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd, - (XtPointer *) XtInputWriteMask, - (XtInputCallbackProc) wx_socket_write, - (XtPointer) this); - } - } - else - { - if (m_internal->sock_outputid > 0) - { - XtRemoveInput(m_internal->sock_outputid); - m_internal->sock_outputid = 0; - } - } -#endif - - -#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); - } - } - else - { - if (m_internal->sock_outputid > 0) - { -/* - 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); - - // 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 - } - 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); -} - -void wxSocketBase::OldOnNotify(wxRequestEvent 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::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) { SetNextHandler(&h_evt); @@ -1112,7 +700,11 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size) { char *curr_pos; - m_unread = (char *) realloc(m_unread, m_unrd_size+size); + if (m_unread != NULL) + m_unread = (char *) realloc(m_unread, m_unrd_size+size); + else + m_unread = (char *) malloc(size); + curr_pos = m_unread + m_unrd_size; memcpy(curr_pos, buffer, size); @@ -1121,17 +713,21 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size) void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t 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; - - memcpy(new_buf, buffer, size); - memcpy(curr_pos, m_unread, m_unrd_size); + tmp = (char *)malloc(m_unrd_size + size); + memcpy(tmp+size, m_unread, m_unrd_size); + free(m_unread); - free(m_unread); - m_unread = new_buf; + m_unread = tmp; + } + m_unrd_size += size; + + memcpy(m_unread, buffer, size); } size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek) @@ -1139,177 +735,23 @@ size_t wxSocketBase::GetPushback(char *buffer, size_t 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; } } return size; } -// -------------------------------------------------------------- -// --------- wxSocketBase "multi-thread" core ------------------- -// -------------------------------------------------------------- - -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; - m_error = 0; - } -} - -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 // -------------------------------------------------------------- @@ -1318,25 +760,19 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man, wxSockFlags flags) : wxSocketBase(flags, SOCK_SERVER) { - m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0); + m_socket = GSocket_new(); - if (m_fd == INVALID_SOCKET) + if (!m_socket) return; - int flag = 1; - setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int)); - - struct sockaddr *myaddr; - size_t len; - - addr_man.Build(myaddr, len); - if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0) - return; - - if (listen(m_fd, 5) < 0) { - m_fd = INVALID_SOCKET; + GSocket_SetLocal(m_socket, addr_man.GetAddress()); + if (GSocket_SetServer(m_socket) != GSOCK_NOERROR) { + GSocket_destroy(m_socket); + m_socket = NULL; return; } + + Notify(TRUE); } // -------------------------------------------------------------- @@ -1345,28 +781,12 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man, bool wxSocketServer::AcceptWith(wxSocketBase& sock) { - int fd2; - - if ((fd2 = accept(m_fd, 0, 0)) < 0) - return FALSE; + GSocket *child_socket; - struct linger linger; - linger.l_onoff = 0; - linger.l_linger = 1; - - setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); - - int flag = 0; - setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int)); - - if (!(sock.m_flags & SPEED)) - { - unsigned long flag2 = 1; - ioctl(fd2, FIONBIO, &flag2); - } + child_socket = GSocket_WaitConnection(m_socket); sock.m_type = SOCK_INTERNAL; - sock.m_fd = fd2; + sock.m_socket = child_socket; sock.m_connected = TRUE; return TRUE; @@ -1381,24 +801,9 @@ wxSocketBase *wxSocketServer::Accept() if (!AcceptWith(*sock)) return NULL; - if (m_handler) - m_handler->Register(sock); - return sock; } -// -------------------------------------------------------------- -// wxSocketServer callbacks -// -------------------------------------------------------------- - -void wxSocketServer::OnRequest(wxRequestEvent evt) -{ - if (evt == EVT_ACCEPT) - { - OldOnNotify(EVT_ACCEPT); - } -} - // -------------------------------------------------------------- // wxSocketClient // -------------------------------------------------------------- @@ -1422,49 +827,31 @@ wxSocketClient::~wxSocketClient() // -------------------------------------------------------------- bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) ) { - struct linger linger; - if (IsConnected()) Close(); - m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0); + // This should never happen. + if (m_socket) + GSocket_destroy(m_socket); - if (m_fd < 0) + // Initializes all socket stuff ... + // -------------------------------- + m_socket = GSocket_new(); + + if (!m_socket) return FALSE; m_connected = FALSE; - linger.l_onoff = 1; - linger.l_linger = 5; - setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); - - // Stay in touch with the state of things... - - unsigned long flag = 1; - setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int)); - - // Disable the nagle algorithm, which delays sends till the - // buffer is full (or a certain time period has passed?)... - -#if defined(__WINDOWS__) || (defined(IPPROTO_TCP) && defined(TCP_NODELAY)) - flag = 1; - setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int)); -#endif - - struct sockaddr *remote; - size_t len; - - addr_man.Build(remote, len); - - if (connect(m_fd, remote, len) != 0) + // Update the flags of m_socket. + SetFlags(m_flags); + GSocket_SetPeer(m_socket, addr_man.GetAddress()); + if (GSocket_Connect(m_socket, GSOCK_STREAMED) != GSOCK_NOERROR) { return FALSE; - - if (!(m_flags & SPEED)) - { - flag = 1; - ioctl(m_fd, FIONBIO, &flag); } + // Enables bg events. + // ------------------ Notify(TRUE); m_connected = TRUE; @@ -1473,7 +860,7 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) ) bool wxSocketClient::WaitOnConnect(long seconds, long microseconds) { - int ret = _Wait(seconds, microseconds, REQ_CONNECT | REQ_LOST); + int ret = _Wait(seconds, microseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG); if (ret) m_connected = TRUE; @@ -1481,408 +868,42 @@ bool wxSocketClient::WaitOnConnect(long seconds, long microseconds) return m_connected; } -void wxSocketClient::OnRequest(wxRequestEvent evt) +void wxSocketClient::OnRequest(GSocketEvent evt) { - if (evt == EVT_CONNECT) + if (evt == GSOCK_CONNECTION) { if (m_connected) { -#ifndef __WXGTK__ - SetNotify(m_neededreq & ~REQ_CONNECT); -#endif + m_neededreq &= ~GSOCK_CONNECTION_FLAG; return; } - m_waitflags = 0x40; m_connected = TRUE; - OldOnNotify(EVT_CONNECT); -#ifndef __WXGTK__ - DestroyCallbacks(); -#endif return; } wxSocketBase::OnRequest(evt); } -///////////////////////////////////////////////////////////////// -// wxSocketHandler /////////////////////////////////////////////// -///////////////////////////////////////////////////////////////// - -wxSocketHandler *wxSocketHandler::master = NULL; -#if defined(__WINDOWS__) -static int win_initialized = 0; -#endif - // -------------------------------------------------------------- -// --------- wxSocketHandler CONSTRUCTOR ------------------------ +// wxSocketEvent // -------------------------------------------------------------- -#ifdef __WXMAC__ - -extern "C" int updatestatus(int s) ; - -void wxMacSocketOnRequestProc( void *refcon , short event ) -{ - if ( refcon ) - { - 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); - break; - case FD_WRITE: - sk_req = wxSocketBase::EVT_WRITE; - sock->OnRequest(sk_req); - break; - case FD_CLOSE: - sk_req = wxSocketBase::EVT_LOST; - sock->OnRequest(sk_req); - break; - case FD_ACCEPT: - sk_req = wxSocketBase::EVT_ACCEPT; - sock->OnRequest(sk_req); - break; - case FD_CONNECT: - sk_req = wxSocketBase::EVT_CONNECT; - sock->OnRequest(sk_req); - break; - case FD_READY : - break ; - } - updatestatus ( sock->m_fd ) ; - } -} - -void wxMacSocketHandlerProc( void *refcon , short event ) -{ - wxMacNetEventsReferences[wxMacNetEventsTop] = refcon ; - wxMacNetEventsEvents[wxMacNetEventsTop] = event ; - - // clumsy construct in order to never have a incorrect wxMacNetEventsTop (above limits) - - if ( wxMacNetEventsTop + 1 == kwxMacNetEventsMax ) - wxMacNetEventsTop = 0 ; - else - wxMacNetEventsTop++ ; -} - -#endif -#ifdef __WINDOWS__ - -extern char wxPanelClassName[]; - -LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message, - WPARAM wParam, LPARAM lParam) -{ - if(message==WM_DESTROY) - { - ::SetWindowLong(hWnd, GWL_WNDPROC, (LONG) DefWindowProc); - return DefWindowProc(hWnd, message, wParam, 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; - - default: - wxFAIL_MSG("invalid socket event"); - return (LRESULT)0; - } - - 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() -{ - 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; - - ::DestroyWindow(internal->sockWin); - WSACleanup(); - win_initialized = 0; - delete internal; -#endif -} - -// -------------------------------------------------------------- -// --------- wxSocketHandler registering functions -------------- -// -------------------------------------------------------------- - -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) -{ - wxNode *node; - - for (node = socks->First(); node; node = node->Next()) - { - wxSocketBase* s = (wxSocketBase*)node->Data(); - - if (s == sock) - { - delete node; - sock->DestroyCallbacks(); - sock->SetHandler(NULL); - return; - } - } -} - -unsigned long wxSocketHandler::Count() const -{ - return socks->Number(); -} - -// -------------------------------------------------------------- -// --------- wxSocketHandler "big" wait functions --------------- -// -------------------------------------------------------------- -void handler_cbk(wxSocketBase& sock, - wxSocketBase::wxRequestEvent WXUNUSED(flags), - char *cdata) -{ - int *a_wait = (int *)cdata; - - (*a_wait)++; - sock.Notify(FALSE); -} - -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); - } - 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(); - } -} - -// -------------------------------------------------------------- -// --------- 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 +wxSocketEvent::wxSocketEvent(int id) + : wxEvent(id) { - return internal->sockWin; -} - -#endif + wxEventType type = (wxEventType)wxEVT_SOCKET; -bool wxSocketModule::OnInit() -{ - wxSocketHandler::master = new wxSocketHandler(); - return TRUE; + SetEventType(type); } -void wxSocketModule::OnExit() +void wxSocketEvent::CopyObject(wxObject& obj_d) const { - delete wxSocketHandler::master; - wxSocketHandler::master = NULL; -} + wxSocketEvent *event = (wxSocketEvent *)&obj_d; -#ifdef __WXMAC__ -void wxMacProcessSocketEvents() ; -void wxMacProcessEvents() -{ - wxMacProcessSocketEvents() ; - (*GUSISpin)(SP_MISC, 0) ; -} + wxEvent::CopyObject(obj_d); -void wxMacProcessSocketEvents() -{ - while ( wxMacNetEventsTop != wxMacNetEventsBottom ) - { - // consume event at wxMacNetEventsBottom - wxMacSocketOnRequestProc(wxMacNetEventsReferences[wxMacNetEventsBottom] , wxMacNetEventsEvents[wxMacNetEventsBottom] ) ; - wxMacNetEventsBottom++ ; - if ( wxMacNetEventsBottom == kwxMacNetEventsMax ) - wxMacNetEventsBottom = 0 ; - } + event->m_skevt = m_skevt; + event->m_socket = m_socket; } -#endif #endif - // __WXSTUBS__ + // wxUSE_SOCKETS