-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
// Name: socket.cpp
// Purpose: Socket handler classes
-// Authors: Guilhem Lavaux
+// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia
// Created: April 1997
-// Updated: July 1999
+// 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
/////////////////////////////////////////////////////////////////////////////
// wxWindows headers
/////////////////////////////////////////////////////////////////////////////
-#include <wx/defs.h>
-#include <wx/object.h>
-#include <wx/string.h>
-#include <wx/timer.h>
-#include <wx/utils.h>
-#include <wx/log.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 <stdlib.h>
#include <string.h>
/////////////////////////////////////////////////////////////////////////////
// wxSocket headers
/////////////////////////////////////////////////////////////////////////////
-#include <wx/module.h>
-#include <wx/sckaddr.h>
-#include <wx/socket.h>
+#include "wx/sckaddr.h"
+#include "wx/socket.h"
+
+
+#if defined(__WXMSW__) || defined(__WXPM__)
+#define PROCESS_EVENTS() wxYield()
+#elif defined(__WXGTK__)
+#include <gtk/gtk.h>
+#define PROCESS_EVENTS() gtk_main_iteration()
+#endif
+
// --------------------------------------------------------------
// ClassInfos
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
#endif
-class wxSocketState : public wxObject {
+class wxSocketState : public wxObject
+{
public:
bool notify_state;
GSocketEventFlags evt_notify_state;
};
// --------------------------------------------------------------
-// --------- wxSocketBase CONSTRUCTOR ---------------------------
+// wxSocketBase ctor and dtor
// --------------------------------------------------------------
+
wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
wxSocketBase::wxSockType _type) :
wxEvtHandler(),
- m_socket(NULL), m_flags(_flags), m_type(_type),
- m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
- m_lcount(0), m_timeout(600),
+ 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_cbk(NULL), m_cdata(NULL),
- m_connected(FALSE), m_notify_state(FALSE), m_id(-1),
- m_defering(NO_DEFER),
- m_states()
+ m_defering(NO_DEFER), m_defer_buffer(NULL), m_defer_timer(NULL),
+ m_cbk(NULL), m_cdata(NULL)
{
}
wxSocketBase::wxSocketBase() :
wxEvtHandler(),
- m_socket(NULL), m_flags(SPEED | WAITALL), m_type(SOCK_UNINIT),
- m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
- m_lcount(0), m_timeout(600),
+ 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_cbk(NULL), m_cdata(NULL),
- m_connected(FALSE), m_notify_state(FALSE), m_id(-1),
- m_defering(NO_DEFER),
- m_states()
+ m_defering(NO_DEFER), m_defer_buffer(NULL), m_defer_timer(NULL),
+ m_cbk(NULL), m_cdata(NULL)
{
}
-// --------------------------------------------------------------
-// wxSocketBase destructor
-// --------------------------------------------------------------
-
wxSocketBase::~wxSocketBase()
{
if (m_unread)
free(m_unread);
- // At last, close the file descriptor.
+ // Shutdown and close the socket
Close();
+ // Destroy the GSocket object
if (m_socket)
GSocket_destroy(m_socket);
}
{
if (m_socket)
{
- if (m_notify_state == TRUE)
- Notify(FALSE);
+ // Disable callbacks
+ GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+ GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
- // Shutdown the connection.
+ // Shutdown the connection
GSocket_Shutdown(m_socket);
m_connected = FALSE;
+ m_establishing = FALSE;
}
return TRUE;
}
// --------------------------------------------------------------
-// wxSocketBase base IO function
+// wxSocketBase basic IO operations
// --------------------------------------------------------------
-class _wxSocketInternalTimer: public wxTimer {
- public:
+
+// 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;
- int m_new_val;
+ unsigned long m_new_val;
void Notify()
- {
- *m_state = m_new_val; // Change the value
- }
+ {
+ *m_state = m_new_val; // Change the value
+ }
};
-int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
+wxUint32 wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
{
- GSocketEventFlags old_event_flags;
- bool old_notify_state;
// 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;
- // Save the old state.
- old_event_flags = NeededReq();
- old_notify_state = m_notify_state;
-
- // Set the new async flag.
- SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
- Notify(TRUE);
-
// 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 = (int)NULL;
+ timer.m_new_val = 0;
timer.Start(m_timeout * 1000, FALSE);
- // Wait for buffer completion.
+ // 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)
- wxYield();
+ PROCESS_EVENTS();
timer.Stop();
- // Restore the old state.
- Notify(old_notify_state);
- SetNotify(old_event_flags);
-
// 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, size_t nbytes)
+wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes)
{
- int ret = 1;
+ // Mask read events
+ m_reading = TRUE;
- m_lcount = GetPushback(buffer, nbytes, FALSE);
- nbytes -= m_lcount;
- buffer += m_lcount;
+ m_lcount = _Read(buffer, nbytes);
- if (!m_connected)
- return *this;
+ // 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);
- // 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;
- }
+ // Trigger another read event if there is still data available.
+ m_reading = FALSE;
+ // TODO: TriggerRead
- if ((m_flags & SPEED) != 0) {
+ return *this;
+}
- if ((m_flags & WAITALL) != 0) {
- while (ret > 0 && nbytes > 0) {
- ret = GSocket_Read(m_socket, buffer, nbytes);
- m_lcount += ret;
- buffer += ret;
- nbytes -= ret;
- }
- // In case the last call was an error ...
- if (ret < 0)
- m_lcount ++;
- } else {
+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);
- if (ret > 0)
- m_lcount += ret;
+ 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);
- } else {
+ if (ret > 0)
+ total += ret;
+ }
+ else // NONE or WAITALL
+ {
ret = DeferRead(buffer, nbytes);
if (ret > 0)
- m_lcount += ret;
+ total += ret;
}
- return *this;
+ return total;
}
-wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
{
- unsigned long len, len2, sig;
- struct {
- char sig[4];
- char len[4];
+#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;
- // sig should be an explicit 32-bit unsigned integer; I've seen
- // compilers in which size_t was actually a 16-bit unsigned integer
+ // Mask read events
+ m_reading = TRUE;
- Read((char *)&msg, sizeof(msg));
- if (m_lcount != sizeof(msg))
- return *this;
+ total = 0;
+ error = TRUE;
+ old_flags = m_flags;
+ SetFlags((m_flags & SPEED) | WAITALL);
- sig = msg.sig[0] & 0xff;
- sig |= (size_t)(msg.sig[1] & 0xff) << 8;
- sig |= (size_t)(msg.sig[2] & 0xff) << 16;
- sig |= (size_t)(msg.sig[3] & 0xff) << 24;
+ if (_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)
- 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 is incorrectly computed in the original; this sequence is
- // the fix
- if (len > nbytes) {
+ {
+ wxLogMessage(T("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;
- // the "len &&" in the following statement is necessary so that
- // we don't attempt to read (and possibly hang the system)
- // if the message was zero bytes long
- if (len && Read(buffer, len).LastCount() != len)
- return *this;
- if (len2 && (Read(NULL, len2).LastCount() != len2))
- return *this;
- 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
+ // 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)
- wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));
+ {
+ //wxLogMessage(T("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, size_t nbytes)
+wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes)
{
- Read(buffer, nbytes);
- CreatePushbackAfter(buffer, 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);
+
+ // Trigger another read event if there is still data available.
+ m_reading = FALSE;
+
+ // TODO: TriggerRead
return *this;
}
-int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
+wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
{
- GSocketEventFlags old_event_flags;
- bool old_notify_state;
// Timer for timeout
_wxSocketInternalTimer timer;
wxASSERT(m_defering == NO_DEFER);
+ //wxLogMessage("Entrando a DeferWrite");
m_defering = DEFER_WRITE;
- // Save the old state
- old_event_flags = NeededReq();
- old_notify_state = m_notify_state;
-
- SetNotify(GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);
- Notify(TRUE);
-
// 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 = (int)NULL;
+ timer.m_new_val = 0;
- m_defer_timer = &timer;
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))
+ {
+ //wxLogMessage("Llamando al primer DoDefer");
+ DoDefer();
+ }
+
+ // Wait for buffer completion.
while (m_defer_buffer != NULL)
- wxYield();
+ PROCESS_EVENTS();
- // Stop timer
- m_defer_timer = NULL;
timer.Stop();
- // Restore the old state
- Notify(old_notify_state);
- SetNotify(old_event_flags);
-
+ // 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, size_t nbytes)
+wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes)
{
- int ret;
+ // Mask write events
+ m_writing = TRUE;
- if ((m_flags & SPEED) != 0)
- ret = GSocket_Write(m_socket, buffer, nbytes);
+ 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
- ret = DeferWrite(buffer, nbytes);
+ m_error = (m_lcount == 0);
- if (ret != -1)
- m_lcount += ret;
+ // Trigger another write event if the socket is still writable
+ m_writing = FALSE;
+ // TODO: TriggerWrite
return *this;
}
-wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
+wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes)
+{
+ 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 {
- char sig[4];
- char len[4];
+ 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)
+# pragma warning(disable: 4310)
#endif // __VISUALC__
- 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.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;
- Write((char *)&msg, sizeof(msg));
+ 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)
+# pragma warning(default: 4310)
#endif // __VISUALC__
}
-wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes)
{
- m_lcount = 0;
- if (nbytes != 0) {
- CreatePushbackAfter(buffer, nbytes);
- m_lcount = nbytes;
- }
- return *this;
-}
+ if (nbytes != 0)
+ Pushback(buffer, nbytes);
-bool wxSocketBase::IsData() const
-{
- if (!m_socket)
- return FALSE;
+ m_error = FALSE;
+ m_lcount = nbytes;
- return (GSocket_DataAvailable(m_socket));
+ return *this;
}
-void wxSocketBase::DoDefer(GSocketEvent req_evt)
+void wxSocketBase::DoDefer()
{
int ret;
- if (req_evt == GSOCK_LOST) {
- Close();
- m_defer_buffer = NULL;
+ if (!m_defer_buffer)
return;
- }
- switch (m_defering) {
- case DEFER_READ:
- ret = GSocket_Read(m_socket, m_defer_buffer, m_defer_nbytes);
- break;
- case DEFER_WRITE:
- ret = GSocket_Write(m_socket, m_defer_buffer, m_defer_nbytes);
- break;
- default:
- ret = -1;
- break;
- }
- m_defer_nbytes -= ret;
+ 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;
+ }
- if (ret < 0)
- m_defer_nbytes++;
+ if (ret >= 0)
+ m_defer_nbytes -= ret;
- // If we are waiting for all bytes to be acquired, keep the defering modei
- // enabled.
- if ((m_flags & WAITALL) == 0 || m_defer_nbytes == 0 || ret < 0) {
+ // 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;
- Notify(FALSE);
- } else {
+ }
+ else
+ {
m_defer_buffer += ret;
m_defer_timer->Start(m_timeout * 1000, FALSE);
}
+
+ //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;
- SaveState();
- SetFlags(NOWAIT | SPEED);
+ // Mask read events
+ m_reading = TRUE;
+
+ old_flags = m_flags;
+ SetFlags(NOWAIT);
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;
+
+ // Trigger another read event if there is still data available.
+ m_reading = FALSE;
+
+ // TODO: TriggerRead
+ return *this;
#undef MAX_BUFSIZE
}
// --------------------------------------------------------------
-// wxSocketBase socket info functions
+// wxSocketBase get local or peer addresses
// --------------------------------------------------------------
bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
}
// --------------------------------------------------------------
-// wxSocketBase wait functions
+// wxSocketBase save and restore socket state
// --------------------------------------------------------------
void wxSocketBase::SaveState()
delete state;
}
-// --------------------------------------------------------------
-// --------- wxSocketBase callback functions --------------------
-// --------------------------------------------------------------
-
-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
-{
- wxSockCbk old_cbk = cbk_;
-
- m_cbk = cbk_;
- return old_cbk;
-}
-
-char *wxSocketBase::CallbackData(char *data)
-{
- char *old_data = m_cdata;
-
- m_cdata = data;
- return old_data;
-}
// --------------------------------------------------------------
-// --------- wxSocketBase wait functions ------------------------
+// wxSocketBase Wait functions
// --------------------------------------------------------------
-static void wx_socket_wait(GSocket *socket, GSocketEvent event, char *cdata)
-{
- int *state = (int *)cdata;
-
- *state = event;
-}
+// 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, int type)
+bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
{
- bool old_notify_state = m_notify_state;
- int state = -1;
+ GSocketEventFlags result;
_wxSocketInternalTimer timer;
+ long timeout;
+ int state = -1;
- if (!m_connected || !m_socket)
+ // Check for valid socket
+ if (!m_socket)
return FALSE;
- // Set the variable to change
- timer.m_state = &state;
- timer.m_new_val = GSOCK_MAX_EVENT;
+ // If it is not a server, it must be connected or establishing connection
+ if ((m_type != SOCK_SERVER) && (!m_connected && !m_establishing))
+ return FALSE;
- // Disable the previous handler
- Notify(FALSE);
+ // Check for valid timeout value
+ if (seconds != -1)
+ timeout = seconds * 1000 + milliseconds;
+ else
+ timeout = m_timeout * 1000;
- // Set the timeout
- timer.Start(seconds * 1000 + milliseconds, TRUE);
- GSocket_SetCallback(m_socket, type, wx_socket_wait, (char *)&state);
+ // Activate timer
+ if (timeout)
+ {
+ timer.m_state = &state;
+ timer.m_new_val = 0;
+ timer.Start(timeout, TRUE);
+ }
- while (state == -1)
- wxYield();
+ // 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);
- GSocket_UnsetCallback(m_socket, type);
- timer.Stop();
+ // 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;
+ }
+
+ // 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;
+ }
+ }
- // Notify will restore automatically the old GSocket flags
- Notify(old_notify_state);
+ if (timeout != 0)
+ PROCESS_EVENTS();
+ }
+ while ((state == -1) && timeout);
- return (state != GSOCK_MAX_EVENT);
+ timer.Stop();
+ return FALSE;
}
bool wxSocketBase::Wait(long seconds, long milliseconds)
{
- return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
- GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+ 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, GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+ // 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, GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);
+ return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);
}
bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
}
-// --------------------------------------------------------------
-// --------- wxSocketBase callback management -------------------
-// --------------------------------------------------------------
-
-GSocketEventFlags wxSocketBase::EventToNotify(GSocketEvent evt)
+void wxSocketBase::SetTimeout(long seconds)
{
- 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;
- default:
- return 0;
- }
- return 0;
+ m_timeout = seconds;
+
+ if (m_socket)
+ GSocket_SetTimeout(m_socket, m_timeout);
}
+// --------------------------------------------------------------
+// wxSocketBase flags
+// --------------------------------------------------------------
+
void wxSocketBase::SetFlags(wxSockFlags _flags)
{
m_flags = _flags;
}
-wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
+// --------------------------------------------------------------
+// wxSocketBase callback management
+// --------------------------------------------------------------
+
+wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
{
- return m_flags;
+ wxSockCbk old_cbk = cbk_;
+
+ m_cbk = cbk_;
+ return old_cbk;
}
-void wxSocketBase::SetNotify(GSocketEventFlags flags)
+char *wxSocketBase::CallbackData(char *data)
{
- /* Check if server */
- if (m_type != SOCK_SERVER)
- flags &= ~GSOCK_CONNECTION_FLAG;
+ char *old_data = m_cdata;
- m_neededreq = flags;
- if (m_neededreq == 0)
- Notify(FALSE);
- else
- Notify(m_notify_state);
+ m_cdata = data;
+ return old_data;
}
// --------------------------------------------------------------
-// Automatic notifier
+// wxSocketBase automatic notifier
// --------------------------------------------------------------
-static void wx_socket_fallback(GSocket *socket, GSocketEvent event, char *cdata)
+// 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)
{
wxSocketBase *sckobj = (wxSocketBase *)cdata;
- sckobj->OnRequest(event);
+ sckobj->OnRequest((wxSocketNotify)event);
}
-void wxSocketBase::Notify(bool notify)
+wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
{
- m_notify_state = notify;
- if (!m_socket)
- return;
+ 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;
+}
- GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
- GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
- if (!notify)
- return;
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)
+{
+ m_neededreq = flags;
+}
- GSocket_SetCallback(m_socket, m_neededreq, wx_socket_fallback, (char *)this);
+void wxSocketBase::Notify(bool notify)
+{
+ m_notify_state = notify;
}
-void wxSocketBase::OnRequest(GSocketEvent req_evt)
+void wxSocketBase::OnRequest(wxSocketNotify req_evt)
{
wxSocketEvent event(m_id);
- GSocketEventFlags notify = EventToNotify(req_evt);
+ wxSocketEventFlags flag = EventToNotify(req_evt);
+
+ // fprintf(stderr, "%s: Entering OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
+
+ // 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;
+ }
- if (m_defering != NO_DEFER) {
- DoDefer(req_evt);
+ // 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;
}
- if ((m_neededreq & notify) == notify) {
+ 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;
+ event.m_skevt = req_evt;
ProcessEvent(event);
OldOnNotify(req_evt);
+
+ if (m_cbk)
+ m_cbk(*this, req_evt, m_cdata);
}
- if (req_evt == GSOCK_LOST)
- Close();
+ // fprintf(stderr, "%s: Exiting OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
}
-void wxSocketBase::OldOnNotify(GSocketEvent 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)
{
if (m_unread == NULL)
m_unread = (char *)malloc(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-m_unrd_cur))
size = m_unrd_size-m_unrd_cur;
+
memcpy(buffer, (m_unread+m_unrd_cur), size);
if (!peek) {
// wxSocketServer
// --------------------------------------------------------------
+// --------------------------------------------------------------
+// wxSocketServer ctor and dtor
+// --------------------------------------------------------------
+
wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
wxSockFlags flags) :
wxSocketBase(flags, SOCK_SERVER)
{
+ // 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) {
+ if (GSocket_SetServer(m_socket) != GSOCK_NOERROR)
+ {
GSocket_destroy(m_socket);
m_socket = NULL;
return;
}
- Notify(TRUE);
+ 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)
{
GSocket *child_socket;
+ if (!m_socket)
+ return FALSE;
+
+ // GRG: If wait == FALSE, then the call should be nonblocking.
+ // When we are finished, we put the socket to blocking mode
+ // again.
+
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, TRUE);
+
child_socket = GSocket_WaitConnection(m_socket);
+ 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_socket = child_socket;
sock.m_connected = TRUE;
+ 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;
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)
{
+ GSocketError err;
+
if (IsConnected())
Close();
if (m_socket)
GSocket_destroy(m_socket);
- // Initializes all socket stuff ...
- // --------------------------------
+ // Initialize all socket stuff ...
m_socket = GSocket_new();
+ m_connected = FALSE;
+ m_establishing = FALSE;
if (!m_socket)
return FALSE;
- m_connected = 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);
+
+ // GRG: If wait == FALSE, then the call should be nonblocking.
+ // When we are finished, we put the socket to blocking mode
+ // again.
+
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, TRUE);
- // Update the flags of m_socket.
- SetFlags(m_flags);
GSocket_SetPeer(m_socket, addr_man.GetAddress());
- if (GSocket_Connect(m_socket, GSOCK_STREAMED) != GSOCK_NOERROR)
- return FALSE;
+ err = GSocket_Connect(m_socket, GSOCK_STREAMED);
+
+ if (!wait)
+ GSocket_SetNonBlocking(m_socket, FALSE);
- // Enables bg events.
- // ------------------
- Notify(TRUE);
+ if (err != GSOCK_NOERROR)
+ {
+ if (err == GSOCK_WOULDBLOCK)
+ m_establishing = TRUE;
+
+ return FALSE;
+ }
m_connected = TRUE;
return TRUE;
}
-bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
+bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
{
- int ret = _Wait(seconds, microseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+ if (m_connected) // Already connected
+ return TRUE;
- if (ret)
- m_connected = TRUE;
-
- return m_connected;
-}
+ if (!m_establishing || !m_socket) // No connection in progress
+ return FALSE;
-void wxSocketClient::OnRequest(GSocketEvent evt)
-{
- if (evt == GSOCK_CONNECTION)
- {
- if (m_connected)
- {
- m_neededreq &= ~GSOCK_CONNECTION_FLAG;
- return;
- }
- m_connected = TRUE;
- return;
- }
- wxSocketBase::OnRequest(evt);
+ return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
}
// --------------------------------------------------------------
projects / wxWidgets.git / blobdiff