-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
// Name: socket.cpp
// Purpose: Socket handler classes
-// Authors: Guilhem Lavaux (completely rewritten from a basic API of Andrew
-// Davidson(1995) in wxWeb)
+// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia
// Created: April 1997
-// Updated: March 1998
-// Copyright: (C) 1998, 1997, Guilhem Lavaux
+// Copyright: (C) 1999-1997, Guilhem Lavaux
+// (C) 2000-1999, Guillermo Rodriguez Garcia
// RCS_ID: $Id$
// License: see wxWindows license
-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+// ==========================================================================
+// Declarations
+// ==========================================================================
+
#ifdef __GNUG__
#pragma implementation "socket.h"
-// #pragma interface
-// #pragma implementation "socket.cpp"
#endif
// For compilers that support precompilation, includes "wx.h".
#pragma hdrstop
#endif
-/////////////////////////////////////////////////////////////////////////////
-// wxWindows headers
-/////////////////////////////////////////////////////////////////////////////
-#include <wx/defs.h>
-#include <wx/object.h>
-#include <wx/string.h>
-#include <wx/timer.h>
-#include <wx/utils.h>
-
-// Not enough OS behaviour defined for wxStubs
-#ifndef __WXSTUBS__
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// System specific headers
-/////////////////////////////////////////////////////////////////////////////
-#if defined(__WINDOWS__)
-#include <winsock.h>
-#endif // __WINDOWS__
-
-#if defined(__UNIX__)
-
-#ifdef VMS
-#include <socket.h>
-#else
-#include <sys/socket.h>
-#endif
-#include <sys/ioctl.h>
-
-#include <sys/time.h>
-#include <unistd.h>
+#if wxUSE_SOCKETS
-#ifdef sun
-#include <sys/filio.h>
-#endif
-
-#endif // __UNIX__
-
-#include <signal.h>
-#include <errno.h>
-
-#ifdef _MSC_VER
-#include <io.h>
-#endif
-
-#if defined(__WXMOTIF__) || defined(__WXXT__)
-#include <X11/Intrinsic.h>
-
-/////////////////////////////
-// Needs internal variables
-/////////////////////////////
-#ifdef __WXXT__
-#define Uses_XtIntrinsic
-#endif
-
-#endif
+#include "wx/app.h"
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/timer.h"
+#include "wx/utils.h"
+#include "wx/module.h"
+#include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/event.h"
-#if defined(__WXGTK__)
-#include <gtk/gtk.h>
-#endif
+#if wxUSE_GUI
+ #include "wx/gdicmn.h" // for wxPendingDelete
+#endif // wxUSE_GUI
-/////////////////////////////////////////////////////////////////////////////
-// wxSocket headers
-/////////////////////////////////////////////////////////////////////////////
-#include "wx/module.h"
-#define WXSOCK_INTERNAL
#include "wx/sckaddr.h"
#include "wx/socket.h"
-/////////////////////////////////////////////////////////////////////////////
-// Some patch ///// BEGIN
-/////////////////////////////////////////////////////////////////////////////
-#ifdef __WINDOWS__
-#define close closesocket
-#define ioctl ioctlsocket
-#ifdef errno
-#undef errno
-#endif
-#define errno WSAGetLastError()
-#ifdef EWOULDBLOCK
-#undef EWOULDBLOCK
-#endif
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define ETIMEDOUT WSAETIMEDOUT
-#undef EINTR
-#define EINTR WSAEINTR
-#endif
-
-#ifndef __WINDOWS__
-#define INVALID_SOCKET -1
-#endif
-
-#ifdef __WXMOTIF__
-#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
-#endif
-
-#ifdef __WINDOWS__
-// This is an MS TCP/IP routine and is not needed here. Some WinSock
-// implementations (such as PC-NFS) will require you to include this
-// or a similar routine (see appendix in WinSock doc or help file).
-
-#if defined( NEED_WSAFDIsSet ) || defined( _MSC_VER )
-int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
-{
- int i = set->fd_count;
-
- while (i--)
- {
- if (set->fd_array[i] == fd)
- return 1;
- }
-
- return 0;
-}
-#endif
-#endif
-
-#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() wxYield()
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Some patch ///// END
-/////////////////////////////////////////////////////////////////////////////
-
-// --------------------------------------------------------------
-// Module
-// --------------------------------------------------------------
-class wxSocketModule: public wxModule
-{
- DECLARE_DYNAMIC_CLASS(wxSocketModule)
-public:
- wxSocketModule() {}
- bool OnInit();
- void OnExit();
-};
+// --------------------------------------------------------------------------
+// macros and constants
+// --------------------------------------------------------------------------
+
+// discard buffer
+#define MAX_DISCARD_SIZE (10 * 1024)
+
+// what to do within waits: in wxBase we don't do anything as we don't have
+// the event loop anyhow (for now). In GUI apps we have 2 cases: from the main
+// thread itself we have to call wxYield() to let the events (including the
+// GUI events and the low-level (not wxWindows) events from GSocket) be
+// processed. From another thread it is enough to just call wxThread::Yield()
+// which will give away the rest of our time slice: the explanation is that
+// the events will be processed by the main thread anyhow, without calling
+// wxYield(), but we don't want to eat the CPU time uselessly while sitting
+// in the loop waiting for the data
+#if wxUSE_GUI
+ #if wxUSE_THREADS
+ #define PROCESS_EVENTS() \
+ { \
+ if ( wxThread::IsMain() ) \
+ wxYield(); \
+ else \
+ wxThread::Yield(); \
+ }
+ #else // !wxUSE_THREADS
+ #define PROCESS_EVENTS() wxYield()
+ #endif // wxUSE_THREADS/!wxUSE_THREADS
+#else // !wxUSE_GUI
+ #define PROCESS_EVENTS()
+#endif // wxUSE_GUI/!wxUSE_GUI
+
+// --------------------------------------------------------------------------
+// wxWin macros
+// --------------------------------------------------------------------------
-// --------------------------------------------------------------
-// ClassInfos
-// --------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxSocketBase, wxObject)
IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketHandler, wxObject)
+IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase)
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
-#endif
-class wxSockWakeUp : public wxTimer
+// --------------------------------------------------------------------------
+// private classes
+// --------------------------------------------------------------------------
+
+class wxSocketState : public wxObject
{
public:
- int *my_id;
- int n_val;
- wxSocketBase *sock;
+ wxSocketFlags m_flags;
+ wxSocketEventFlags m_eventmask;
+ bool m_notify;
+ void *m_clientData;
+#if WXWIN_COMPATIBILITY
+ wxSocketBase::wxSockCbk m_cbk;
+ char *m_cdata;
+#endif // WXWIN_COMPATIBILITY
- 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);
- }
+public:
+ wxSocketState() : wxObject() {}
};
-/// Socket request
-class SockRequest : public wxObject
+// ==========================================================================
+// wxSocketBase
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------
+
+void wxSocketBase::Init()
{
-public:
- char *buffer;
- size_t size, nbytes;
- bool done;
- int error;
- wxSockWakeUp *auto_wakeup;
- wxSocketBase::wxRequestNotify type;
-};
+ m_socket = NULL;
+ m_type = wxSOCKET_UNINIT;
+ // state
+ m_flags = 0;
+ m_connected =
+ m_establishing =
+ m_reading =
+ m_writing =
+ m_error = FALSE;
+ m_lcount = 0;
+ m_timeout = 600;
+ m_beingDeleted = FALSE;
-/////////////////////////////////////////////////////////////////////////////
-// Some internal define
-/////////////////////////////////////////////////////////////////////////////
+ // pushback buffer
+ m_unread = NULL;
+ m_unrd_size = 0;
+ m_unrd_cur = 0;
-// --------------------------------------------------------------
-// --------- 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(1), m_wantbuf(0)
+ // events
+ m_id = -1;
+ m_handler = NULL;
+ m_clientData = NULL;
+ m_notify = FALSE;
+ m_eventmask = 0;
+#if WXWIN_COMPATIBILITY
+ m_cbk = NULL;
+ m_cdata = NULL;
+#endif // WXWIN_COMPATIBILITY
+}
+
+wxSocketBase::wxSocketBase()
{
- 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
+ Init();
}
-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(1), m_wantbuf(0)
+wxSocketBase::wxSocketBase(wxSocketFlags flags, wxSocketType type)
{
- 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
+ Init();
+
+ m_flags = flags;
+ m_type = type;
}
-// --------------------------------------------------------------
-// --------- wxSocketBase CONSTRUCTOR ---------------------------
-// --------------------------------------------------------------
wxSocketBase::~wxSocketBase()
{
- DestroyCallbacks();
- Close();
+ // Just in case the app called Destroy() *and* then deleted
+ // the socket immediately: don't leave dangling pointers.
+#if wxUSE_GUI
+ wxPendingDelete.DeleteObject(this);
+#endif
+
+ // Shutdown and close the socket
+ if (!m_beingDeleted)
+ Close();
+
+ // Destroy the GSocket object
+ if (m_socket)
+ GSocket_destroy(m_socket);
+ // Free the pushback buffer
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;
}
-bool wxSocketBase::Close()
+bool wxSocketBase::Destroy()
{
- if (m_fd != INVALID_SOCKET) {
- for (int i=0;i<3;i++) {
- wxNode *n, *node = req_list[i].First();
+ // Delayed destruction: the socket will be deleted during the next
+ // idle loop iteration. This ensures that all pending events have
+ // been processed.
+ m_beingDeleted = TRUE;
- while (node) {
- SockRequest *req = (SockRequest *)node->Data();
- req->done = TRUE;
+ // Shutdown and close the socket
+ Close();
- n = node->Next();
- delete node;
- node = n;
- }
- }
+ // Supress events from now on
+ Notify(FALSE);
- DestroyCallbacks();
- shutdown(m_fd, 2);
- close(m_fd);
- m_fd = INVALID_SOCKET;
- m_connected = FALSE;
- }
+#if wxUSE_GUI
+ if ( !wxPendingDelete.Member(this) )
+ wxPendingDelete.Append(this);
+#else
+ delete this;
+#endif
return TRUE;
}
-// --------------------------------------------------------------
-// --------- wxSocketBase base IO functions ---------------------
-// --------------------------------------------------------------
-wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
+// --------------------------------------------------------------------------
+// Basic IO calls
+// --------------------------------------------------------------------------
+
+// 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?
+
+bool wxSocketBase::Close()
{
- m_lcount = GetPushback(buffer, nbytes, FALSE);
+ // Interrupt pending waits
+ InterruptWait();
- // 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;
+ if (m_socket)
+ {
+ // Disable callbacks
+ GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+ GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
- WantBuffer(buffer, nbytes, EVT_READ);
+ // Shutdown the connection
+ GSocket_Shutdown(m_socket);
+ }
- return *this;
+ m_connected = FALSE;
+ m_establishing = FALSE;
+ return TRUE;
}
-wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)
{
- size_t nbytes_old = nbytes;
+ // Mask read events
+ m_reading = TRUE;
- nbytes -= GetPushback(buffer, nbytes, TRUE);
- if (!nbytes) {
- m_lcount = nbytes_old;
- return *this;
- }
+ m_lcount = _Read(buffer, nbytes);
- WantBuffer(buffer, nbytes, EVT_PEEK);
+ // 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);
- return *this;
-}
+ // Allow read events from now on
+ m_reading = FALSE;
-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;
-
- Read((char *)&msg, sizeof(msg));
- if (m_lcount != sizeof(msg))
- return *this;
-
- sig = msg.sig[0] & 0xff;
- sig |= (size_t)(msg.sig[1] & 0xff) << 8;
- sig |= (size_t)(msg.sig[2] & 0xff) << 16;
- sig |= (size_t)(msg.sig[3] & 0xff) << 24;
+wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
+{
+ int total;
+ int ret = 1;
+
+ // Try the pushback buffer first
+ total = GetPushback(buffer, nbytes, FALSE);
+ nbytes -= total;
+ buffer = (char *)buffer + total;
+
+ // Return now in one of the following cases:
+ // - the socket is invalid,
+ // - we got all the data,
+ // - we got *some* data and we are not using wxSOCKET_WAITALL.
+ if ( !m_socket ||
+ !nbytes ||
+ ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )
+ return total;
+
+ // Possible combinations (they are checked in this order)
+ // wxSOCKET_NOWAIT
+ // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)
+ // wxSOCKET_BLOCK
+ // wxSOCKET_NONE
+ //
+ if (m_flags & wxSOCKET_NOWAIT)
+ {
+ GSocket_SetNonBlocking(m_socket, 1);
+ ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
+ GSocket_SetNonBlocking(m_socket, 0);
- if (sig != 0xfeeddead)
- return *this;
- len = msg.len[0] & 0xff;
- len |= (size_t)(msg.len[1] & 0xff) << 8;
- len |= (size_t)(msg.len[2] & 0xff) << 16;
- len |= (size_t)(msg.len[3] & 0xff) << 24;
- len2 = len;
- if (len > nbytes)
- len = nbytes;
+ if (ret > 0)
+ total += ret;
+ }
else
- len2 = 0;
+ {
+ bool more = TRUE;
- if (Read(buffer, len).LastCount() != len)
- return *this;
- if (len2 && (Read(NULL, len2).LastCount() != len2))
- return *this;
- if (Read((char *)&msg, sizeof(msg)).LastCount() != sizeof(msg))
- return *this;
-
- sig = msg.sig[0] & 0xff;
- sig |= (size_t)(msg.sig[1] & 0xff) << 8;
- sig |= (size_t)(msg.sig[2] & 0xff) << 16;
- sig |= (size_t)(msg.sig[3] & 0xff) << 24;
-// ERROR
- if (sig != 0xdeadfeed)
- return *this;
+ while (more)
+ {
+ if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForRead() )
+ break;
- return *this;
-}
+ ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
-wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
-{
- SockMsg msg;
-
- msg.sig[0] = (char) 0xad;
- msg.sig[1] = (char) 0xde;
- msg.sig[2] = (char) 0xed;
- msg.sig[3] = (char) 0xfe;
-
- msg.len[0] = (char) nbytes & 0xff;
- msg.len[1] = (char) (nbytes >> 8) & 0xff;
- msg.len[2] = (char) (nbytes >> 16) & 0xff;
- msg.len[3] = (char) (nbytes >> 24) & 0xff;
-
- if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
- return *this;
- if (Write(buffer, nbytes).LastCount() < nbytes)
- return *this;
-
- msg.sig[0] = (char) 0xed;
- msg.sig[1] = (char) 0xfe;
- msg.sig[2] = (char) 0xad;
- msg.sig[3] = (char) 0xde;
- msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;
- Write((char *)&msg, sizeof(msg));
+ if (ret > 0)
+ {
+ total += ret;
+ nbytes -= ret;
+ buffer = (char *)buffer + ret;
+ }
- return *this;
-}
+ // If we got here and wxSOCKET_WAITALL is not set, we can leave
+ // now. Otherwise, wait until we recv all the data or until there
+ // is an error.
+ //
+ more = (ret > 0 && nbytes > 0 && (m_flags & wxSOCKET_WAITALL));
+ }
+ }
-wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
-{
- CreatePushbackAfter(buffer, nbytes);
- return *this;
+ return total;
}
-bool wxSocketBase::IsData() const
+wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
{
- struct timeval tv;
- fd_set sock_set;
+ wxUint32 len, len2, sig, total;
+ bool error;
+ int old_flags;
+ struct
+ {
+ unsigned char sig[4];
+ unsigned char len[4];
+ } msg;
- if (m_fd < 0)
- return FALSE;
- if (m_unrd_size > 0)
- return TRUE;
+ // Mask read events
+ m_reading = 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);
-}
+ total = 0;
+ error = TRUE;
+ old_flags = m_flags;
+ SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
-// ---------------------------------------------------------------------
-// --------- wxSocketBase Discard(): deletes all byte in the input queue
-// ---------------------------------------------------------------------
-void wxSocketBase::Discard()
-{
-#define MAX_BUFSIZE (10*1024)
- char *my_data = new char[MAX_BUFSIZE];
- size_t recv_size = MAX_BUFSIZE;
+ if (_Read(&msg, sizeof(msg)) != sizeof(msg))
+ goto exit;
- SaveState();
- SetFlags((wxSockFlags)(NOWAIT | SPEED));
+ sig = (wxUint32)msg.sig[0];
+ sig |= (wxUint32)(msg.sig[1] << 8);
+ sig |= (wxUint32)(msg.sig[2] << 16);
+ sig |= (wxUint32)(msg.sig[3] << 24);
- while (recv_size == MAX_BUFSIZE) {
- recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
+ if (sig != 0xfeeddead)
+ {
+ wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
+ goto exit;
}
- RestoreState();
- delete [] my_data;
+ len = (wxUint32)msg.len[0];
+ len |= (wxUint32)(msg.len[1] << 8);
+ len |= (wxUint32)(msg.len[2] << 16);
+ len |= (wxUint32)(msg.len[3] << 24);
-#undef MAX_BUFSIZE
-}
+ if (len > nbytes)
+ {
+ len2 = len - nbytes;
+ len = nbytes;
+ }
+ else
+ len2 = 0;
-// --------------------------------------------------------------
-// --------- wxSocketBase socket info functions -----------------
-// --------------------------------------------------------------
-bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
-{
- struct sockaddr my_addr;
- uint len_addr = sizeof(my_addr);
+ // Don't attemp to read if the msg was zero bytes long.
+ if (len)
+ {
+ total = _Read(buffer, len);
- if (m_fd < 0)
- return FALSE;
+ if (total != len)
+ goto exit;
+ }
+ if (len2)
+ {
+ char *discard_buffer = new char[MAX_DISCARD_SIZE];
+ long discard_len;
- if (getpeername(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)
- return FALSE;
+ // 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);
- addr_man.Disassemble(&my_addr, len_addr);
- return TRUE;
-}
+ delete [] discard_buffer;
-bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
-{
- struct sockaddr my_addr;
- uint len_addr = sizeof(my_addr);
+ if (len2 != 0)
+ goto exit;
+ }
+ if (_Read(&msg, sizeof(msg)) != sizeof(msg))
+ goto exit;
- if (m_fd < 0)
- return FALSE;
+ sig = (wxUint32)msg.sig[0];
+ sig |= (wxUint32)(msg.sig[1] << 8);
+ sig |= (wxUint32)(msg.sig[2] << 16);
+ sig |= (wxUint32)(msg.sig[3] << 24);
- if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)
+ if (sig != 0xdeadfeed)
+ {
+ wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
+ goto exit;
+ }
- return FALSE;
+ // everything was OK
+ error = FALSE;
- addr_man.Disassemble(&my_addr, len_addr);
- return TRUE;
-}
+exit:
+ m_error = error;
+ m_lcount = total;
+ m_reading = FALSE;
+ SetFlags(old_flags);
-// --------------------------------------------------------------
-// --------- wxSocketBase wait functions ------------------------
-// --------------------------------------------------------------
+ return *this;
+}
-void wxSocketBase::SaveState()
+wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
{
- wxSockState *state = new wxSockState;
+ // Mask read events
+ m_reading = TRUE;
- state->cbk_on = m_cbkon;
- state->cbk_set= m_neededreq;
- state->cbk = m_cbk;
- state->cdata = m_cdata;
- state->flags = m_flags;
- state->notif = m_notifyme;
+ m_lcount = _Read(buffer, nbytes);
+ Pushback(buffer, m_lcount);
- m_states.Append(state);
+ // 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;
}
-void wxSocketBase::RestoreState()
+wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)
{
- wxNode *node;
+ // Mask write events
+ m_writing = TRUE;
- node = m_states.Last();
- if (!node)
- return;
-
- wxSockState *state = (wxSockState *)node->Data();
+ m_lcount = _Write(buffer, nbytes);
- SetFlags(state->flags);
- m_neededreq = state->cbk_set;
- m_cbk = state->cbk;
- m_cdata = state->cdata;
- m_notifyme = state->notif;
- if (state->cbk_on)
- SetupCallbacks();
+ // If in wxSOCKET_WAITALL mode, all bytes should have been written.
+ if (m_flags & wxSOCKET_WAITALL)
+ m_error = (m_lcount != nbytes);
else
- DestroyCallbacks();
+ m_error = (m_lcount == 0);
- delete node;
- delete state;
-}
+ // Allow write events again
+ m_writing = FALSE;
-// --------------------------------------------------------------
-// --------- wxSocketBase wait functions ------------------------
-// --------------------------------------------------------------
+ return *this;
+}
-bool wxSocketBase::_Wait(long seconds, long microseconds, int type)
+wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
{
- if ((!m_connected && !m_connecting) || m_fd < 0)
- return FALSE;
+ wxUint32 total = 0;
+ int ret = 1;
- wxSockWakeUp wakeup(this, &m_waitflags, 0);
+ // If the socket is invalid or parameters are ill, return immediately
+ if (!m_socket || !buffer || !nbytes)
+ return 0;
- SaveState();
- SetNotify((wxRequestNotify)type);
- SetupCallbacks();
+ // Possible combinations (they are checked in this order)
+ // wxSOCKET_NOWAIT
+ // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)
+ // wxSOCKET_BLOCK
+ // wxSOCKET_NONE
+ //
+ if (m_flags & wxSOCKET_NOWAIT)
+ {
+ GSocket_SetNonBlocking(m_socket, 1);
+ ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
+ GSocket_SetNonBlocking(m_socket, 0);
- if (seconds != -1)
- wakeup.Start((int)(seconds*1000 + (microseconds / 1000)), TRUE);
+ if (ret > 0)
+ total = ret;
+ }
+ else
+ {
+ bool more = TRUE;
- m_waitflags = 0x80 | type;
- while (m_waitflags & 0x80)
- PROCESS_EVENTS();
+ while (more)
+ {
+ if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
+ break;
- RestoreState();
+ ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
- if (m_waitflags & 0x40) {
- m_waitflags = 0;
- return TRUE;
+ if (ret > 0)
+ {
+ total += ret;
+ nbytes -= ret;
+ buffer = (const char *)buffer + ret;
+ }
+
+ // If we got here and wxSOCKET_WAITALL is not set, we can leave
+ // now. Otherwise, wait until we send all the data or until there
+ // is an error.
+ //
+ more = (ret > 0 && nbytes > 0 && (m_flags & wxSOCKET_WAITALL));
+ }
}
- m_waitflags = 0;
- return FALSE;
+ return total;
}
-bool wxSocketBase::Wait(long seconds, long microseconds)
+wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
{
- return _Wait(seconds, microseconds, REQ_ACCEPT | REQ_CONNECT |
- REQ_READ | REQ_WRITE | REQ_LOST);
-}
+ wxUint32 total;
+ bool error;
+ int old_flags;
+ struct
+ {
+ unsigned char sig[4];
+ unsigned char len[4];
+ } msg;
-bool wxSocketBase::WaitForRead(long seconds, long microseconds)
-{
- return _Wait(seconds, microseconds, REQ_READ | REQ_LOST);
-}
+ // Mask write events
+ m_writing = TRUE;
-bool wxSocketBase::WaitForWrite(long seconds, long microseconds)
-{
- return _Wait(seconds, microseconds, REQ_WRITE);
-}
+ error = TRUE;
+ total = 0;
+ old_flags = m_flags;
+ SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
-bool wxSocketBase::WaitForLost(long seconds, long microseconds)
-{
- return _Wait(seconds, microseconds, REQ_LOST);
-}
+ msg.sig[0] = (unsigned char) 0xad;
+ msg.sig[1] = (unsigned char) 0xde;
+ msg.sig[2] = (unsigned char) 0xed;
+ msg.sig[3] = (unsigned char) 0xfe;
-// --------------------------------------------------------------
-// --------- wxSocketBase callback management -------------------
-// --------------------------------------------------------------
+ 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 defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
-#if defined(__WXMOTIF__) || defined(__WXXT__)
-static void wx_socket_read(XtPointer client, int *fid,
- XtInputId *WXUNUSED(id))
-#define fd *fid
-#else
-static void wx_socket_read(gpointer client, gint fd,
- GdkInputCondition WXUNUSED(cond))
-#define fd fd
-#endif
-{
- wxSocketBase *sock = (wxSocketBase *)client;
- char c;
- int i;
+ if (_Write(&msg, sizeof(msg)) < sizeof(msg))
+ goto exit;
- i = recv(fd, &c, 1, MSG_PEEK);
+ total = _Write(buffer, nbytes);
- if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) {
- sock->OnRequest(wxSocketBase::EVT_ACCEPT);
- return;
- }
+ if (total < nbytes)
+ goto exit;
- if (i != 0) {
- if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
- return;
+ 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;
- sock->OnRequest(wxSocketBase::EVT_READ);
- } else {
- if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) {
- sock->Close();
- return;
- }
+ if ((_Write(&msg, sizeof(msg))) < sizeof(msg))
+ goto exit;
- sock->OnRequest(wxSocketBase::EVT_LOST);
- }
-}
-#undef fd
+ // everything was OK
+ error = FALSE;
-#if defined(__WXMOTIF__) || defined(__WXXT__)
-static void wx_socket_write(XtPointer client, int *WXUNUSED(fid),
- XtInputId *WXUNUSED(id))
-#else
-static void wx_socket_write(gpointer client, gint WXUNUSED(fd),
- GdkInputCondition WXUNUSED(cond))
-#endif
-{
- wxSocketBase *sock = (wxSocketBase *)client;
+exit:
+ m_error = error;
+ m_lcount = total;
+ m_writing = FALSE;
- if (!sock->IsConnected())
- sock->OnRequest(wxSocketBase::EVT_CONNECT);
- else
- sock->OnRequest(wxSocketBase::EVT_WRITE);
+ return *this;
}
-#endif
-#ifdef wx_xview
-Notify_value wx_sock_read_xview (Notify_client client, int fd)
+wxSocketBase& wxSocketBase::Unread(const void *buffer, wxUint32 nbytes)
{
- wxSocketBase *sock = (wxSocketBase *)client;
- char c;
- int i;
+ if (nbytes != 0)
+ Pushback(buffer, nbytes);
- i = recv(fd, &c, 1, MSG_PEEK);
+ m_error = FALSE;
+ m_lcount = nbytes;
- if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) {
- sock->OnRequest(wxSocketBase::EVT_ACCEPT);
- return;
- }
-
- /* Bytes arrived */
- if (i != 0) {
- if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
- return (Notify_value) FALSE;
-
- sock->OnRequest(wxSocketBase::EVT_READ);
- } else {
- if (!(sock->NeededReq() & wxSocketBase::REQ_LOST))
- return;
-
- sock->OnRequest(wxSocketBase::EVT_LOST);
- }
-
- return (Notify_value) FALSE;
+ return *this;
}
-Notify_value wx_sock_write_xview (Notify_client client, int fd)
+wxSocketBase& wxSocketBase::Discard()
{
- wxSocketBase *sock = (wxSocketBase *)client;
+ int old_flags;
+ char *buffer = new char[MAX_DISCARD_SIZE];
+ wxUint32 ret;
+ wxUint32 total = 0;
- if (!sock->IsConnected())
- sock->OnRequest(wxSocketBase::EVT_CONNECT);
- else
- sock->OnRequest(wxSocketBase::EVT_WRITE);
+ // Mask read events
+ m_reading = TRUE;
- return (Notify_value) TRUE;
-}
-#endif
+ old_flags = m_flags;
+ SetFlags(wxSOCKET_NOWAIT);
-wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
-{
- switch (evt)
+ do
{
- 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;
+ ret = _Read(buffer, MAX_DISCARD_SIZE);
+ total += ret;
}
- return 0;
-}
+ while (ret == MAX_DISCARD_SIZE);
-void wxSocketBase::SetFlags(wxSockFlags _flags)
-{
- m_flags = _flags;
- if (_flags & SPEED)
- {
- unsigned long flag = 0;
- ioctl(m_fd, FIONBIO, &flag);
+ delete[] buffer;
+ m_lcount = total;
+ m_error = FALSE;
- // SPEED and WAITALL are antagonists.
- m_flags = (wxSockFlags)(m_flags & ~WAITALL);
+ // Allow read events again
+ m_reading = FALSE;
- Notify(FALSE);
- }
- else
- {
- unsigned long flag = 1;
- ioctl(m_fd, FIONBIO, &flag);
- }
+ return *this;
}
-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();
-*/
+// --------------------------------------------------------------------------
+// Wait functions
+// --------------------------------------------------------------------------
- if ((!m_cbkon) || (old_needed_req != flags))
- SetupCallbacks();
-}
+// 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.
-void wxSocketBase::SetupCallbacks()
+bool wxSocketBase::_Wait(long seconds,
+ long milliseconds,
+ wxSocketEventFlags flags)
{
- if (m_fd == INVALID_SOCKET || !m_handler || (m_flags & SPEED))
- return;
+ GSocketEventFlags result;
+ long timeout;
-#if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
- if (m_cbkon)
- DestroyCallbacks();
- if (m_neededreq & (REQ_ACCEPT | REQ_READ | REQ_LOST)) {
-#ifdef __WXGTK__
- m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_READ,
- wx_socket_read, (gpointer)this);
-#else
- m_internal->sock_inputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
- (XtPointer *) XtInputReadMask,
- (XtInputCallbackProc) wx_socket_read,
- (XtPointer) this);
-#endif
- }
- if (m_neededreq & (REQ_CONNECT | REQ_WRITE)) {
-#ifdef __WXGTK__
- m_internal->sock_outputid = gdk_input_add(m_fd, GDK_INPUT_WRITE,
- wx_socket_write, (gpointer)this);
-#else
- m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
- (XtPointer *) XtInputWriteMask,
- (XtInputCallbackProc) wx_socket_write,
- (XtPointer) this);
-#endif
- }
-#endif
-#ifdef __WINDOWS__
- WORD mask = 0;
-
- if (m_neededreq & REQ_READ)
- mask |= FD_READ;
- if (m_neededreq & REQ_WRITE)
- mask |= FD_WRITE;
- if (m_neededreq & REQ_LOST)
- mask |= FD_CLOSE;
- if (m_neededreq & REQ_ACCEPT)
- mask |= FD_ACCEPT;
- if (m_neededreq & REQ_CONNECT)
- mask |= FD_CONNECT;
-
- if (!m_internal->my_msg)
- m_internal->my_msg = m_handler->NewMessage(this);
- WSAAsyncSelect(m_fd, m_handler->GetHWND(), m_internal->my_msg, mask);
-#endif
- m_cbkon = TRUE;
- m_processing = FALSE;
-}
+ // Set this to TRUE to interrupt ongoing waits
+ m_interrupt = 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
-}
+ // Check for valid socket
+ if (!m_socket)
+ return FALSE;
-void wxSocketBase::Notify(bool notify)
-{
- if (m_notifyme == notify)
- return;
- if (notify)
- SetupCallbacks();
+ // Check for valid timeout value.
+ if (seconds != -1)
+ timeout = seconds * 1000 + milliseconds;
else
- DestroyCallbacks();
- m_notifyme = notify;
-}
-
-void wxSocketBase::OnRequest(wxRequestEvent req_evt)
-{
- wxRequestNotify req_notif = EventToNotify(req_evt);
+ timeout = m_timeout * 1000;
+
+ // Wait in an active polling loop.
+ //
+ // NOTE: We duplicate some of the code in OnRequest, but this doesn't
+ // hurt. It has to be here because the (GSocket) event might arrive
+ // a bit delayed, and it has to be in OnRequest as well because we
+ // don't know whether the Wait functions are being used.
+ //
+ // Do this at least once (important if timeout == 0, when
+ // we are just polling). Also, if just polling, do not yield.
+
+ wxStopWatch chrono;
+ bool done = FALSE;
+
+ while (!done)
+ {
+ result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);
- // Mask the current event
- SetNotify(m_neededreq & ~req_notif);
+ // Incoming connection (server) or connection established (client)
+ if (result & GSOCK_CONNECTION_FLAG)
+ {
+ m_connected = TRUE;
+ m_establishing = FALSE;
+ return TRUE;
+ }
- if (req_evt <= EVT_WRITE && DoRequests(req_evt))
- return;
+ // Data available or output buffer ready
+ if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
+ {
+ return TRUE;
+ }
- if (m_waitflags & 0xF0)
- {
- // Wake up
- if ((m_waitflags & 0x0F) == req_evt)
+ // Connection lost
+ if (result & GSOCK_LOST_FLAG)
{
- m_waitflags = 0x80;
-#ifndef __WXGTK__
- DestroyCallbacks(); // I disable it to prevent infinite loop on X11.
-#endif
+ m_connected = FALSE;
+ m_establishing = FALSE;
+ return (flags & GSOCK_LOST_FLAG) != 0;
}
- return;
- }
- if (req_evt == EVT_LOST)
- {
- m_connected = FALSE;
- Close();
+ // Wait more?
+ if ((!timeout) || (chrono.Time() > timeout) || (m_interrupt))
+ done = TRUE;
+ else
+ PROCESS_EVENTS();
}
- if (m_notifyme)
- OldOnNotify(req_evt);
- // Unmask
- SetNotify(m_neededreq | req_notif);
+ return FALSE;
}
-wxSocketEvent::wxSocketEvent(int id)
- : wxEvent(id)
+bool wxSocketBase::Wait(long seconds, long milliseconds)
{
- wxEventType type = (wxEventType)wxEVT_SOCKET;
-
- SetEventType(type);
+ return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+ GSOCK_OUTPUT_FLAG |
+ GSOCK_CONNECTION_FLAG |
+ GSOCK_LOST_FLAG);
}
-void wxSocketBase::OldOnNotify(wxRequestEvent evt)
+bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
{
- wxSocketEvent event(m_id);
+ // Check pushback buffer before entering _Wait
+ if (m_unread)
+ return TRUE;
- event.SetEventObject(this);
- event.m_skevt = evt;
- ProcessEvent(event);
+ // Note that GSOCK_INPUT_LOST has to be explicitly passed to
+ // _Wait becuase of the semantics of WaitForRead: a return
+ // value of TRUE means that a GSocket_Read call will return
+ // immediately, not that there is actually data to read.
- if (m_cbk)
- m_cbk(*this, evt, m_cdata);
+ return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+ GSOCK_LOST_FLAG);
}
-// --------------------------------------------------------------
-// --------- wxSocketBase functions [Callback, CallbackData] ----
-// --------------------------------------------------------------
-
-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSocketBase::wxSockCbk _cbk)
+bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
{
- wxSockCbk old_cbk = m_cbk;
-
- m_cbk = _cbk;
- return old_cbk;
+ return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);
}
-char *wxSocketBase::CallbackData(char *cdata_)
+bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
{
- char *old_cdata = m_cdata;
-
- m_cdata = cdata_;
- return old_cdata;
+ return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
}
-void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
-{
- SetNextHandler(&h_evt);
- m_id = id;
-}
+// --------------------------------------------------------------------------
+// Miscellaneous
+// --------------------------------------------------------------------------
-// --------------------------------------------------------------
-// --------- wxSocketBase pushback library ----------------------
-// --------------------------------------------------------------
+//
+// Get local or peer address
+//
-void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
+bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
{
- char *curr_pos;
+ GAddress *peer;
+
+ if (!m_socket)
+ return FALSE;
- m_unread = (char *) realloc(m_unread, m_unrd_size+size);
- curr_pos = m_unread + m_unrd_size;
+ peer = GSocket_GetPeer(m_socket);
+ addr_man.SetAddress(peer);
+ GAddress_destroy(peer);
- memcpy(curr_pos, buffer, size);
- m_unrd_size += size;
+ return TRUE;
}
-void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size)
+bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
{
- char *curr_pos, *new_buf;
+ GAddress *local;
- new_buf = (char *) malloc(m_unrd_size+size);
- curr_pos = new_buf + size;
+ if (!m_socket)
+ return FALSE;
- memcpy(new_buf, buffer, size);
- memcpy(curr_pos, m_unread, m_unrd_size);
+ local = GSocket_GetLocal(m_socket);
+ addr_man.SetAddress(local);
+ GAddress_destroy(local);
- free(m_unread);
- m_unread = new_buf;
- m_unrd_size += size;
+ return TRUE;
}
-size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek)
+//
+// Save and restore socket state
+//
+
+void wxSocketBase::SaveState()
{
- if (!m_unrd_size)
- return 0;
+ wxSocketState *state;
- if (size > m_unrd_size)
- size = m_unrd_size;
- memcpy(buffer, m_unread, size);
+ state = new wxSocketState();
- if (!peek) {
- m_unrd_size -= size;
- if (!m_unrd_size) {
- free(m_unread);
- m_unread = NULL;
- }
- }
+ state->m_flags = m_flags;
+ state->m_notify = m_notify;
+ state->m_eventmask = m_eventmask;
+ state->m_clientData = m_clientData;
+#if WXWIN_COMPATIBILITY
+ state->m_cbk = m_cbk;
+ state->m_cdata = m_cdata;
+#endif // WXWIN_COMPATIBILITY
- return size;
+ m_states.Append(state);
}
-// --------------------------------------------------------------
-// --------- wxSocketBase "multi-thread" core -------------------
-// --------------------------------------------------------------
-
-bool wxSocketBase::DoRequests(wxRequestEvent req_flag)
+void wxSocketBase::RestoreState()
{
- wxNode *node = req_list[req_flag].First();
- size_t len;
- int ret;
+ wxNode *node;
+ wxSocketState *state;
+ node = m_states.Last();
if (!node)
- return FALSE;
+ return;
- SockRequest *req = (SockRequest *)node->Data();
+ state = (wxSocketState *)node->Data();
- delete node;
+ m_flags = state->m_flags;
+ m_notify = state->m_notify;
+ m_eventmask = state->m_eventmask;
+ m_clientData = state->m_clientData;
+#if WXWIN_COMPATIBILITY
+ m_cbk = state->m_cbk;
+ m_cdata = state->m_cdata;
+#endif // WXWIN_COMPATIBILITY
- 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;
+ delete node;
+ delete state;
}
-void wxSocketBase::WantSpeedBuffer(char *buffer, size_t nbytes,
- wxRequestEvent evt)
+//
+// Timeout and flags
+//
+
+void wxSocketBase::SetTimeout(long seconds)
{
- 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;
- }
+ m_timeout = seconds;
+
+ if (m_socket)
+ GSocket_SetTimeout(m_socket, m_timeout * 1000);
}
-void wxSocketBase::WantBuffer(char *buffer, size_t nbytes,
- wxRequestEvent evt)
+void wxSocketBase::SetFlags(wxSocketFlags flags)
{
- bool buf_timed_out;
+ m_flags = flags;
+}
- if (m_fd == INVALID_SOCKET || !m_handler || !m_connected)
- return;
- if (m_flags & SPEED) {
- WantSpeedBuffer(buffer, nbytes, evt);
- return;
- }
+// --------------------------------------------------------------------------
+// Callbacks (now obsolete - use events instead)
+// --------------------------------------------------------------------------
- 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;
+#if WXWIN_COMPATIBILITY
- delete buf;
- RestoreState();
-}
+wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
+{
+ wxSockCbk old_cbk = cbk_;
-// --------------------------------------------------------------
-// wxSocketServer ///////////////////////////////////////////////
-// --------------------------------------------------------------
+ m_cbk = cbk_;
+ return old_cbk;
+}
-// --------------------------------------------------------------
-// --------- wxSocketServer CONSTRUCTOR -------------------------
-// --------------------------------------------------------------
-wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
- wxSockFlags flags) :
- wxSocketBase(flags, SOCK_SERVER)
+char *wxSocketBase::CallbackData(char *data)
{
- m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
-
- if (m_fd == INVALID_SOCKET)
- return;
+ char *old_data = m_cdata;
- int flag = 1;
- setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int));
+ m_cdata = data;
+ return old_data;
+}
- struct sockaddr *myaddr;
- size_t len;
+#endif // WXWIN_COMPATIBILITY
- addr_man.Build(myaddr, len);
- if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0)
- return;
+// --------------------------------------------------------------------------
+// Event handling
+// --------------------------------------------------------------------------
- if (listen(m_fd, 5) < 0) {
- m_fd = INVALID_SOCKET;
- return;
- }
-}
+// A note on how events are processed, which is probably the most
+// difficult thing to get working right while keeping the same API
+// and functionality for all platforms.
+//
+// When GSocket detects an event, it calls wx_socket_callback, which in
+// turn just calls wxSocketBase::OnRequest in the corresponding wxSocket
+// object. OnRequest does some housekeeping, and if the event is to be
+// propagated to the user, it creates a new wxSocketEvent object and
+// posts it. The event is not processed immediately, but delayed with
+// AddPendingEvent instead. This is necessary in order to decouple the
+// event processing from wx_socket_callback; otherwise, subsequent IO
+// calls made from the user event handler would fail, as gtk callbacks
+// are not reentrant.
+//
+// Note that, unlike events, user callbacks (now deprecated) are _not_
+// decoupled from wx_socket_callback and thus they suffer from a variety
+// of problems. Avoid them where possible and use events instead.
-// --------------------------------------------------------------
-// --------- wxSocketServer Accept ------------------------------
-// --------------------------------------------------------------
-bool wxSocketServer::AcceptWith(wxSocketBase& sock)
+static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
+ GSocketEvent notification,
+ char *cdata)
{
- int fd2;
+ wxSocketBase *sckobj = (wxSocketBase *)cdata;
- if ((fd2 = accept(m_fd, 0, 0)) < 0)
- return FALSE;
+ sckobj->OnRequest((wxSocketNotify) notification);
+}
- struct linger linger;
- linger.l_onoff = 0;
- linger.l_linger = 1;
+void wxSocketBase::OnRequest(wxSocketNotify notification)
+{
+ // NOTE: We duplicate some of the code in _Wait, but this doesn't
+ // hurt. It has to be here because the (GSocket) event might arrive
+ // a bit delayed, and it has to be in _Wait as well because we don't
+ // know whether the Wait functions are being used.
- setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
+ switch(notification)
+ {
+ case wxSOCKET_CONNECTION:
+ m_establishing = FALSE;
+ m_connected = TRUE;
+ break;
- int flag = 0;
- setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
+ // If we are in the middle of a R/W operation, do not
+ // propagate events to users. Also, filter 'late' events
+ // which are no longer valid.
- if (!(sock.m_flags & SPEED)) {
- unsigned long flag2 = 1;
- ioctl(fd2, FIONBIO, &flag2);
- }
+ case wxSOCKET_INPUT:
+ if (m_reading || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
+ return;
+ break;
- sock.m_type = SOCK_INTERNAL;
- sock.m_fd = fd2;
- sock.m_connected = TRUE;
+ case wxSOCKET_OUTPUT:
+ if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
+ return;
+ break;
- return TRUE;
-}
+ case wxSOCKET_LOST:
+ m_connected = FALSE;
+ m_establishing = FALSE;
+ break;
-wxSocketBase *wxSocketServer::Accept()
-{
- wxSocketBase* sock = new wxSocketBase();
+ default:
+ break;
+ }
- sock->SetFlags((wxSockFlags)m_flags);
+ // Schedule the event
- if (!AcceptWith(*sock))
- return NULL;
+ wxSocketEventFlags flag = 0;
+ switch (notification)
+ {
+ case GSOCK_INPUT: flag = GSOCK_INPUT_FLAG; break;
+ case GSOCK_OUTPUT: flag = GSOCK_OUTPUT_FLAG; break;
+ case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break;
+ case GSOCK_LOST: flag = GSOCK_LOST_FLAG; break;
+ default:
+ wxLogWarning(_("wxSocket: unknown event!."));
+ return;
+ }
- if (m_handler)
- m_handler->Register(sock);
+ if (((m_eventmask & flag) == flag) && m_notify)
+ {
+ if (m_handler)
+ {
+ wxSocketEvent event(m_id);
+ event.m_event = notification;
+ event.m_clientData = m_clientData;
+ event.SetEventObject(this);
- return sock;
-}
+ m_handler->AddPendingEvent(event);
+ }
-// --------------------------------------------------------------
-// --------- wxSocketServer callbacks ---------------------------
-// --------------------------------------------------------------
-void wxSocketServer::OnRequest(wxRequestEvent evt)
-{
- if (evt == EVT_ACCEPT) {
- OldOnNotify(EVT_ACCEPT);
+#if WXWIN_COMPATIBILITY
+ if (m_cbk)
+ m_cbk(*this, notification, m_cdata);
+#endif // WXWIN_COMPATIBILITY
}
}
-// --------------------------------------------------------------
-// wxSocketClient ///////////////////////////////////////////////
-// --------------------------------------------------------------
-
-// --------- wxSocketClient CONSTRUCTOR -------------------------
-// --------------------------------------------------------------
-wxSocketClient::wxSocketClient(wxSockFlags _flags) :
- wxSocketBase(_flags, SOCK_CLIENT)
+void wxSocketBase::Notify(bool notify)
{
+ m_notify = notify;
}
-// --------------------------------------------------------------
-// --------- wxSocketClient DESTRUCTOR --------------------------
-// --------------------------------------------------------------
-wxSocketClient::~wxSocketClient()
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)
{
+ m_eventmask = flags;
}
-// --------------------------------------------------------------
-// --------- wxSocketClient Connect functions -------------------
-// --------------------------------------------------------------
-bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )
+void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)
{
- struct linger linger;
-
- if (IsConnected())
- Close();
-
- m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
-
- if (m_fd < 0)
- 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?)...
+ m_handler = &handler;
+ m_id = id;
+}
-#if defined(__WINDOWS__) || (defined(IPPROTO_TCP) && defined(TCP_NODELAY))
- flag = 1;
- setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int));
-#endif
+// --------------------------------------------------------------------------
+// Pushback buffer
+// --------------------------------------------------------------------------
- struct sockaddr *remote;
- size_t len;
+void wxSocketBase::Pushback(const void *buffer, wxUint32 size)
+{
+ if (!size) return;
- addr_man.Build(remote, len);
+ if (m_unread == NULL)
+ m_unread = malloc(size);
+ else
+ {
+ void *tmp;
- if (connect(m_fd, remote, len) != 0)
- return FALSE;
+ tmp = malloc(m_unrd_size + size);
+ memcpy((char *)tmp + size, m_unread, m_unrd_size);
+ free(m_unread);
- if (!(m_flags & SPEED)) {
- flag = 1;
- ioctl(m_fd, FIONBIO, &flag);
+ m_unread = tmp;
}
- Notify(TRUE);
+ m_unrd_size += size;
- m_connected = TRUE;
- return TRUE;
+ memcpy(m_unread, buffer, size);
}
-bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
+wxUint32 wxSocketBase::GetPushback(void *buffer, wxUint32 size, bool peek)
{
- int ret = _Wait(seconds, microseconds, REQ_CONNECT | REQ_LOST);
+ if (!m_unrd_size)
+ return 0;
- if (ret)
- m_connected = TRUE;
+ if (size > (m_unrd_size-m_unrd_cur))
+ size = m_unrd_size-m_unrd_cur;
- return m_connected;
-}
+ memcpy(buffer, (char *)m_unread + m_unrd_cur, size);
-void wxSocketClient::OnRequest(wxRequestEvent evt)
-{
- if (evt == EVT_CONNECT) {
- if (m_connected) {
- SetNotify(m_neededreq & ~REQ_CONNECT);
- return;
+ 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;
}
- m_waitflags = 0x40;
- m_connected = TRUE;
- OldOnNotify(EVT_CONNECT);
- DestroyCallbacks();
- return;
}
- wxSocketBase::OnRequest(evt);
-}
-/////////////////////////////////////////////////////////////////
-// wxSocketHandler ///////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
+ return size;
+}
-wxSocketHandler *wxSocketHandler::master = NULL;
-#if defined(__WINDOWS__)
-static int win_initialized = 0;
-#endif
-// --------------------------------------------------------------
-// --------- wxSocketHandler CONSTRUCTOR ------------------------
-// --------------------------------------------------------------
-#ifdef __WINDOWS__
+// ==========================================================================
+// wxSocketServer
+// ==========================================================================
-extern char wxPanelClassName[];
+// --------------------------------------------------------------------------
+// Ctor
+// --------------------------------------------------------------------------
-LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
- WPARAM wParam, LPARAM lParam)
+wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
+ wxSocketFlags flags)
+ : wxSocketBase(flags, wxSOCKET_SERVER)
{
- if(message==WM_DESTROY)
+ // Create the socket
+ m_socket = GSocket_new();
+
+ if (!m_socket)
+ return;
+
+ // Setup the socket as server
+ GSocket_SetLocal(m_socket, addr_man.GetAddress());
+ if (GSocket_SetServer(m_socket) != GSOCK_NOERROR)
{
- ::SetWindowLong(hWnd, GWL_WNDPROC, (LONG) DefWindowProc);
- return DefWindowProc(hWnd, message, wParam, lParam);
+ GSocket_destroy(m_socket);
+ m_socket = NULL;
+ return;
}
- wxSocketHandler *h_sock = (wxSocketHandler *)GetWindowLong(hWnd, GWL_USERDATA);
- wxNode *node = h_sock->smsg_list->Find(message);
- wxSocketBase *sock;
- wxSocketBase::wxRequestEvent sk_req;
- UINT event = WSAGETSELECTEVENT(lParam);
- if (!node)
- return DefWindowProc(hWnd, message, wParam, lParam);
-
- sock = (wxSocketBase *)node->Data();
-
- switch (event) {
- case FD_READ:
- sk_req = wxSocketBase::EVT_READ;
- break;
- case FD_WRITE:
- sk_req = wxSocketBase::EVT_WRITE;
- break;
- case FD_CLOSE:
- sk_req = wxSocketBase::EVT_LOST;
- break;
- case FD_ACCEPT:
- sk_req = wxSocketBase::EVT_ACCEPT;
- break;
- case FD_CONNECT:
- sk_req = wxSocketBase::EVT_CONNECT;
- break;
- }
- sock->OnRequest(sk_req);
+ 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);
- return (LRESULT)0;
}
-FARPROC wxSocketSubClassProc = NULL;
-
-#endif
+// --------------------------------------------------------------------------
+// Accept
+// --------------------------------------------------------------------------
-wxSocketHandler::wxSocketHandler()
+bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
{
-#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
+ GSocket *child_socket;
- socks = new wxList;
+ if (!m_socket)
+ return FALSE;
-#ifndef __WINDOWS__
- signal(SIGPIPE, SIG_IGN);
-#endif
-}
+ // If wait == FALSE, then the call should be nonblocking.
+ // When we are finished, we put the socket to blocking mode
+ // again.
-// --------------------------------------------------------------
-// --------- wxSocketHandler DESTRUCTOR -------------------------
-// --------------------------------------------------------------
-wxSocketHandler::~wxSocketHandler()
-{
- wxNode *next_node, *node = socks->First();
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, 1);
- while (node) {
- wxSocketBase* sock = (wxSocketBase*)node->Data();
+ child_socket = GSocket_WaitConnection(m_socket);
- delete sock;
- next_node = node->Next();
- delete node;
- node = next_node;
- }
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, 0);
- delete socks;
+ if (!child_socket)
+ return FALSE;
-#ifdef __WINDOWS__
- delete smsg_list;
+ sock.m_type = wxSOCKET_BASE;
+ sock.m_socket = child_socket;
+ sock.m_connected = TRUE;
- ::DestroyWindow(internal->sockWin);
- WSACleanup();
- win_initialized = 0;
+ 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);
- delete internal;
-#endif
+ return TRUE;
}
-// --------------------------------------------------------------
-// --------- wxSocketHandler registering functions --------------
-// --------------------------------------------------------------
-void wxSocketHandler::Register(wxSocketBase* sock)
+wxSocketBase *wxSocketServer::Accept(bool wait)
{
- wxNode *node;
+ wxSocketBase* sock = new wxSocketBase();
- for (node = socks->First(); node != NULL; node = node->Next()) {
- wxSocketBase* s = (wxSocketBase*)node->Data();
+ sock->SetFlags(m_flags);
- if (s == sock)
- return;
+ if (!AcceptWith(*sock, wait))
+ {
+ sock->Destroy();
+ sock = NULL;
}
- if (sock) {
- socks->Append(sock);
- sock->SetHandler(this);
- sock->SetupCallbacks();
- }
+ return sock;
}
-void wxSocketHandler::UnRegister(wxSocketBase* sock)
+bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
{
- wxNode *node;
+ return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
+}
- for (node = socks->First(); node; node = node->Next()) {
- wxSocketBase* s = (wxSocketBase*)node->Data();
+// ==========================================================================
+// wxSocketClient
+// ==========================================================================
- if (s == sock) {
- delete node;
- sock->DestroyCallbacks();
- sock->SetHandler(NULL);
- return;
- }
- }
-}
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------
-unsigned long wxSocketHandler::Count() const
+wxSocketClient::wxSocketClient(wxSocketFlags flags)
+ : wxSocketBase(flags, wxSOCKET_CLIENT)
{
- return socks->Number();
}
-// --------------------------------------------------------------
-// --------- wxSocketHandler "big" wait functions ---------------
-// --------------------------------------------------------------
-void handler_cbk(wxSocketBase& sock,
- wxSocketBase::wxRequestEvent WXUNUSED(flags),
- char *cdata)
+wxSocketClient::~wxSocketClient()
{
- int *a_wait = (int *)cdata;
-
- (*a_wait)++;
- sock.Notify(FALSE);
}
-int wxSocketHandler::Wait(long seconds, long microseconds)
+// --------------------------------------------------------------------------
+// Connect
+// --------------------------------------------------------------------------
+
+bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
{
- int i;
- int on_wait;
- wxSockWakeUp s_wake(NULL, &on_wait, -2);
- wxNode *node;
+ GSocketError err;
- for (node = socks->First(), i=0; node; node = node->Next(), i++) {
- wxSocketBase *sock = (wxSocketBase *)node->Data();
+ if (m_socket)
+ {
+ // Shutdown and destroy the socket
+ Close();
+ GSocket_destroy(m_socket);
+ }
- sock->SaveState();
+ m_socket = GSocket_new();
+ m_connected = FALSE;
+ m_establishing = FALSE;
- sock->SetupCallbacks();
+ if (!m_socket)
+ return FALSE;
- sock->Callback(handler_cbk);
- sock->CallbackData((char *)&on_wait);
- }
- on_wait = 0;
- if (seconds != -1)
- s_wake.Start((seconds*1000) + (microseconds/1000), TRUE);
+ GSocket_SetTimeout(m_socket, m_timeout * 1000);
+ GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+ GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+ wx_socket_callback, (char *)this);
- while (!on_wait)
- PROCESS_EVENTS();
+ // If wait == FALSE, then the call should be nonblocking.
+ // When we are finished, we put the socket to blocking mode
+ // again.
- for (node = socks->First(), i=0; node; node = node->Next(), i++) {
- wxSocketBase *sock = (wxSocketBase *)node->Data();
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, 1);
- sock->RestoreState();
- }
+ GSocket_SetPeer(m_socket, addr_man.GetAddress());
+ err = GSocket_Connect(m_socket, GSOCK_STREAMED);
- if (on_wait == -2)
- return 0;
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, 0);
+
+ if (err != GSOCK_NOERROR)
+ {
+ if (err == GSOCK_WOULDBLOCK)
+ m_establishing = TRUE;
+
+ return FALSE;
+ }
- return on_wait;
+ m_connected = TRUE;
+ return TRUE;
}
-void wxSocketHandler::YieldSock()
+bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
{
- wxNode *node;
+ if (m_connected) // Already connected
+ return TRUE;
- for (node = socks->First(); node; node = node->Next() ) {
- wxSocketBase *sock = (wxSocketBase *)node->Data();
+ if (!m_establishing || !m_socket) // No connection in progress
+ return FALSE;
- sock->SaveState();
+ return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG |
+ GSOCK_LOST_FLAG);
+}
- sock->SetFlags(wxSocketBase::SPEED);
- if (sock->IsData())
- sock->DoRequests(wxSocketBase::EVT_READ);
- sock->DoRequests(wxSocketBase::EVT_WRITE);
+// ==========================================================================
+// wxDatagramSocket
+// ==========================================================================
- sock->RestoreState();
- }
-}
+/* NOTE: experimental stuff - might change */
-// --------------------------------------------------------------
-// --------- wxSocketHandler: create and register the socket ----
-// --------------------------------------------------------------
-wxSocketServer *wxSocketHandler::CreateServer(wxSockAddress& addr,
- wxSocketBase::wxSockFlags flags)
+wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr,
+ wxSocketFlags flags )
+ : wxSocketBase( flags, wxSOCKET_DATAGRAM )
{
- wxSocketServer *serv = new wxSocketServer(addr, flags);
+ // Create the socket
+ m_socket = GSocket_new();
- Register(serv);
- return serv;
-}
+ if(!m_socket)
+ return;
-wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags)
-{
- wxSocketClient *client = new wxSocketClient(flags);
+ // Setup the socket as non connection oriented
+ GSocket_SetLocal(m_socket, addr.GetAddress());
+ if( GSocket_SetNonOriented(m_socket) != GSOCK_NOERROR )
+ {
+ GSocket_destroy(m_socket);
+ m_socket = NULL;
+ return;
+ }
+
+ // Initialize all stuff
+ m_connected = FALSE;
+ m_establishing = FALSE;
+ GSocket_SetTimeout( m_socket, m_timeout );
+ GSocket_SetCallback( m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+ GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+ wx_socket_callback, (char*)this );
- Register(client);
- return client;
}
-#ifdef __WINDOWS__
-// --------------------------------------------------------------
-// --------- wxSocketHandler: Windows specific methods ----------
-// --------------------------------------------------------------
-UINT wxSocketHandler::NewMessage(wxSocketBase *sock)
+wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,
+ void* buf,
+ wxUint32 nBytes )
{
- internal->firstAvailableMsg++;
- smsg_list->Append(internal->firstAvailableMsg, sock);
- return internal->firstAvailableMsg;
+ Read(buf, nBytes);
+ GetPeer(addr);
+ return (*this);
}
-void wxSocketHandler::DestroyMessage(UINT msg)
+wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
+ const void* buf,
+ wxUint32 nBytes )
{
- wxNode *node = smsg_list->Find(msg);
- delete node;
+ GSocket_SetPeer(m_socket, addr.GetAddress());
+ Write(buf, nBytes);
+ return (*this);
}
-HWND wxSocketHandler::GetHWND() const
+// ==========================================================================
+// wxSocketEvent
+// ==========================================================================
+
+wxSocketEvent::wxSocketEvent(int id) : wxEvent(id)
{
- return internal->sockWin;
+ SetEventType( (wxEventType)wxEVT_SOCKET );
}
-#endif
+void wxSocketEvent::CopyObject(wxObject& object_dest) const
+{
+ wxSocketEvent *event = (wxSocketEvent *)&object_dest;
-bool wxSocketModule::OnInit() {
- wxSocketHandler::master = new wxSocketHandler();
- return TRUE;
-}
+ wxEvent::CopyObject(object_dest);
-void wxSocketModule::OnExit() {
- delete wxSocketHandler::master;
- wxSocketHandler::master = NULL;
+ event->m_event = m_event;
+ event->m_clientData = m_clientData;
}
+// ==========================================================================
+// wxSocketModule
+// ==========================================================================
+
+class WXDLLEXPORT wxSocketModule : public wxModule
+{
+ DECLARE_DYNAMIC_CLASS(wxSocketModule)
+
+public:
+ bool OnInit() { return GSocket_Init() != 0; }
+ void OnExit() { GSocket_Cleanup(); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
+
#endif
- // __WXSTUBS__
+ // wxUSE_SOCKETS
projects / wxWidgets.git / blobdiff