-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
// 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
+// Updated: September 1999
+// Copyright: (C) 1999, 1998, 1997, Guilhem Lavaux
+// (C) 1999, Guillermo Rodriguez Garcia
// RCS_ID: $Id$
// License: see wxWindows license
-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
#ifdef __GNUG__
#pragma implementation "socket.h"
#endif
-#ifdef __MWERKS__
-typedef int socklen_t ;
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
// 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 "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 <stdlib.h>
#include <string.h>
#include <ctype.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 <wx/mac/macsock.h>
-
-#endif
-
-#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>
-
-#ifdef sun
-#include <sys/filio.h>
-#endif
-
-#endif // __UNIX__
-
-#include <signal.h>
-#include <errno.h>
-
-#ifdef __VISUALC__
-#include <io.h>
-#endif
-
/////////////////////////////////////////////////////////////////////////////
// wxSocket headers
/////////////////////////////////////////////////////////////////////////////
-#include <wx/module.h>
-#define WXSOCK_INTERNAL
-#include <wx/sckaddr.h>
-#include <wx/socket.h>
-#include <wx/sckint.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
+#include "wx/sckaddr.h"
+#include "wx/socket.h"
-#ifndef __WINDOWS__
-#define INVALID_SOCKET -1
-#endif
-
-#ifdef __WINDOWS__
-// This is an MS TCP/IP routine and is not needed here. Some WinSock
-// implementations (such as PC-NFS) will require you to include this
-// or a similar routine (see appendix in WinSock doc or help file).
-
-#if defined( NEED_WSAFDIsSet ) || defined( __VISUALC__ )
-int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
-{
- int i = set->fd_count;
- while (i--)
- {
- if (set->fd_array[i] == fd)
- return 1;
- }
-
- return 0;
-}
-#endif
+#if defined(__WXMSW__) || defined(__WXPM__)
+#define PROCESS_EVENTS() wxYield()
+#elif defined(__WXGTK__)
+#include <gtk/gtk.h>
+#define PROCESS_EVENTS() gtk_main_iteration()
#endif
-// -------------------
-// Some patch ---- END
-// -------------------
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-// --------------------------------------------------------------
-// Module
-// --------------------------------------------------------------
-class wxSocketModule: public wxModule
-{
- DECLARE_DYNAMIC_CLASS(wxSocketModule)
-public:
- wxSocketModule() {}
- bool OnInit();
- void OnExit();
-};
// --------------------------------------------------------------
// ClassInfos
IMPLEMENT_CLASS(wxSocketBase, wxObject)
IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketHandler, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
#endif
+class wxSocketState : public wxObject
+{
+public:
+ bool notify_state;
+ GSocketEventFlags evt_notify_state;
+ wxSocketBase::wxSockFlags socket_flags;
+ wxSocketBase::wxSockCbk c_callback;
+ char *c_callback_data;
+
+public:
+ wxSocketState() : wxObject() {}
+};
+
// --------------------------------------------------------------
-// --------- wxSocketBase CONSTRUCTOR ---------------------------
+// wxSocketBase ctor and dtor
// --------------------------------------------------------------
+
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_socket(NULL), m_id(-1),
+ m_flags(_flags), m_type(_type),
+ m_neededreq(0), m_notify_state(FALSE),
+ m_connected(FALSE), m_establishing(FALSE),
+ m_reading(FALSE), m_writing(FALSE),
+ m_error(FALSE), m_lcount(0), m_timeout(600), m_states(),
+ m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
+ m_defering(NO_DEFER), m_defer_buffer(NULL), m_defer_timer(NULL),
+ m_cbk(NULL), m_cdata(NULL)
{
- m_internal = new wxSocketInternal(this);
}
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)
+ m_socket(NULL), m_id(-1),
+ m_flags(NONE), m_type(SOCK_UNINIT),
+ m_neededreq(0), m_notify_state(FALSE),
+ m_connected(FALSE), m_establishing(FALSE),
+ m_reading(FALSE), m_writing(FALSE),
+ m_error(FALSE), m_lcount(0), m_timeout(600), m_states(),
+ m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
+ m_defering(NO_DEFER), m_defer_buffer(NULL), m_defer_timer(NULL),
+ m_cbk(NULL), m_cdata(NULL)
{
- m_internal = new wxSocketInternal(this);
}
-// --------------------------------------------------------------
-// wxSocketBase
-// --------------------------------------------------------------
-
wxSocketBase::~wxSocketBase()
{
- // First, close the file descriptor.
- Close();
-
- m_internal->FinalizeSocket();
-
if (m_unread)
free(m_unread);
- // Unregister from the handler database.
- if (m_handler)
- m_handler->UnRegister(this);
- // Destroy all saved states.
- m_states.DeleteContents(TRUE);
+ // Shutdown and close the socket
+ Close();
- // Destroy the socket manager.
- delete m_internal;
+ // Destroy the GSocket object
+ if (m_socket)
+ GSocket_destroy(m_socket);
}
bool wxSocketBase::Close()
{
- if (m_fd != INVALID_SOCKET)
+ if (m_socket)
{
- // Pause all running socket thread.
- m_internal->PauseSocket();
+ // Disable callbacks
+ GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+ GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
- // Shutdown the connection.
- shutdown(m_fd, 2);
- close(m_fd);
- m_fd = INVALID_SOCKET;
+ // Shutdown the connection
+ GSocket_Shutdown(m_socket);
m_connected = FALSE;
+ m_establishing = FALSE;
}
return TRUE;
}
// --------------------------------------------------------------
-// wxSocketBase base IO function
+// wxSocketBase basic IO operations
// --------------------------------------------------------------
-wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
+// All IO operations {Read, Write, ReadMsg, WriteMsg, Peek,
+// Unread, Discard} update m_error and m_lcount.
+//
+// TODO: Should Connect, Accept and AcceptWith update m_error?
+
+class _wxSocketInternalTimer: public wxTimer
+{
+public:
+ int *m_state;
+ unsigned long m_new_val;
+
+ void Notify()
+ {
+ *m_state = m_new_val; // Change the value
+ }
+};
+
+wxUint32 wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
+{
+ // Timer for timeout
+ _wxSocketInternalTimer timer;
+
+ //wxLogMessage("Entrando a DeferRead, nbytes = %d", nbytes);
+ wxASSERT(m_defering == NO_DEFER);
+
+ // Set the defering mode to READ.
+ m_defering = DEFER_READ;
+
+ // Set the current buffer.
+ m_defer_buffer = buffer;
+ m_defer_nbytes = nbytes;
+ m_defer_timer = &timer;
+
+ timer.m_state = (int *)&m_defer_buffer;
+ timer.m_new_val = 0;
+
+ timer.Start(m_timeout * 1000, FALSE);
+
+ // If the socket is readable, call DoDefer for the first time
+ if (GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
+ {
+ //wxLogMessage("Llamando al primer DoDefer");
+ DoDefer();
+ }
+
+ // Wait for buffer completion.
+ while (m_defer_buffer != NULL)
+ PROCESS_EVENTS();
+
+ timer.Stop();
+
+ // Disable defering mode.
+ m_defering = NO_DEFER;
+ m_defer_timer = NULL;
+
+ // Return the number of bytes read from the socket.
+ //wxLogMessage("Saliendo de DeferRead: total: %d bytes", nbytes - m_defer_nbytes);
+ return nbytes-m_defer_nbytes;
+}
+
+wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes)
+{
+ // Mask read events
+ m_reading = TRUE;
+
+ m_lcount = _Read(buffer, nbytes);
+
+ // If in WAITALL mode, all bytes should have been read.
+ if (m_flags & WAITALL)
+ m_error = (m_lcount != nbytes);
+ else
+ m_error = (m_lcount == 0);
+
+ // Trigger another read event if there is still data available.
+ m_reading = FALSE;
+ // TODO: TriggerRead
+
+ return *this;
+}
+
+wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes)
+{
+ int total;
+ int ret = 1;
+
+ // we try this even if the connection has already been closed.
+ total = GetPushback(buffer, nbytes, FALSE);
+ nbytes -= total;
+ buffer += total;
+
+ // If the socket is not connected, or we have got the whole
+ // needed buffer, return immedately
+ if (!m_connected || !m_socket || !nbytes)
+ return total;
+
+ // Possible combinations (they are checked in this order)
+ // NOWAIT
+ // SPEED | WAITALL
+ // SPEED
+ // WAITALL
+ // NONE
+ //
+ if (m_flags & NOWAIT) // NOWAIT
+ {
+ GSocket_SetNonBlocking(m_socket, TRUE);
+ ret = GSocket_Read(m_socket, buffer, nbytes);
+ GSocket_SetNonBlocking(m_socket, FALSE);
+
+ if (ret > 0)
+ total += ret;
+ }
+ else if ((m_flags & SPEED) && (m_flags & WAITALL)) // SPEED, WAITALL
+ {
+ while (ret > 0 && nbytes > 0)
+ {
+ ret = GSocket_Read(m_socket, buffer, nbytes);
+ total += ret;
+ buffer += ret;
+ nbytes -= ret;
+ }
+ // In case the last call was an error ...
+ if (ret < 0)
+ total++;
+ }
+ else if (m_flags & SPEED) // SPEED, !WAITALL
+ {
+ ret = GSocket_Read(m_socket, buffer, nbytes);
+
+ if (ret > 0)
+ total += ret;
+ }
+ else // NONE or WAITALL
+ {
+ ret = DeferRead(buffer, nbytes);
+
+ if (ret > 0)
+ total += ret;
+ }
+
+ return total;
+}
+
+wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
{
- 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;
+#define MAX_DISCARD_SIZE (10 * 1024)
+
+ wxUint32 len, len2, sig, total;
+ bool error;
+ int old_flags;
+ struct
+ {
+ unsigned char sig[4];
+ unsigned char len[4];
+ } msg;
+
+ // Mask read events
+ m_reading = TRUE;
+
+ total = 0;
+ error = TRUE;
+ old_flags = m_flags;
+ SetFlags((m_flags & SPEED) | 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)
+ {
+ wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg"));
+ goto exit;
+ }
+
+ len = (wxUint32)msg.len[0];
+ len |= (wxUint32)(msg.len[1] << 8);
+ len |= (wxUint32)(msg.len[2] << 16);
+ len |= (wxUint32)(msg.len[3] << 24);
+
+ //wxLogMessage("Readmsg: %d %d %d %d -> len == %d",
+ // msg.len[0], msg.len[1], msg.len[2], msg.len[3], len);
+
+ if (len > nbytes)
+ {
+ len2 = len - nbytes;
+ len = nbytes;
+ }
+ else
+ len2 = 0;
+
+ // This check is necessary so that we don't attemp to read if
+ // the msg was zero bytes long.
+ if (len)
+ {
+ total = _Read(buffer, len);
+
+ if (total != len)
+ goto exit;
+ }
+ if (len2)
+ {
+ char *discard_buffer = new char[MAX_DISCARD_SIZE];
+ long discard_len;
+
+ // NOTE: discarded bytes don't add to m_lcount.
+ do
+ {
+ discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2);
+ discard_len = _Read(discard_buffer, discard_len);
+ len2 -= discard_len;
+ }
+ while ((discard_len > 0) && len2);
+
+ delete [] discard_buffer;
+
+ if (len2 != 0)
+ goto exit;
}
+ if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg))
+ goto exit;
+
+ sig = (wxUint32)msg.sig[0];
+ sig |= (wxUint32)(msg.sig[1] << 8);
+ sig |= (wxUint32)(msg.sig[2] << 16);
+ sig |= (wxUint32)(msg.sig[3] << 24);
+
+ if (sig != 0xdeadfeed)
+ {
+ //wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg"));
+ goto exit;
+ }
+
+ // everything was OK
+ error = FALSE;
+
+exit:
+ m_error = error;
+ m_lcount = total;
+ m_reading = FALSE;
+ SetFlags(old_flags);
+
+ // TODO: TriggerRead
+ return *this;
+
+#undef MAX_DISCARD_SIZE
+}
+
+wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes)
+{
+ // Mask read events
+ m_reading = TRUE;
+
+ m_lcount = _Read(buffer, nbytes);
+ Pushback(buffer, nbytes);
+
+ // If in WAITALL mode, all bytes should have been read.
+ if (m_flags & WAITALL)
+ m_error = (m_lcount != nbytes);
+ else
+ m_error = (m_lcount == 0);
- WantBuffer(buffer, nbytes, EVT_READ);
+ // Trigger another read event if there is still data available.
+ m_reading = FALSE;
+ // TODO: TriggerRead
return *this;
}
-wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
+wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
{
- m_lcount = GetPushback(buffer, nbytes, TRUE);
- if (nbytes-m_lcount == 0)
+ // Timer for timeout
+ _wxSocketInternalTimer timer;
+
+ wxASSERT(m_defering == NO_DEFER);
+ //wxLogMessage("Entrando a DeferWrite");
+
+ m_defering = DEFER_WRITE;
+
+ // Set the current buffer
+ m_defer_buffer = (char *)buffer;
+ m_defer_nbytes = nbytes;
+ m_defer_timer = &timer;
+
+ // Start timer
+ timer.m_state = (int *)&m_defer_buffer;
+ timer.m_new_val = 0;
+
+ timer.Start(m_timeout * 1000, FALSE);
+
+ // If the socket is writable, call DoDefer for the first time
+ if (GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
{
- return *this;
+ //wxLogMessage("Llamando al primer DoDefer");
+ DoDefer();
}
- buffer += m_lcount;
- nbytes -= m_lcount;
- WantBuffer(buffer, nbytes, EVT_PEEK);
+ // Wait for buffer completion.
+ while (m_defer_buffer != NULL)
+ PROCESS_EVENTS();
+
+ timer.Stop();
+
+ // Disable defering mode
+ m_defer_timer = NULL;
+ m_defering = NO_DEFER;
+
+ wxString s;
+ s.Printf("Saliendo de DeferWrite: total %d bytes", nbytes-m_defer_nbytes);
+ //wxLogMessage(s);
+
+ return nbytes-m_defer_nbytes;
+}
+
+wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes)
+{
+ // Mask write events
+ m_writing = TRUE;
+
+ m_lcount = _Write(buffer, nbytes);
+ // If in WAITALL mode, all bytes should have been written.
+ if (m_flags & WAITALL)
+ m_error = (m_lcount != nbytes);
+ else
+ m_error = (m_lcount == 0);
+
+ // Trigger another write event if the socket is still writable
+ m_writing = FALSE;
+
+ // TODO: TriggerWrite
return *this;
}
-wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes)
+wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes)
{
- m_lcount = 0;
- WantBuffer((char *)buffer, nbytes, EVT_WRITE);
+ wxUint32 total = 0;
+ int ret = 1;
+
+ if (!m_connected || !m_socket)
+ return 0;
+
+ // Possible combinations (they are checked in this order)
+ // NOWAIT
+ // SPEED | WAITALL
+ // SPEED
+ // WAITALL
+ // NONE
+ //
+ if (m_flags & NOWAIT) // NOWAIT
+ {
+ GSocket_SetNonBlocking(m_socket, TRUE);
+ ret = GSocket_Write(m_socket, buffer, nbytes);
+ GSocket_SetNonBlocking(m_socket, FALSE);
+
+ if (ret > 0)
+ total = ret;
+ }
+ else if ((m_flags & SPEED) && (m_flags & WAITALL)) // SPEED, WAITALL
+ {
+ while (ret > 0 && nbytes > 0)
+ {
+ ret = GSocket_Write(m_socket, buffer, nbytes);
+ total += ret;
+ buffer += ret;
+ nbytes -= ret;
+ }
+ // In case the last call was an error ...
+ if (ret < 0)
+ total ++;
+ }
+ else if (m_flags & SPEED) // SPEED, !WAITALL
+ {
+ ret = GSocket_Write(m_socket, buffer, nbytes);
+
+ if (ret > 0)
+ total = ret;
+ }
+ else // NONE or WAITALL
+ {
+ ret = DeferWrite(buffer, nbytes);
+
+ if (ret > 0)
+ total = ret;
+ }
+
+ return total;
+}
+
+wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes)
+{
+ wxUint32 total;
+ bool error;
+ int old_flags;
+ struct {
+ unsigned char sig[4];
+ unsigned char len[4];
+ } msg;
+
+ // Mask write events
+ m_writing = TRUE;
+
+ error = TRUE;
+ total = 0;
+ old_flags = m_flags;
+ SetFlags((m_flags & SPEED) | WAITALL);
+
+ // warning about 'cast truncates constant value'
+#ifdef __VISUALC__
+# pragma warning(disable: 4310)
+#endif // __VISUALC__
+
+ msg.sig[0] = (unsigned char) 0xad;
+ msg.sig[1] = (unsigned char) 0xde;
+ msg.sig[2] = (unsigned char) 0xed;
+ msg.sig[3] = (unsigned char) 0xfe;
+
+ msg.len[0] = (unsigned char) nbytes & 0xff;
+ msg.len[1] = (unsigned char) (nbytes >> 8) & 0xff;
+ msg.len[2] = (unsigned char) (nbytes >> 16) & 0xff;
+ msg.len[3] = (unsigned char) (nbytes >> 24) & 0xff;
+
+ //wxLogMessage("Writemsg: %d %d %d %d -> %d",
+ // nbytes & 0xff,
+ // (nbytes >> 8) & 0xff,
+ // (nbytes >> 16) & 0xff,
+ // (nbytes >> 24) & 0xff,
+ // nbytes
+ // );
+
+ if (_Write((char *)&msg, sizeof(msg)) < sizeof(msg))
+ goto exit;
+
+ total = _Write(buffer, nbytes);
+
+ if (total < nbytes)
+ goto exit;
+
+ msg.sig[0] = (unsigned char) 0xed;
+ msg.sig[1] = (unsigned char) 0xfe;
+ msg.sig[2] = (unsigned char) 0xad;
+ msg.sig[3] = (unsigned char) 0xde;
+ msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;
+
+ if ((_Write((char *)&msg, sizeof(msg))) < sizeof(msg))
+ goto exit;
+
+ // everything was OK
+ error = FALSE;
+
+exit:
+ m_error = error;
+ m_lcount = total;
+ m_writing = FALSE;
+
+ // TODO: TriggerWrite
return *this;
+
+#ifdef __VISUALC__
+# pragma warning(default: 4310)
+#endif // __VISUALC__
}
-wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes)
{
- CreatePushbackAfter(buffer, nbytes);
+ if (nbytes != 0)
+ Pushback(buffer, nbytes);
+
+ m_error = FALSE;
+ m_lcount = nbytes;
+
return *this;
}
-bool wxSocketBase::IsData() const
+void wxSocketBase::DoDefer()
{
- struct timeval tv;
- fd_set sock_set;
+ int ret;
- if (m_fd < 0)
- return FALSE;
- if (m_unrd_size > 0)
- return TRUE;
+ if (!m_defer_buffer)
+ return;
- m_internal->AcquireFD();
+ switch(m_defering)
+ {
+ case DEFER_READ:
+ ret = GSocket_Read(m_socket, m_defer_buffer, m_defer_nbytes);
+ break;
+ case DEFER_WRITE:
+ ret = GSocket_Write(m_socket, m_defer_buffer, m_defer_nbytes);
+ break;
+ default:
+ ret = -1;
+ }
- 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);
+ if (ret >= 0)
+ m_defer_nbytes -= ret;
- m_internal->ReleaseFD();
+ // If we are waiting for all bytes to be acquired, keep the defering
+ // mode enabled.
+ if (!(m_flags & WAITALL) || !m_defer_nbytes || ret < 0)
+ {
+ m_defer_buffer = NULL;
+ }
+ else
+ {
+ m_defer_buffer += ret;
+ m_defer_timer->Start(m_timeout * 1000, FALSE);
+ }
- return (FD_ISSET(m_fd, &sock_set) != 0);
+ //wxLogMessage("DoDefer ha transferido %d bytes", ret);
}
-// ---------------------------------------------------------------------
-// --------- wxSocketBase Discard(): deletes all byte in the input queue
-// ---------------------------------------------------------------------
-void wxSocketBase::Discard()
+wxSocketBase& wxSocketBase::Discard()
{
#define MAX_BUFSIZE (10*1024)
+
+ int old_flags;
char *my_data = new char[MAX_BUFSIZE];
- size_t recv_size = MAX_BUFSIZE;
+ wxUint32 recv_size = MAX_BUFSIZE;
+ wxUint32 total = 0;
+
+ // Mask read events
+ m_reading = TRUE;
- SaveState();
- SetFlags((wxSockFlags)(NOWAIT | SPEED));
+ old_flags = m_flags;
+ SetFlags(NOWAIT);
- while (recv_size == MAX_BUFSIZE)
+ while (recv_size == MAX_BUFSIZE)
{
- recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
+ recv_size = _Read(my_data, MAX_BUFSIZE);
+ total += recv_size;
}
- RestoreState();
delete [] my_data;
+ m_lcount = total;
+ m_error = FALSE;
-#undef MAX_BUFSIZE
-}
+ // Trigger another read event if there is still data available.
+ m_reading = 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.
-
-// JACS - How can we detect this?
-// Meanwhile, if your compiler complains about socklen_t,
-// switch lines below.
+ // TODO: TriggerRead
+ return *this;
-#if wxHAVE_GLIBC2
-# define wxSOCKET_INT socklen_t
-#else
-# define wxSOCKET_INT int
-#endif
+#undef MAX_BUFSIZE
+}
// --------------------------------------------------------------
-// wxSocketBase socket info functions
+// wxSocketBase get local or peer addresses
// --------------------------------------------------------------
bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
{
- struct sockaddr my_addr;
- wxSOCKET_INT len_addr = sizeof(my_addr);
+ GAddress *peer;
- if (m_fd < 0)
+ if (!m_socket)
return FALSE;
- m_internal->AcquireFD();
-
- if (getpeername(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0) {
- m_internal->ReleaseFD();
- return FALSE;
- }
+ peer = GSocket_GetPeer(m_socket);
+ addr_man.SetAddress(peer);
+ GAddress_destroy(peer);
- m_internal->ReleaseFD();
- addr_man.Disassemble(&my_addr, len_addr);
return TRUE;
}
bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
{
- struct sockaddr my_addr;
- wxSOCKET_INT len_addr = sizeof(my_addr);
+ GAddress *local;
- if (m_fd < 0)
+ if (!m_socket)
return FALSE;
- m_internal->AcquireFD();
-
- if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0) {
- m_internal->ReleaseFD();
- return FALSE;
- }
- m_internal->ReleaseFD();
+ local = GSocket_GetLocal(m_socket);
+ addr_man.SetAddress(local);
+ GAddress_destroy(local);
- addr_man.Disassemble(&my_addr, len_addr);
return TRUE;
}
// --------------------------------------------------------------
-// wxSocketBase wait functions
+// wxSocketBase save and restore socket state
// --------------------------------------------------------------
void wxSocketBase::SaveState()
{
- SocketState *state = new SocketState;
+ wxSocketState *state;
+
+ state = new wxSocketState();
state->notify_state = m_notify_state;
state->evt_notify_state = m_neededreq;
state->c_callback = m_cbk;
state->c_callback_data = m_cdata;
- m_states.Append((wxObject *)state);
+ 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;
delete state;
}
+
// --------------------------------------------------------------
-// --------- wxSocketBase callback functions --------------------
+// wxSocketBase Wait functions
// --------------------------------------------------------------
-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
+// GRG: I have completely rewritten this family of functions
+// so that they don't depend on event notifications; instead,
+// they poll the socket, using GSocket_Select(), to check for
+// the specified combination of event flags, until an event
+// occurs or until the timeout ellapses. The polling loop
+// calls PROCESS_EVENTS(), so this won't block the GUI.
+
+bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
{
- wxSockCbk old_cbk = cbk_;
+ GSocketEventFlags result;
+ _wxSocketInternalTimer timer;
+ long timeout;
+ int state = -1;
- m_cbk = cbk_;
- return old_cbk;
-}
+ // Check for valid socket
+ if (!m_socket)
+ return FALSE;
-char *wxSocketBase::CallbackData(char *data)
-{
- char *old_data = m_cdata;
+ // If it is not a server, it must be connected or establishing connection
+ if ((m_type != SOCK_SERVER) && (!m_connected && !m_establishing))
+ return FALSE;
- m_cdata = data;
- return old_data;
-}
+ // Check for valid timeout value
+ if (seconds != -1)
+ timeout = seconds * 1000 + milliseconds;
+ else
+ timeout = m_timeout * 1000;
-// --------------------------------------------------------------
-// --------- wxSocketBase wait functions ------------------------
-// --------------------------------------------------------------
+ // Activate timer
+ if (timeout)
+ {
+ timer.m_state = &state;
+ timer.m_new_val = 0;
+ timer.Start(timeout, TRUE);
+ }
-bool wxSocketBase::_Wait(long seconds, long milliseconds, int type)
-{
- SockRequest *req;
+ // Active polling (without using events)
+ //
+ // NOTE: this duplicates some of the code in OnRequest (lost
+ // connection and connection establishment handling) but this
+ // doesn't hurt. It has to be here because the event might
+ // be a bit delayed, and it has to be in OnRequest as well
+ // because maybe the WaitXXX functions are not being used.
+ //
+ // Do this at least once (important if timeout == 0, when
+ // we are just polling)
+ do
+ {
+ result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);
- if ((!m_connected && !m_connecting) || m_fd < 0)
- return FALSE;
+ // Connection lost
+ if (result & GSOCK_LOST_FLAG)
+ {
+ timer.Stop();
+ m_defer_buffer = NULL;
+ Close();
+ return TRUE;
+ }
+
+ // Incoming connection (server) or connection established (client)
+ if (result & GSOCK_CONNECTION_FLAG)
+ {
+ timer.Stop();
+ m_connected = TRUE;
+ m_establishing = FALSE;
+ return TRUE;
+ }
- req = new SockRequest;
+ // If we are in the middle of a R/W operation, do not propagate
+ // to users.
+ if ( ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
+ && (!m_writing) && (!m_reading) )
+ {
+/* TODO: remove this
+ if (m_defer_buffer == NULL)
+*/
+ {
+ timer.Stop();
+ return TRUE;
+ }
+ }
- 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);
+ if (timeout != 0)
+ PROCESS_EVENTS();
+ }
+ while ((state == -1) && timeout);
- return (req->io_nbytes != 0);
+ timer.Stop();
+ return FALSE;
}
bool wxSocketBase::Wait(long seconds, long milliseconds)
{
- return _Wait(seconds, milliseconds, REQ_ACCEPT | REQ_CONNECT |
- REQ_READ | REQ_WRITE | REQ_LOST);
+ return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+ GSOCK_OUTPUT_FLAG |
+ GSOCK_CONNECTION_FLAG |
+ GSOCK_LOST_FLAG);
}
bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
{
- return _Wait(seconds, milliseconds, REQ_READ | REQ_LOST);
+ // Check pushback buffer
+ if (m_unread)
+ return TRUE;
+
+ return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG);
}
bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
{
- return _Wait(seconds, milliseconds, REQ_WRITE);
+ return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);
}
bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
{
- return _Wait(seconds, milliseconds, REQ_LOST);
+ return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
+}
+
+void wxSocketBase::SetTimeout(long seconds)
+{
+ m_timeout = seconds;
+
+ if (m_socket)
+ GSocket_SetTimeout(m_socket, m_timeout);
}
// --------------------------------------------------------------
-// --------- wxSocketBase callback management -------------------
+// wxSocketBase flags
// --------------------------------------------------------------
-wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
+void wxSocketBase::SetFlags(wxSockFlags _flags)
{
- switch (evt)
- {
- case EVT_READ:
- return REQ_READ;
- case EVT_PEEK:
- return REQ_PEEK;
- case EVT_WRITE:
- return REQ_WRITE;
- case EVT_LOST:
- return REQ_LOST;
- case EVT_ACCEPT:
- return REQ_ACCEPT;
- case EVT_CONNECT:
- return REQ_CONNECT;
- }
- return 0;
+ m_flags = _flags;
}
-void wxSocketBase::SetFlags(wxSockFlags _flags)
+// --------------------------------------------------------------
+// wxSocketBase callback management
+// --------------------------------------------------------------
+
+wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
{
- m_flags = _flags;
- if (_flags & SPEED) {
- // SPEED and WAITALL are antagonists.
- m_flags = (wxSockFlags)(m_flags & ~WAITALL);
- }
+ wxSockCbk old_cbk = cbk_;
+
+ m_cbk = cbk_;
+ return old_cbk;
}
-wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
+char *wxSocketBase::CallbackData(char *data)
{
- return m_flags;
+ char *old_data = m_cdata;
+
+ m_cdata = data;
+ return old_data;
}
-void wxSocketBase::SetNotify(wxRequestNotify flags)
+// --------------------------------------------------------------
+// wxSocketBase automatic notifier
+// --------------------------------------------------------------
+
+// All events (INPUT, OUTPUT, CONNECTION, LOST) are now always
+// internally watched; but users will only be notified of those
+// events they are interested in.
+
+static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
+ GSocketEvent event, char *cdata)
{
- /* Check if server */
- if (m_type != SOCK_SERVER)
- flags &= ~REQ_ACCEPT;
+ wxSocketBase *sckobj = (wxSocketBase *)cdata;
+
+ sckobj->OnRequest((wxSocketNotify)event);
+}
+wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
+{
+ switch (evt)
+ {
+ case GSOCK_INPUT: return GSOCK_INPUT_FLAG;
+ case GSOCK_OUTPUT: return GSOCK_OUTPUT_FLAG;
+ case GSOCK_CONNECTION: return GSOCK_CONNECTION_FLAG;
+ case GSOCK_LOST: return GSOCK_LOST_FLAG;
+ }
+ return 0;
+}
+
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)
+{
m_neededreq = flags;
- if (m_neededreq == 0)
- m_internal->DisableWaiter();
- else
- Notify(m_notify_state);
}
void wxSocketBase::Notify(bool notify)
{
- if (notify)
- m_internal->EnableWaiter();
- else
- m_internal->DisableWaiter();
m_notify_state = notify;
}
-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);
+ // fprintf(stderr, "%s: Entering OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
- // We disable the event reporting.
- SetNotify(m_neededreq & ~notify);
+ // NOTE: this duplicates some of the code in _Wait (lost
+ // connection and connection establishment handling) but
+ // this doesn't hurt. It has to be here because maybe the
+ // WaitXXX are not being used, and it has to be in _Wait
+ // as well because the event might be a bit delayed.
+ //
+ switch(req_evt)
+ {
+ case wxSOCKET_CONNECTION:
+ m_establishing = FALSE;
+ m_connected = TRUE;
+ break;
+ case wxSOCKET_LOST:
+ m_defer_buffer = NULL;
+ Close();
+ break;
+ case wxSOCKET_INPUT:
+ case wxSOCKET_OUTPUT:
+ if (m_defer_buffer)
+ {
+ // fprintf(stderr, "%s: Habia buffer, evt %d skipped\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
+ DoDefer();
+ // Do not notify to user
+ return;
+ }
+ break;
}
-}
-wxSocketEvent::wxSocketEvent(int id)
- : wxEvent(id)
-{
- wxEventType type = (wxEventType)wxEVT_SOCKET;
-
- SetEventType(type);
-}
+ // If we are in the middle of a R/W operation, do not
+ // propagate events to users.
+ if (((req_evt == wxSOCKET_INPUT) && m_reading) ||
+ ((req_evt == wxSOCKET_OUTPUT) && m_writing))
+ {
+ // fprintf(stderr, "%s: Swallowed evt %d\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
+ return;
+ }
-wxObject *wxSocketEvent::Clone() const
-{
- wxSocketEvent *event = (wxSocketEvent *)wxEvent::Clone();
+ if (((m_neededreq & flag) == flag) && m_notify_state)
+ {
+ // fprintf(stderr, "%s: Evt %d delivered\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
+ event.m_socket = this;
+ event.m_skevt = req_evt;
+ ProcessEvent(event);
+ OldOnNotify(req_evt);
- event->m_skevt = m_skevt;
- event->m_socket = m_socket;
+ if (m_cbk)
+ m_cbk(*this, req_evt, m_cdata);
+ }
- return event;
+ // fprintf(stderr, "%s: Exiting OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
}
-void wxSocketBase::OldOnNotify(wxRequestEvent evt)
+void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt))
{
}
// --------------------------------------------------------------
-// --------- wxSocketBase functions [Callback, CallbackData] ----
+// wxSocketBase set event handler
// --------------------------------------------------------------
void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
}
// --------------------------------------------------------------
-// --------- wxSocketBase pushback library ----------------------
+// wxSocketBase pushback
// --------------------------------------------------------------
-void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
-{
- char *curr_pos;
-
- if (m_unread != NULL)
- m_unread = (char *) realloc(m_unread, m_unrd_size+size);
- else
- m_unread = (char *) malloc(size);
- curr_pos = m_unread + m_unrd_size;
-
- memcpy(curr_pos, buffer, size);
- m_unrd_size += size;
-}
-
-void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size)
+void wxSocketBase::Pushback(const char *buffer, wxUint32 size)
{
- char *curr_pos, *new_buf;
-
- new_buf = (char *) malloc(m_unrd_size+size);
- curr_pos = new_buf + size;
+ if (m_unread == NULL)
+ m_unread = (char *)malloc(size);
+ else {
+ 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) {
+ 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;
}
}
}
// --------------------------------------------------------------
-// --------- wxSocketBase buffer core requester -----------------
+// wxSocketServer
// --------------------------------------------------------------
-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->DisableWaiter();
- 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)
- m_internal->QueueRequest(buf, FALSE);
- else
- if (m_flags & NOWAIT)
- 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
+// wxSocketServer ctor and dtor
// --------------------------------------------------------------
wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
wxSockFlags flags) :
wxSocketBase(flags, SOCK_SERVER)
{
- m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
-
- if (m_fd == INVALID_SOCKET)
- return;
-
- int flag = 1;
- setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int));
-
- struct sockaddr *myaddr;
- size_t len;
+ // Create the socket
+ m_socket = GSocket_new();
- addr_man.Build(myaddr, len);
- if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0)
+ if (!m_socket)
return;
- if (listen(m_fd, 5) < 0) {
- m_fd = INVALID_SOCKET;
+ // Setup the socket as server
+ GSocket_SetLocal(m_socket, addr_man.GetAddress());
+ if (GSocket_SetServer(m_socket) != GSOCK_NOERROR)
+ {
+ GSocket_destroy(m_socket);
+ m_socket = NULL;
return;
}
- m_internal->InitializeSocket();
+ GSocket_SetTimeout(m_socket, m_timeout);
+ GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+ GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+ wx_socket_callback, (char *)this);
+
}
// --------------------------------------------------------------
// wxSocketServer Accept
// --------------------------------------------------------------
-bool wxSocketServer::AcceptWith(wxSocketBase& sock)
+bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
{
- int fd2;
+ GSocket *child_socket;
- if ((fd2 = accept(m_fd, 0, 0)) < 0)
+ if (!m_socket)
return FALSE;
- struct linger linger;
- linger.l_onoff = 0;
- linger.l_linger = 1;
+ // GRG: If wait == FALSE, then the call should be nonblocking.
+ // When we are finished, we put the socket to blocking mode
+ // again.
- setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, TRUE);
- int flag = 0;
- setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
+ child_socket = GSocket_WaitConnection(m_socket);
+
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, FALSE);
+
+ // GRG: this was not being handled!
+ if (child_socket == NULL)
+ return FALSE;
sock.m_type = SOCK_INTERNAL;
- sock.m_fd = fd2;
+ sock.m_socket = child_socket;
sock.m_connected = TRUE;
- sock.m_internal->InitializeSocket();
+ GSocket_SetTimeout(sock.m_socket, sock.m_timeout);
+ GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+ GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+ wx_socket_callback, (char *)&sock);
return TRUE;
}
-wxSocketBase *wxSocketServer::Accept()
+wxSocketBase *wxSocketServer::Accept(bool wait)
{
wxSocketBase* sock = new wxSocketBase();
sock->SetFlags((wxSockFlags)m_flags);
- if (!AcceptWith(*sock))
+ if (!AcceptWith(*sock, wait))
return NULL;
- if (m_handler)
- m_handler->Register(sock);
-
return sock;
}
+bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
+{
+ return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
+}
+
// --------------------------------------------------------------
// wxSocketClient
// --------------------------------------------------------------
-// --------- wxSocketClient CONSTRUCTOR -------------------------
// --------------------------------------------------------------
+// wxSocketClient ctor and dtor
+// --------------------------------------------------------------
+
wxSocketClient::wxSocketClient(wxSockFlags _flags) :
wxSocketBase(_flags, SOCK_CLIENT)
{
}
-// --------------------------------------------------------------
-// --------- wxSocketClient DESTRUCTOR --------------------------
-// --------------------------------------------------------------
wxSocketClient::~wxSocketClient()
{
}
// --------------------------------------------------------------
-// --------- wxSocketClient Connect functions -------------------
+// wxSocketClient Connect functions
// --------------------------------------------------------------
-bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )
+bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
{
- struct linger linger;
+ GSocketError err;
if (IsConnected())
Close();
- // Initializes all socket stuff ...
- // --------------------------------
- m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
-
- if (m_fd < 0)
- return FALSE;
+ // This should never happen.
+ if (m_socket)
+ GSocket_destroy(m_socket);
+ // Initialize all socket stuff ...
+ m_socket = GSocket_new();
m_connected = FALSE;
+ m_establishing = FALSE;
- linger.l_onoff = 1;
- linger.l_linger = 5;
- setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
-
- // Stay in touch with the state of things...
-
- unsigned long flag = 1;
- setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
-
- // Disable the nagle algorithm, which delays sends till the
- // buffer is full (or a certain time period has passed?)...
-
-#if defined(__WINDOWS__) || (defined(IPPROTO_TCP) && defined(TCP_NODELAY))
- flag = 1;
- setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int));
-#endif
-
- struct sockaddr *remote;
- size_t len;
-
- addr_man.Build(remote, len);
-
- if (connect(m_fd, remote, len) != 0)
+ if (!m_socket)
return FALSE;
- // Initializes the background threads ...
- // --------------------------------------
- m_internal->InitializeSocket();
+ 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);
- // Enables bg events.
- // ------------------
- Notify(TRUE);
+ // GRG: If wait == FALSE, then the call should be nonblocking.
+ // When we are finished, we put the socket to blocking mode
+ // again.
- m_connected = TRUE;
- return TRUE;
-}
-
-bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
-{
- int ret = _Wait(seconds, microseconds, REQ_CONNECT | REQ_LOST);
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, TRUE);
- if (ret)
- m_connected = TRUE;
+ GSocket_SetPeer(m_socket, addr_man.GetAddress());
+ err = GSocket_Connect(m_socket, GSOCK_STREAMED);
- return m_connected;
-}
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, FALSE);
-void wxSocketClient::OnRequest(wxRequestEvent evt)
-{
- if (evt == EVT_CONNECT)
+ if (err != GSOCK_NOERROR)
{
- if (m_connected)
- {
- SetNotify(m_neededreq & ~REQ_CONNECT);
- return;
- }
- m_connected = TRUE;
- OldOnNotify(EVT_CONNECT);
- return;
- }
- wxSocketBase::OnRequest(evt);
-}
-
-/////////////////////////////////////////////////////////////////
-// wxSocketHandler ///////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-
-wxSocketHandler *wxSocketHandler::master = NULL;
-#if defined(__WINDOWS__)
-static int win_initialized = 0;
-#endif
+ if (err == GSOCK_WOULDBLOCK)
+ m_establishing = TRUE;
-// --------------------------------------------------------------
-// --------- wxSocketHandler CONSTRUCTOR ------------------------
-// --------------------------------------------------------------
-wxSocketHandler::wxSocketHandler()
-{
-#if defined(__WINDOWS__)
- if (!win_initialized)
- {
- WSADATA wsaData;
-
- WSAStartup((1 << 8) | 1, &wsaData);
- win_initialized = 1;
+ return FALSE;
}
-#endif
-
- socks = new wxList;
-#ifndef __WINDOWS__
- signal(SIGPIPE, SIG_IGN);
-#endif
+ m_connected = TRUE;
+ return TRUE;
}
-// --------------------------------------------------------------
-// --------- wxSocketHandler DESTRUCTOR -------------------------
-// --------------------------------------------------------------
-wxSocketHandler::~wxSocketHandler()
+bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
{
- wxNode *next_node, *node = socks->First();
-
- while (node)
- {
- wxSocketBase* sock = (wxSocketBase*)node->Data();
-
- delete sock;
- next_node = node->Next();
- delete node;
- node = next_node;
- }
+ if (m_connected) // Already connected
+ return TRUE;
- delete socks;
+ if (!m_establishing || !m_socket) // No connection in progress
+ return FALSE;
-#ifdef __WINDOWS__
- WSACleanup();
- win_initialized = 0;
-#endif
+ return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
}
// --------------------------------------------------------------
-// --------- wxSocketHandler registering functions --------------
+// wxSocketEvent
// --------------------------------------------------------------
-void wxSocketHandler::Register(wxSocketBase* sock)
+wxSocketEvent::wxSocketEvent(int id)
+ : wxEvent(id)
{
- wxNode *node;
-
- for (node = socks->First(); node != NULL; node = node->Next())
- {
- wxSocketBase* s = (wxSocketBase*)node->Data();
-
- if (s == sock)
- return;
- }
+ wxEventType type = (wxEventType)wxEVT_SOCKET;
- if (sock)
- {
- socks->Append(sock);
- sock->SetHandler(this);
- }
+ SetEventType(type);
}
-void wxSocketHandler::UnRegister(wxSocketBase* sock)
+void wxSocketEvent::CopyObject(wxObject& obj_d) const
{
- wxNode *node;
-
- for (node = socks->First(); node; node = node->Next())
- {
- wxSocketBase* s = (wxSocketBase*)node->Data();
+ wxSocketEvent *event = (wxSocketEvent *)&obj_d;
- if (s == sock)
- {
- delete node;
- sock->SetHandler(NULL);
- return;
- }
- }
-}
+ wxEvent::CopyObject(obj_d);
-unsigned long wxSocketHandler::Count() const
-{
- return socks->Number();
+ event->m_skevt = m_skevt;
+ event->m_socket = m_socket;
}
-// --------------------------------------------------------------
-// --------- wxSocketHandler "big" wait functions ---------------
-// --------------------------------------------------------------
-
-int wxSocketHandler::Wait(long seconds, long microseconds)
-{
- // 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();
+// --------------------------------------------------------------------------
+// wxSocketModule
+// --------------------------------------------------------------------------
+class WXDLLEXPORT wxSocketModule: public wxModule {
+ DECLARE_DYNAMIC_CLASS(wxSocketModule)
+ public:
+ bool OnInit() {
+ return GSocket_Init();
}
-
- if (on_wait == -2)
- return 0;
-
- return on_wait;
- */
- return 0;
-}
-
-void wxSocketHandler::YieldSock()
-{
- 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);
+ void OnExit() {
+ GSocket_Cleanup();
}
-}
-
-// --------------------------------------------------------------
-// --------- wxSocketHandler: create and register the socket ----
-// --------------------------------------------------------------
-wxSocketServer *wxSocketHandler::CreateServer(wxSockAddress& addr,
- wxSocketBase::wxSockFlags flags)
-{
- wxSocketServer *serv = new wxSocketServer(addr, flags);
-
- Register(serv);
- return serv;
-}
-
-wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags)
-{
- wxSocketClient *client = new wxSocketClient(flags);
-
- Register(client);
- return client;
-}
-
-bool wxSocketModule::OnInit()
-{
- wxSocketHandler::master = new wxSocketHandler();
- return TRUE;
-}
-
-void wxSocketModule::OnExit()
-{
- delete wxSocketHandler::master;
- wxSocketHandler::master = NULL;
-}
+};
-#endif
- // __WXSTUBS__
+IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
#endif
// wxUSE_SOCKETS
projects / wxWidgets.git / blobdiff