X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48da7d0ba891d2e6d2f326a5122b92bae2fdf1fc..7c1cb261228c78cac34ee9f0b08e2674b07c37ee:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index c568508af1..98ce67a4b9 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -1,22 +1,18 @@ -//////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// // 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: April 1999 -// Copyright: (C) 1999 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" #endif -#ifdef __MWERKS__ -typedef int socklen_t ; -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -26,416 +22,754 @@ typedef int socklen_t ; #if wxUSE_SOCKETS -///////////////////////////////////////////////////////////////////////////// -// wxWindows headers -///////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +// ========================================================================== +// Headers and constants +// ========================================================================== -// Not enough OS behaviour defined for wxStubs -#ifndef __WXSTUBS__ +#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" +#include "wx/gdicmn.h" // for wxPendingDelete -#include -#include -#include +#include "wx/sckaddr.h" +#include "wx/socket.h" -///////////////////////////////////////////////////////////////////////////// -// System specific headers -///////////////////////////////////////////////////////////////////////////// -#ifdef __WXMAC__ -// in order to avoid problems with our c library and double definitions -#define close closesocket -#define ioctl ioctlsocket -#include +// discard buffer +#define MAX_DISCARD_SIZE (10 * 1024) -#endif +// what to do within waits +#define PROCESS_EVENTS() wxYield() -#if defined(__WINDOWS__) -#include -#endif // __WINDOWS__ +// use wxPostEvent or not +#define USE_DELAYED_EVENTS 1 -#if defined(__UNIX__) +// -------------------------------------------------------------------------- +// ClassInfos +// -------------------------------------------------------------------------- -#ifdef VMS -#include -#else -#include -#endif -#include +IMPLEMENT_CLASS(wxSocketBase, wxObject) +IMPLEMENT_CLASS(wxSocketServer, wxSocketBase) +IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) +IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase) +IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent) -#include -#include +class wxSocketState : public wxObject +{ +public: + bool m_notify_state; + wxSocketEventFlags m_neededreq; + wxSockFlags m_flags; + wxSocketBase::wxSockCbk m_cbk; + char *m_cdata; -#ifdef sun -#include -#endif +public: + wxSocketState() : wxObject() {} +}; -#endif // __UNIX__ -#include -#include +// ========================================================================== +// wxSocketBase +// ========================================================================== -#ifdef __VISUALC__ -#include -#endif +// -------------------------------------------------------------------------- +// Ctor and dtor +// -------------------------------------------------------------------------- -///////////////////////////////////////////////////////////////////////////// -// wxSocket headers -///////////////////////////////////////////////////////////////////////////// -#include -#define WXSOCK_INTERNAL -#include -#include -#include - -// ---------------------- -// 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 +wxSocketBase::wxSocketBase(wxSockFlags _flags, wxSockType _type) : + wxEvtHandler(), + 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) +{ +} -#ifndef __WINDOWS__ -#define INVALID_SOCKET -1 -#endif +wxSocketBase::wxSocketBase() : + wxEvtHandler(), + 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) +{ +} + +wxSocketBase::~wxSocketBase() +{ + if (m_unread) + free(m_unread); -#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). + // Shutdown and close the socket + Close(); + + // Destroy the GSocket object + if (m_socket) + GSocket_destroy(m_socket); +} -#if defined( NEED_WSAFDIsSet ) || defined( __VISUALC__ ) -int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set) +/* +bool wxSocketBase::Destroy() { - int i = set->fd_count; + // Delayed destruction: the socket will be deleted during the next + // idle loop iteration. This ensures that all pending events have + // been processed. - while (i--) - { - if (set->fd_array[i] == fd) - return 1; - } + m_beingDeleted = TRUE; + Close(); - return 0; + if ( !wxPendingDelete.Member(this) ) + wxPendingDelete.Append(this); + + return TRUE; } -#endif -#endif +*/ -// ------------------- -// Some patch ---- END -// ------------------- +// -------------------------------------------------------------------------- +// Basic IO operations +// -------------------------------------------------------------------------- -#ifdef GetClassInfo -#undef GetClassInfo -#endif +// 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? -// -------------------------------------------------------------- -// Module -// -------------------------------------------------------------- -class wxSocketModule: public wxModule +bool wxSocketBase::Close() { - DECLARE_DYNAMIC_CLASS(wxSocketModule) -public: - wxSocketModule() {} - bool OnInit(); - void OnExit(); -}; + // Interrupt pending waits + InterruptAllWaits(); -// -------------------------------------------------------------- -// ClassInfos -// -------------------------------------------------------------- -#if !USE_SHARED_LIBRARY -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 + if (m_socket) + { + // Disable callbacks + GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG); -// -------------------------------------------------------------- -// --------- 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_id(-1), - m_handler(0), - m_neededreq((wxRequestNotify)(REQ_READ | REQ_LOST)), - m_timeout(3600), - m_unread(NULL), m_unrd_size(0), - m_cbk(NULL), m_cdata(NULL), - m_notify_state(FALSE) -{ - m_internal = new wxSocketInternal(this); + // Shutdown the connection + GSocket_Shutdown(m_socket); + } + + m_connected = FALSE; + m_establishing = FALSE; + return TRUE; } -wxSocketBase::wxSocketBase() : - wxEvtHandler(), - m_flags(WAITALL), m_type(SOCK_UNINIT), m_connected(FALSE), - m_connecting(FALSE), m_fd(INVALID_SOCKET), - m_id(-1), m_handler(0), - m_neededreq((wxRequestNotify)(REQ_READ | REQ_LOST)), - m_timeout(3600), - m_unread(NULL), m_unrd_size(0), - m_cbk(NULL), m_cdata(NULL), - m_notify_state(FALSE) +wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes) { - m_internal = new wxSocketInternal(this); -} + // Mask read events + m_reading = TRUE; -// -------------------------------------------------------------- -// wxSocketBase -// -------------------------------------------------------------- + m_lcount = _Read(buffer, nbytes); -wxSocketBase::~wxSocketBase() + // If in wxSOCKET_WAITALL mode, all bytes should have been read. + if (m_flags & wxSOCKET_WAITALL) + m_error = (m_lcount != nbytes); + else + m_error = (m_lcount == 0); + + // Allow read events from now on + m_reading = FALSE; + + return *this; +} + +wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes) { - // First, close the file descriptor. - Close(); + int total; + int ret = 1; + + // Try the pushback buffer first + total = GetPushback(buffer, nbytes, FALSE); + nbytes -= total; + buffer += total; + + // If the socket is invalid or we got all the data, return now + if (!m_socket || !nbytes) + return total; + + // 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) + { + GSocket_SetNonBlocking(m_socket, TRUE); + ret = GSocket_Read(m_socket, buffer, nbytes); + GSocket_SetNonBlocking(m_socket, FALSE); - if (m_unread) - free(m_unread); - // Unregister from the handler database. - if (m_handler) - m_handler->UnRegister(this); + if (ret > 0) + total += ret; + } + else if (m_flags & wxSOCKET_WAITALL) + { + while (ret > 0 && nbytes > 0) + { + if (!(m_flags & wxSOCKET_BLOCK) && !WaitForRead()) + break; - // Destroy all saved states. - m_states.DeleteContents(TRUE); + ret = GSocket_Read(m_socket, buffer, nbytes); - // Destroy the socket manager. - delete m_internal; + if (ret > 0) + { + total += ret; + buffer += ret; + nbytes -= ret; + } + } + } + else + { + if ((m_flags & wxSOCKET_BLOCK) || WaitForRead()) + { + ret = GSocket_Read(m_socket, buffer, nbytes); + + if (ret > 0) + total += ret; + } + } + + return total; } -bool wxSocketBase::Close() +wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) { - if (m_fd != INVALID_SOCKET) + wxUint32 len, len2, sig, total; + bool error; + int old_flags; + struct { - if (m_notify_state == TRUE) - Notify(FALSE); - - // Shutdown the connection. - shutdown(m_fd, 2); - close(m_fd); - m_fd = INVALID_SOCKET; - m_connected = FALSE; + unsigned char sig[4]; + unsigned char len[4]; + } msg; + + // Mask read events + m_reading = TRUE; + + total = 0; + error = TRUE; + old_flags = m_flags; + SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL); + + if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg)) + goto exit; + + sig = (wxUint32)msg.sig[0]; + sig |= (wxUint32)(msg.sig[1] << 8); + sig |= (wxUint32)(msg.sig[2] << 16); + sig |= (wxUint32)(msg.sig[3] << 24); + + if (sig != 0xfeeddead) + { + wxLogWarning( _("wxSocket: invalid signature in ReadMsg.")); + goto exit; } - return TRUE; + len = (wxUint32)msg.len[0]; + len |= (wxUint32)(msg.len[1] << 8); + len |= (wxUint32)(msg.len[2] << 16); + len |= (wxUint32)(msg.len[3] << 24); + + if (len > nbytes) + { + len2 = len - nbytes; + len = nbytes; + } + else + len2 = 0; + + // Don't attemp to read if the msg was zero bytes long. + if (len) + { + total = _Read(buffer, len); + + if (total != len) + goto exit; + } + if (len2) + { + char *discard_buffer = new char[MAX_DISCARD_SIZE]; + long discard_len; + + // NOTE: discarded bytes don't add to m_lcount. + do + { + discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2); + discard_len = _Read(discard_buffer, (wxUint32)discard_len); + len2 -= (wxUint32)discard_len; + } + while ((discard_len > 0) && len2); + + delete [] discard_buffer; + + if (len2 != 0) + goto exit; + } + if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg)) + goto exit; + + sig = (wxUint32)msg.sig[0]; + sig |= (wxUint32)(msg.sig[1] << 8); + sig |= (wxUint32)(msg.sig[2] << 16); + sig |= (wxUint32)(msg.sig[3] << 24); + + if (sig != 0xdeadfeed) + { + wxLogWarning( _("wxSocket: invalid signature in ReadMsg.")); + goto exit; + } + + // everything was OK + error = FALSE; + +exit: + m_error = error; + m_lcount = total; + m_reading = FALSE; + SetFlags(old_flags); + + return *this; } -// -------------------------------------------------------------- -// wxSocketBase base IO function -// -------------------------------------------------------------- +wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes) +{ + // Mask read events + m_reading = TRUE; + + m_lcount = _Read(buffer, nbytes); + Pushback(buffer, m_lcount); + + // If in wxSOCKET_WAITALL mode, all bytes should have been read. + if (m_flags & wxSOCKET_WAITALL) + m_error = (m_lcount != nbytes); + else + m_error = (m_lcount == 0); + + // Allow read events again + m_reading = FALSE; + + return *this; +} -wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes) +wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes) { - m_lcount = GetPushback(buffer, nbytes, FALSE); - nbytes -= m_lcount; - buffer += m_lcount; - - // 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; - } + // Mask write events + m_writing = TRUE; + + m_lcount = _Write(buffer, nbytes); + + // If in wxSOCKET_WAITALL mode, all bytes should have been written. + if (m_flags & wxSOCKET_WAITALL) + m_error = (m_lcount != nbytes); + else + m_error = (m_lcount == 0); - WantBuffer(buffer, nbytes, EVT_READ); + // Allow write events again + m_writing = FALSE; return *this; } -wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes) +wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes) { - m_lcount = GetPushback(buffer, nbytes, TRUE); - if (nbytes-m_lcount == 0) + wxUint32 total = 0; + int ret = 1; + + // 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) { - return *this; + GSocket_SetNonBlocking(m_socket, TRUE); + ret = GSocket_Write(m_socket, buffer, nbytes); + GSocket_SetNonBlocking(m_socket, FALSE); + + if (ret > 0) + total = ret; } - buffer += m_lcount; - nbytes -= m_lcount; + else if (m_flags & wxSOCKET_WAITALL) + { + while (ret > 0 && nbytes > 0) + { + if (!(m_flags & wxSOCKET_BLOCK) && !WaitForWrite()) + break; - WantBuffer(buffer, nbytes, EVT_PEEK); + ret = GSocket_Write(m_socket, buffer, nbytes); - return *this; + if (ret > 0) + { + total += ret; + buffer += ret; + nbytes -= ret; + } + } + } + else + { + if ((m_flags & wxSOCKET_BLOCK) || WaitForWrite()) + { + ret = GSocket_Write(m_socket, buffer, nbytes); + + if (ret > 0) + total = ret; + } + } + + return total; } -wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes) +wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes) { - m_lcount = 0; - WantBuffer((char *)buffer, nbytes, EVT_WRITE); + wxUint32 total; + bool error; + int old_flags; + struct { + unsigned char sig[4]; + unsigned char len[4]; + } msg; + + // Mask write events + m_writing = TRUE; + + error = TRUE; + total = 0; + old_flags = m_flags; + SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL); + + msg.sig[0] = (unsigned char) 0xad; + msg.sig[1] = (unsigned char) 0xde; + msg.sig[2] = (unsigned char) 0xed; + msg.sig[3] = (unsigned char) 0xfe; + + msg.len[0] = (unsigned char) (nbytes & 0xff); + msg.len[1] = (unsigned char) ((nbytes >> 8) & 0xff); + msg.len[2] = (unsigned char) ((nbytes >> 16) & 0xff); + msg.len[3] = (unsigned char) ((nbytes >> 24) & 0xff); + + if (_Write((char *)&msg, sizeof(msg)) < sizeof(msg)) + goto exit; + + total = _Write(buffer, nbytes); + + if (total < nbytes) + goto exit; + + msg.sig[0] = (unsigned char) 0xed; + msg.sig[1] = (unsigned char) 0xfe; + msg.sig[2] = (unsigned char) 0xad; + msg.sig[3] = (unsigned char) 0xde; + msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0; + + if ((_Write((char *)&msg, sizeof(msg))) < sizeof(msg)) + goto exit; + + // everything was OK + error = FALSE; + +exit: + m_error = error; + m_lcount = total; + m_writing = FALSE; + return *this; } -wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes) +wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes) { - CreatePushbackAfter(buffer, nbytes); + if (nbytes != 0) + Pushback(buffer, nbytes); + + m_error = FALSE; + m_lcount = nbytes; + return *this; } -bool wxSocketBase::IsData() const +wxSocketBase& wxSocketBase::Discard() { - struct timeval tv; - fd_set sock_set; + int old_flags; + char *buffer = new char[MAX_DISCARD_SIZE]; + wxUint32 ret; + wxUint32 total = 0; - if (m_fd < 0) - return FALSE; - if (m_unrd_size > 0) - return TRUE; + // Mask read events + m_reading = TRUE; + + old_flags = m_flags; + SetFlags(wxSOCKET_NOWAIT); - m_internal->AcquireFD(); + do + { + ret = _Read(buffer, MAX_DISCARD_SIZE); + total += ret; + } + while (ret == MAX_DISCARD_SIZE); - 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); + delete[] buffer; + m_lcount = total; + m_error = FALSE; - m_internal->ReleaseFD(); + // Allow read events again + m_reading = FALSE; - return (FD_ISSET(m_fd, &sock_set) != 0); + return *this; } -// --------------------------------------------------------------------- -// --------- wxSocketBase Discard(): deletes all byte in the input queue -// --------------------------------------------------------------------- -void wxSocketBase::Discard() +// -------------------------------------------------------------------------- +// Wait functions +// -------------------------------------------------------------------------- + +// 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. + +class _wxSocketInternalTimer: public wxTimer { -#define MAX_BUFSIZE (10*1024) - char *my_data = new char[MAX_BUFSIZE]; - size_t recv_size = MAX_BUFSIZE; +public: + int *m_state; + unsigned long m_new_val; + + void Notify() + { + *m_state = (int)m_new_val; // Change the value + } +}; + +bool wxSocketBase::_Wait(long seconds, long milliseconds, + wxSocketEventFlags flags) +{ + GSocketEventFlags result; + _wxSocketInternalTimer timer; + long timeout; + int state = -1; - SaveState(); - SetFlags((wxSockFlags)(NOWAIT | SPEED)); + // Set this to TRUE to interrupt ongoing waits + m_interrupt = FALSE; - while (recv_size == MAX_BUFSIZE) + // Check for valid socket + if (!m_socket) + return FALSE; + + // Check for valid timeout value + if (seconds != -1) + timeout = seconds * 1000 + milliseconds; + else + timeout = m_timeout * 1000; + + // Activate timer + if (timeout) { - recv_size = Read(my_data, MAX_BUFSIZE).LastCount(); + timer.m_state = &state; + timer.m_new_val = 0; + timer.Start((int)timeout, TRUE); } - RestoreState(); - delete [] my_data; + // 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) + { + result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG); -#undef MAX_BUFSIZE + // Incoming connection (server) or connection established (client) + if (result & GSOCK_CONNECTION_FLAG) + { + timer.Stop(); + m_connected = TRUE; + m_establishing = FALSE; + return TRUE; + } + + // Data available or output buffer ready + if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG)) + { + timer.Stop(); + return TRUE; + } + + // Connection lost + if (result & GSOCK_LOST_FLAG) + { + timer.Stop(); + m_connected = FALSE; + m_establishing = FALSE; + return (flags & GSOCK_LOST_FLAG); + } + + // Wait more? + if ((timeout == 0) || (m_interrupt)) + break; + else + PROCESS_EVENTS(); + } + + timer.Stop(); + return FALSE; } -// 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. +bool wxSocketBase::Wait(long seconds, long milliseconds) +{ + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | + GSOCK_OUTPUT_FLAG | + GSOCK_CONNECTION_FLAG | + GSOCK_LOST_FLAG); +} -// JACS - How can we detect this? -// Meanwhile, if your compiler complains about socklen_t, -// switch lines below. +bool wxSocketBase::WaitForRead(long seconds, long milliseconds) +{ + // Check pushback buffer before entering _Wait + if (m_unread) + return TRUE; -#if wxHAVE_GLIBC2 -# define wxSOCKET_INT socklen_t -#else -# define wxSOCKET_INT int -#endif + // 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. -// -------------------------------------------------------------- -// wxSocketBase socket info functions -// -------------------------------------------------------------- + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | + GSOCK_LOST_FLAG); +} -bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const +bool wxSocketBase::WaitForWrite(long seconds, long milliseconds) { - struct sockaddr my_addr; - wxSOCKET_INT len_addr = sizeof(my_addr); + return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG); +} - if (m_fd < 0) - return FALSE; +bool wxSocketBase::WaitForLost(long seconds, long milliseconds) +{ + return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG); +} + +// -------------------------------------------------------------------------- +// Miscellaneous +// -------------------------------------------------------------------------- - m_internal->AcquireFD(); +// +// Get local or peer address +// + +bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const +{ + GAddress *peer; - if (getpeername(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0) { - m_internal->ReleaseFD(); + if (!m_socket) return FALSE; - } - m_internal->ReleaseFD(); - addr_man.Disassemble(&my_addr, len_addr); + peer = GSocket_GetPeer(m_socket); + addr_man.SetAddress(peer); + GAddress_destroy(peer); + 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; - m_internal->AcquireFD(); + local = GSocket_GetLocal(m_socket); + addr_man.SetAddress(local); + GAddress_destroy(local); - if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0) { - m_internal->ReleaseFD(); - return FALSE; - } - m_internal->ReleaseFD(); - - addr_man.Disassemble(&my_addr, len_addr); return TRUE; } -// -------------------------------------------------------------- -// wxSocketBase wait functions -// -------------------------------------------------------------- +// +// Save and restore socket state +// void wxSocketBase::SaveState() { - SocketState *state = new SocketState; + wxSocketState *state; - 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; + state = new wxSocketState(); - m_states.Append((wxObject *)state); + 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; + + m_states.Append(state); } void wxSocketBase::RestoreState() { wxNode *node; - SocketState *state; + wxSocketState *state; node = m_states.Last(); if (!node) return; - state = (SocketState *)node->Data(); + state = (wxSocketState *)node->Data(); - 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); + SetFlags(state->m_flags); + m_cbk = state->m_cbk; + m_cdata = state->m_cdata; + m_neededreq = state->m_neededreq; + Notify(state->m_notify_state); delete node; delete state; } -// -------------------------------------------------------------- -// --------- wxSocketBase callback functions -------------------- -// -------------------------------------------------------------- +// +// Timeout and flags +// + +void wxSocketBase::SetTimeout(long seconds) +{ + m_timeout = seconds; + + if (m_socket) + GSocket_SetTimeout(m_socket, m_timeout * 1000); +} + +void wxSocketBase::SetFlags(wxSockFlags _flags) +{ + m_flags = _flags; +} + +// -------------------------------------------------------------------------- +// Callbacks (now obsolete - use events instead) +// -------------------------------------------------------------------------- wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_) { @@ -453,635 +787,426 @@ char *wxSocketBase::CallbackData(char *data) return old_data; } -// -------------------------------------------------------------- -// --------- wxSocketBase wait functions ------------------------ -// -------------------------------------------------------------- - -bool wxSocketBase::_Wait(long seconds, long milliseconds, int type) -{ - SockRequest *req; - - if ((!m_connected && !m_connecting) || m_fd < 0) - return FALSE; - - req = new SockRequest; - - req->type = REQ_WAIT | type; - req->timeout = seconds * 1000 + milliseconds; - req->done = FALSE; - req->buffer = NULL; - req->size = 0; - req->error = 0; - req->wait = TRUE; - m_internal->QueueRequest(req, TRUE); - - return (req->io_nbytes != 0); -} - -bool wxSocketBase::Wait(long seconds, long milliseconds) -{ - return _Wait(seconds, milliseconds, REQ_ACCEPT | REQ_CONNECT | - REQ_READ | REQ_WRITE | REQ_LOST); -} +// -------------------------------------------------------------------------- +// Event system +// -------------------------------------------------------------------------- -bool wxSocketBase::WaitForRead(long seconds, long milliseconds) -{ - return _Wait(seconds, milliseconds, REQ_READ | REQ_LOST); -} +// 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 wxSocketBase::WaitForWrite(long seconds, long milliseconds) +static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket), + GSocketEvent event, + char *cdata) { - return _Wait(seconds, milliseconds, REQ_WRITE); -} + wxSocketBase *sckobj = (wxSocketBase *)cdata; -bool wxSocketBase::WaitForLost(long seconds, long milliseconds) -{ - return _Wait(seconds, milliseconds, REQ_LOST); + sckobj->OnRequest((wxSocketNotify)event); } -// -------------------------------------------------------------- -// --------- wxSocketBase callback management ------------------- -// -------------------------------------------------------------- - -wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt) +wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt) { - switch (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; + case GSOCK_INPUT: return GSOCK_INPUT_FLAG; + case GSOCK_OUTPUT: return GSOCK_OUTPUT_FLAG; + case GSOCK_CONNECTION: return GSOCK_CONNECTION_FLAG; + case GSOCK_LOST: return GSOCK_LOST_FLAG; } return 0; } -void wxSocketBase::SetFlags(wxSockFlags _flags) -{ - m_flags = _flags; - if (_flags & SPEED) { - // SPEED and WAITALL are antagonists. - m_flags = (wxSockFlags)(m_flags & ~WAITALL); - } -} - -wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const -{ - return m_flags; -} - -void wxSocketBase::SetNotify(wxRequestNotify flags) +void wxSocketBase::SetNotify(wxSocketEventFlags flags) { - /* Check if server */ - if (m_type != SOCK_SERVER) - flags &= ~REQ_ACCEPT; - - m_internal->AcquireData(); m_neededreq = flags; - m_internal->ReleaseData(); - if (m_neededreq == 0) - m_internal->StopWaiter(); - else - Notify(m_notify_state); } void wxSocketBase::Notify(bool notify) { m_notify_state = notify; - if (m_fd == INVALID_SOCKET) - return; - - if (notify) - m_internal->ResumeWaiter(); - else - m_internal->StopWaiter(); } -void wxSocketBase::OnRequest(wxRequestEvent req_evt) +void wxSocketBase::OnRequest(wxSocketNotify req_evt) { wxSocketEvent event(m_id); - wxRequestNotify notify = EventToNotify(req_evt); + wxSocketEventFlags flag = EventToNotify(req_evt); - if ((m_neededreq & notify) == notify) { - event.m_socket = this; - event.m_skevt = req_evt; - ProcessEvent(event); - // TODOTODO - // OldOnNotify(req_evt); + // 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. - // We disable the event reporting. - m_neededreq &= ~notify; + switch(req_evt) + { + case wxSOCKET_CONNECTION: + m_establishing = FALSE; + m_connected = TRUE; + break; + + // If we are in the middle of a R/W operation, do not + // propagate events to users. Also, filter 'late' events + // which are no longer valid. + + case wxSOCKET_INPUT: + if (m_reading || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG)) + return; + break; + + case wxSOCKET_OUTPUT: + if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG)) + return; + break; + + case wxSOCKET_LOST: + m_connected = FALSE; + m_establishing = FALSE; + break; + + default: + break; } -} - -wxSocketEvent::wxSocketEvent(int id) - : wxEvent(id) -{ - wxEventType type = (wxEventType)wxEVT_SOCKET; - - SetEventType(type); -} -void wxSocketEvent::CopyObject(wxObject& obj_d) const -{ - wxSocketEvent *event = (wxSocketEvent *)&obj_d; + if (((m_neededreq & flag) == flag) && m_notify_state) + { + event.m_socket = this; + event.m_skevt = req_evt; - wxEvent::CopyObject(obj_d); + if (m_evt_handler) +#if USE_DELAYED_EVENTS + wxPostEvent(m_evt_handler, event); +#else + ProcessEvent(event); +#endif - event->m_skevt = m_skevt; - event->m_socket = m_socket; + OldOnNotify(req_evt); + if (m_cbk) + m_cbk(*this, req_evt, m_cdata); + } } -void wxSocketBase::OldOnNotify(wxRequestEvent evt) +void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt)) { } -// -------------------------------------------------------------- -// --------- wxSocketBase functions [Callback, CallbackData] ---- -// -------------------------------------------------------------- - void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id) { - SetNextHandler(&h_evt); + m_evt_handler = &h_evt; m_id = id; + + SetNextHandler(&h_evt); } -// -------------------------------------------------------------- -// --------- wxSocketBase pushback library ---------------------- -// -------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Pushback buffer +// -------------------------------------------------------------------------- -void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size) +void wxSocketBase::Pushback(const char *buffer, wxUint32 size) { - char *curr_pos; + if (!size) return; - if (m_unread != NULL) - m_unread = (char *) realloc(m_unread, m_unrd_size+size); + if (m_unread == NULL) + m_unread = (char *)malloc(size); else - m_unread = (char *) malloc(size); - curr_pos = m_unread + m_unrd_size; - - memcpy(curr_pos, buffer, size); - m_unrd_size += size; -} - -void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size) -{ - char *curr_pos, *new_buf; - - new_buf = (char *) malloc(m_unrd_size+size); - curr_pos = new_buf + size; + { + char *tmp; - memcpy(new_buf, buffer, size); - if (m_unrd_size != 0) { - 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); + + m_unread = tmp; } - m_unread = new_buf; + m_unrd_size += size; + + memcpy(m_unread, buffer, size); } -size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek) +wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek) { if (!m_unrd_size) return 0; - if (size > m_unrd_size) - size = m_unrd_size; - memcpy(buffer, m_unread, size); + if (size > (m_unrd_size-m_unrd_cur)) + size = m_unrd_size-m_unrd_cur; + + memcpy(buffer, (m_unread+m_unrd_cur), size); - if (!peek) { - m_unrd_size -= size; - if (m_unrd_size == 0) { + 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; } } return size; } -// -------------------------------------------------------------- -// --------- wxSocketBase buffer core requester ----------------- -// -------------------------------------------------------------- - -void wxSocketBase::WantBuffer(char *buffer, size_t nbytes, - wxRequestEvent evt) -{ - bool buf_timed_out; - - if (m_fd == INVALID_SOCKET || !m_handler || !m_connected) - return; - - SockRequest *buf = new SockRequest; - - SaveState(); - m_internal->StopWaiter(); - buf->buffer = buffer; - buf->size = nbytes; - buf->done = FALSE; - buf->type = EventToNotify(evt); - buf->io_nbytes = 0; - buf->error = 0; - buf->wait = TRUE; - buf->timeout = 1000; - buf_timed_out = FALSE; - - if ((m_flags & SPEED) != 0) - m_internal->QueueRequest(buf, FALSE); - else - if ((m_flags & NOWAIT) != 0) - m_internal->QueueRequest(buf, TRUE); - else - m_internal->QueueRequest(buf, TRUE); - m_lcount += buf->io_nbytes; - if (buf_timed_out) - m_error = ETIMEDOUT; - else - m_error = buf->error; - - delete buf; - RestoreState(); -} - -// -------------------------------------------------------------- +// ========================================================================== // wxSocketServer -// -------------------------------------------------------------- +// ========================================================================== + +// -------------------------------------------------------------------------- +// Ctor +// -------------------------------------------------------------------------- wxSocketServer::wxSocketServer(wxSockAddress& addr_man, - wxSockFlags flags) : - wxSocketBase(flags, SOCK_SERVER) + wxSockFlags flags) + : wxSocketBase(flags, SOCK_SERVER) { - m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0); - - if (m_fd == INVALID_SOCKET) - return; - - int flag = 1; - setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int)); + // Create the socket + m_socket = GSocket_new(); - struct sockaddr *myaddr; - size_t len; - - addr_man.Build(myaddr, len); - if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0) + if (!m_socket) return; - if (listen(m_fd, 5) < 0) { - m_fd = INVALID_SOCKET; + // Setup the socket as server + GSocket_SetLocal(m_socket, addr_man.GetAddress()); + if (GSocket_SetServer(m_socket) != GSOCK_NOERROR) + { + GSocket_destroy(m_socket); + m_socket = NULL; return; } - m_internal->SetFD(m_fd); + 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); - Notify(TRUE); } -// -------------------------------------------------------------- -// wxSocketServer Accept -// -------------------------------------------------------------- +// -------------------------------------------------------------------------- +// Accept +// -------------------------------------------------------------------------- -bool wxSocketServer::AcceptWith(wxSocketBase& sock) +bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait) { - int fd2; + GSocket *child_socket; - m_internal->AcquireFD(); - if ((fd2 = accept(m_fd, 0, 0)) < 0) { - m_internal->ReleaseFD(); + if (!m_socket) return FALSE; - } - m_internal->ReleaseFD(); - struct linger linger; - linger.l_onoff = 0; - linger.l_linger = 1; + // 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); + + child_socket = GSocket_WaitConnection(m_socket); - setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); + if (!wait) + GSocket_SetNonBlocking(m_socket, FALSE); - int flag = 0; - setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int)); + if (!child_socket) + return FALSE; sock.m_type = SOCK_INTERNAL; - sock.m_fd = fd2; + sock.m_socket = child_socket; sock.m_connected = TRUE; - sock.m_internal->SetFD(fd2); - - sock.m_internal->ResumeWaiter(); + 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; } -wxSocketBase *wxSocketServer::Accept() +wxSocketBase *wxSocketServer::Accept(bool wait) { wxSocketBase* sock = new wxSocketBase(); sock->SetFlags((wxSockFlags)m_flags); - if (!AcceptWith(*sock)) + if (!AcceptWith(*sock, wait)) return NULL; - if (m_handler) - m_handler->Register(sock); - return sock; } -// -------------------------------------------------------------- +bool wxSocketServer::WaitForAccept(long seconds, long milliseconds) +{ + return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); +} + +// ========================================================================== // wxSocketClient -// -------------------------------------------------------------- +// ========================================================================== + +// -------------------------------------------------------------------------- +// Ctor and dtor +// -------------------------------------------------------------------------- -// --------- wxSocketClient CONSTRUCTOR ------------------------- -// -------------------------------------------------------------- -wxSocketClient::wxSocketClient(wxSockFlags _flags) : - wxSocketBase(_flags, SOCK_CLIENT) +wxSocketClient::wxSocketClient(wxSockFlags _flags) + : wxSocketBase(_flags, SOCK_CLIENT) { } -// -------------------------------------------------------------- -// --------- wxSocketClient DESTRUCTOR -------------------------- -// -------------------------------------------------------------- +// XXX: What is this for ? wxSocketClient::~wxSocketClient() { } -// -------------------------------------------------------------- -// --------- wxSocketClient Connect functions ------------------- -// -------------------------------------------------------------- -bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) ) +// -------------------------------------------------------------------------- +// Connect +// -------------------------------------------------------------------------- + +bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait) { - struct linger linger; + GSocketError err; - if (IsConnected()) + if (m_socket) + { + // Shutdown and destroy the socket Close(); + GSocket_destroy(m_socket); + } - // Initializes all socket stuff ... - // -------------------------------- - m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0); - - if (m_fd < 0) - return FALSE; - + m_socket = GSocket_new(); m_connected = FALSE; + m_establishing = FALSE; - linger.l_onoff = 1; - linger.l_linger = 5; - setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); + if (!m_socket) + return FALSE; - // Stay in touch with the state of things... + GSocket_SetTimeout(m_socket, m_timeout * 1000); + GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, + wx_socket_callback, (char *)this); - unsigned long flag = 1; - setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int)); + // If wait == FALSE, then the call should be nonblocking. + // When we are finished, we put the socket to blocking mode + // again. - // Disable the nagle algorithm, which delays sends till the - // buffer is full (or a certain time period has passed?)... + if (!wait) + GSocket_SetNonBlocking(m_socket, TRUE); -#if defined(__WINDOWS__) || (defined(IPPROTO_TCP) && defined(TCP_NODELAY)) - flag = 1; - setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int)); -#endif + GSocket_SetPeer(m_socket, addr_man.GetAddress()); + err = GSocket_Connect(m_socket, GSOCK_STREAMED); - struct sockaddr *remote; - size_t len; + if (!wait) + GSocket_SetNonBlocking(m_socket, FALSE); - addr_man.Build(remote, len); + if (err != GSOCK_NOERROR) + { + if (err == GSOCK_WOULDBLOCK) + m_establishing = TRUE; - if (connect(m_fd, remote, len) != 0) return FALSE; - - m_internal->SetFD(m_fd); - - // Enables bg events. - // ------------------ - Notify(TRUE); + } m_connected = TRUE; return TRUE; } -bool wxSocketClient::WaitOnConnect(long seconds, long microseconds) +bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds) { - int ret = _Wait(seconds, microseconds, REQ_CONNECT | REQ_LOST); - - if (ret) - m_connected = TRUE; + if (m_connected) // Already connected + return TRUE; - return m_connected; -} + if (!m_establishing || !m_socket) // No connection in progress + return FALSE; -void wxSocketClient::OnRequest(wxRequestEvent evt) -{ - if (evt == EVT_CONNECT) - { - if (m_connected) - { - m_neededreq &= ~REQ_CONNECT; - return; - } - m_connected = TRUE; - return; - } - wxSocketBase::OnRequest(evt); + return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); } -///////////////////////////////////////////////////////////////// -// wxSocketHandler /////////////////////////////////////////////// -///////////////////////////////////////////////////////////////// +// ========================================================================== +// wxDatagramSocket +// ========================================================================== -wxSocketHandler *wxSocketHandler::master = NULL; -#if defined(__WINDOWS__) -static int win_initialized = 0; -#endif +/* NOTE: experimental stuff - might change */ -// -------------------------------------------------------------- -// --------- wxSocketHandler CONSTRUCTOR ------------------------ -// -------------------------------------------------------------- -wxSocketHandler::wxSocketHandler() +wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr, wxSockFlags flags ) + : wxSocketBase( flags, SOCK_DATAGRAM ) { -#if defined(__WINDOWS__) - if (!win_initialized) - { - WSADATA wsaData; - - WSAStartup((1 << 8) | 1, &wsaData); - win_initialized = 1; - } -#endif - - socks = new wxList; + // Create the socket + m_socket = GSocket_new(); -#ifndef __WINDOWS__ - signal(SIGPIPE, SIG_IGN); -#endif -} - -// -------------------------------------------------------------- -// --------- wxSocketHandler DESTRUCTOR ------------------------- -// -------------------------------------------------------------- -wxSocketHandler::~wxSocketHandler() -{ - wxNode *next_node, *node = socks->First(); + if(!m_socket) + return; - while (node) + // Setup the socket as non connection oriented + GSocket_SetLocal(m_socket, addr.GetAddress()); + if( GSocket_SetNonOriented(m_socket) != GSOCK_NOERROR ) { - wxSocketBase* sock = (wxSocketBase*)node->Data(); - - delete sock; - next_node = node->Next(); - delete node; - node = next_node; + GSocket_destroy(m_socket); + m_socket = NULL; + return; } - delete socks; + // 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 ); -#ifdef __WINDOWS__ - WSACleanup(); - win_initialized = 0; -#endif } -// -------------------------------------------------------------- -// --------- wxSocketHandler registering functions -------------- -// -------------------------------------------------------------- - -void wxSocketHandler::Register(wxSocketBase* sock) +wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr, + char* buf, + wxUint32 nBytes ) { - 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); - } + Read(buf, nBytes); + GetPeer(addr); + return (*this); } -void wxSocketHandler::UnRegister(wxSocketBase* sock) +wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr, + const char* buf, + wxUint32 nBytes ) { - wxNode *node; - - for (node = socks->First(); node; node = node->Next()) - { - wxSocketBase* s = (wxSocketBase*)node->Data(); - - if (s == sock) - { - delete node; - sock->SetHandler(NULL); - return; - } - } + GSocket_SetPeer(m_socket, addr.GetAddress()); + Write(buf, nBytes); + return (*this); } -unsigned long wxSocketHandler::Count() const -{ - return socks->Number(); -} +// ========================================================================== +// wxSocketEvent +// ========================================================================== -// -------------------------------------------------------------- -// --------- wxSocketHandler "big" wait functions --------------- -// -------------------------------------------------------------- +// XXX: Should be moved to event.cpp ? -int wxSocketHandler::Wait(long seconds, long microseconds) +wxSocketEvent::wxSocketEvent(int id) + : wxEvent(id) { - // TODO Needs the completely asynchronous notifier. - - /* - int i; - int on_wait; - 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; + wxEventType type = (wxEventType)wxEVT_SOCKET; - return on_wait; - */ - return 0; + SetEventType(type); } -void wxSocketHandler::YieldSock() +void wxSocketEvent::CopyObject(wxObject& obj_d) const { - wxNode *node; - - // Nothing to do anymore here except waiting for the queue emptying. - for (node = socks->First(); node; node=node->Next()) { - wxSocketBase *sock = (wxSocketBase *)node->Data(); - - sock->m_internal->WaitForEnd(NULL); - } -} + wxSocketEvent *event = (wxSocketEvent *)&obj_d; -// -------------------------------------------------------------- -// --------- wxSocketHandler: create and register the socket ---- -// -------------------------------------------------------------- -wxSocketServer *wxSocketHandler::CreateServer(wxSockAddress& addr, - wxSocketBase::wxSockFlags flags) -{ - wxSocketServer *serv = new wxSocketServer(addr, flags); + wxEvent::CopyObject(obj_d); - Register(serv); - return serv; + event->m_skevt = m_skevt; + event->m_socket = m_socket; } -wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags) -{ - wxSocketClient *client = new wxSocketClient(flags); - - Register(client); - return client; -} +// ========================================================================== +// wxSocketModule +// ========================================================================== -bool wxSocketModule::OnInit() +class WXDLLEXPORT wxSocketModule: public wxModule { - wxSocketHandler::master = new wxSocketHandler(); - return TRUE; -} + DECLARE_DYNAMIC_CLASS(wxSocketModule) -void wxSocketModule::OnExit() -{ - delete wxSocketHandler::master; - wxSocketHandler::master = NULL; -} +public: + bool OnInit() { return GSocket_Init(); } + void OnExit() { GSocket_Cleanup(); } +}; -#endif - // __WXSTUBS__ +IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule) #endif // wxUSE_SOCKETS