// Purpose: Socket handler classes
// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia
// Created: April 1997
-// Updated: September 1999
-// Copyright: (C) 1999, 1998, 1997, Guilhem Lavaux
-// (C) 1999, Guillermo Rodriguez Garcia
+// 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"
#endif
#if wxUSE_SOCKETS
-/////////////////////////////////////////////////////////////////////////////
-// wxWindows headers
-/////////////////////////////////////////////////////////////////////////////
+#include "wx/app.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/module.h"
#include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/event.h"
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#if wxUSE_GUI
+ #include "wx/gdicmn.h" // for wxPendingDelete
+#endif // wxUSE_GUI
-/////////////////////////////////////////////////////////////////////////////
-// wxSocket headers
-/////////////////////////////////////////////////////////////////////////////
#include "wx/sckaddr.h"
#include "wx/socket.h"
+// --------------------------------------------------------------------------
+// macros and constants
+// --------------------------------------------------------------------------
+
+// discard buffer
+#define MAX_DISCARD_SIZE (10 * 1024)
-#if defined(__WXMSW__)
-#define PROCESS_EVENTS() wxYield()
-#elif defined(__WXGTK__)
-#include <gtk/gtk.h>
-#define PROCESS_EVENTS() gtk_main_iteration()
-#endif
+// 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(wxDatagramSocket, wxSocketBase)
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
-#endif
+
+// --------------------------------------------------------------------------
+// private classes
+// --------------------------------------------------------------------------
class wxSocketState : public wxObject
{
public:
- bool notify_state;
- GSocketEventFlags evt_notify_state;
- wxSocketBase::wxSockFlags socket_flags;
- wxSocketBase::wxSockCbk c_callback;
- char *c_callback_data;
+ 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
public:
wxSocketState() : wxObject() {}
};
-// --------------------------------------------------------------
-// wxSocketBase ctor and dtor
-// --------------------------------------------------------------
-
-wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
- wxSocketBase::wxSockType _type) :
- wxEvtHandler(),
- 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)
+// ==========================================================================
+// wxSocketBase
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// Initialization and shutdown
+// --------------------------------------------------------------------------
+
+// FIXME-MT: all this is MT-unsafe, of course, we should protect all accesses
+// to m_countInit with a crit section
+size_t wxSocketBase::m_countInit = 0;
+
+bool wxSocketBase::IsInitialized()
{
+ return m_countInit > 0;
}
-wxSocketBase::wxSocketBase() :
- wxEvtHandler(),
- 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)
+bool wxSocketBase::Initialize()
{
+ if ( !m_countInit++ )
+ {
+ if ( !GSocket_Init() )
+ {
+ m_countInit--;
+
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
+void wxSocketBase::Shutdown()
+{
+ // we should be initialized
+ wxASSERT_MSG( m_countInit, _T("extra call to Shutdown()") );
+ if ( !--m_countInit )
+ {
+ GSocket_Cleanup();
+ }
+}
+
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------
+
+void wxSocketBase::Init()
+{
+ 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;
+
+ // pushback buffer
+ m_unread = NULL;
+ m_unrd_size = 0;
+ m_unrd_cur = 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
+
+ if ( !IsInitialized() )
+ {
+ // this Initialize() will be undone by wxSocketModule::OnExit(), all the
+ // other calls to it should be matched by a call to Shutdown()
+ Initialize();
+ }
+}
+
+wxSocketBase::wxSocketBase()
+{
+ Init();
+}
+
+wxSocketBase::wxSocketBase(wxSocketFlags flags, wxSocketType type)
+{
+ Init();
+
+ m_flags = flags;
+ m_type = type;
}
wxSocketBase::~wxSocketBase()
{
- if (m_unread)
- free(m_unread);
+ // 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
- Close();
+ 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);
}
-bool wxSocketBase::Close()
+bool wxSocketBase::Destroy()
{
- if (m_socket)
- {
- // Disable callbacks
- GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
- GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
+ // 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;
- // Shutdown the connection
- GSocket_Shutdown(m_socket);
- m_connected = FALSE;
- m_establishing = FALSE;
- }
+ // Shutdown and close the socket
+ Close();
+
+ // Supress events from now on
+ Notify(FALSE);
+
+#if wxUSE_GUI
+ if ( !wxPendingDelete.Member(this) )
+ wxPendingDelete.Append(this);
+#else
+ delete this;
+#endif
return TRUE;
}
-// --------------------------------------------------------------
-// wxSocketBase basic IO operations
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Basic IO calls
+// --------------------------------------------------------------------------
-// All IO operations {Read, Write, ReadMsg, WriteMsg, Peek,
-// Unread, Discard} update m_error and m_lcount.
+// 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?
-class _wxSocketInternalTimer: public wxTimer
+bool wxSocketBase::Close()
{
-public:
- int *m_state;
- unsigned long m_new_val;
+ // Interrupt pending waits
+ InterruptWait();
- void Notify()
+ if (m_socket)
{
- *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);
+ // Disable callbacks
+ GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+ GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
- // 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();
+ // Shutdown the connection
+ GSocket_Shutdown(m_socket);
}
- // 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;
+ m_connected = FALSE;
+ m_establishing = FALSE;
+ return TRUE;
}
-wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::Read(void* 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)
+ // 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);
- // Trigger another read event if there is still data available.
+ // Allow read events from now on
m_reading = FALSE;
- // TODO: TriggerRead
return *this;
}
-wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes)
+wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
{
int total;
int ret = 1;
- // we try this even if the connection has already been closed.
+ // Try the pushback buffer first
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)
+ 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)
- // NOWAIT
- // SPEED | WAITALL
- // SPEED
- // WAITALL
- // NONE
+ // wxSOCKET_NOWAIT
+ // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)
+ // wxSOCKET_BLOCK
+ // wxSOCKET_NONE
//
- if (m_flags & NOWAIT) // NOWAIT
+ if (m_flags & wxSOCKET_NOWAIT)
{
- GSocket_SetNonBlocking(m_socket, TRUE);
- ret = GSocket_Read(m_socket, buffer, nbytes);
- GSocket_SetNonBlocking(m_socket, FALSE);
+ GSocket_SetNonBlocking(m_socket, 1);
+ ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
+ GSocket_SetNonBlocking(m_socket, 0);
if (ret > 0)
total += ret;
}
- else if ((m_flags & SPEED) && (m_flags & WAITALL)) // SPEED, WAITALL
+ else
{
- while (ret > 0 && nbytes > 0)
+ bool more = TRUE;
+
+ while (more)
{
- 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 ( !(m_flags & wxSOCKET_BLOCK) && !WaitForRead() )
+ break;
- if (ret > 0)
- total += ret;
- }
- else // NONE or WAITALL
- {
- ret = DeferRead(buffer, nbytes);
+ ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
- if (ret > 0)
- total += ret;
+ if (ret > 0)
+ {
+ total += ret;
+ nbytes -= ret;
+ buffer = (char *)buffer + ret;
+ }
+
+ // 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));
+ }
}
return total;
}
-wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)
{
-#define MAX_DISCARD_SIZE (10 * 1024)
-
wxUint32 len, len2, sig, total;
bool error;
int old_flags;
total = 0;
error = TRUE;
old_flags = m_flags;
- SetFlags((m_flags & SPEED) | WAITALL);
+ SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
- if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg))
+ if (_Read(&msg, sizeof(msg)) != sizeof(msg))
goto exit;
sig = (wxUint32)msg.sig[0];
if (sig != 0xfeeddead)
{
- wxLogMessage(_T("Warning: invalid signature returned to ReadMsg"));
+ wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
goto exit;
}
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;
else
len2 = 0;
- // This check is necessary so that we don't attemp to read if
- // the msg was zero bytes long.
+ // Don't attemp to read if the msg was zero bytes long.
if (len)
{
total = _Read(buffer, len);
do
{
discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2);
- discard_len = _Read(discard_buffer, discard_len);
- len2 -= discard_len;
+ discard_len = _Read(discard_buffer, (wxUint32)discard_len);
+ len2 -= (wxUint32)discard_len;
}
while ((discard_len > 0) && len2);
if (len2 != 0)
goto exit;
}
- if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg))
+ if (_Read(&msg, sizeof(msg)) != sizeof(msg))
goto exit;
sig = (wxUint32)msg.sig[0];
if (sig != 0xdeadfeed)
{
- //wxLogMessage(_T("Warning: invalid signature returned to ReadMsg"));
+ wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
goto exit;
}
m_reading = FALSE;
SetFlags(old_flags);
- // TODO: TriggerRead
return *this;
-
-#undef MAX_DISCARD_SIZE
}
-wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
{
// Mask read events
m_reading = TRUE;
m_lcount = _Read(buffer, nbytes);
- Pushback(buffer, nbytes);
+ Pushback(buffer, m_lcount);
- // If in WAITALL mode, all bytes should have been read.
- if (m_flags & WAITALL)
+ // 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);
- // Trigger another read event if there is still data available.
+ // Allow read events again
m_reading = FALSE;
- // TODO: TriggerRead
return *this;
}
-wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
-{
- // 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))
- {
- //wxLogMessage("Llamando al primer DoDefer");
- DoDefer();
- }
-
- // 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)
+wxSocketBase& wxSocketBase::Write(const void *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)
+ // If in wxSOCKET_WAITALL mode, all bytes should have been written.
+ if (m_flags & wxSOCKET_WAITALL)
m_error = (m_lcount != nbytes);
else
m_error = (m_lcount == 0);
- // Trigger another write event if the socket is still writable
+ // Allow write events again
m_writing = FALSE;
- // TODO: TriggerWrite
return *this;
}
-wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes)
+wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
{
wxUint32 total = 0;
int ret = 1;
- if (!m_connected || !m_socket)
+ // If the socket is invalid or parameters are ill, return immediately
+ if (!m_socket || !buffer || !nbytes)
return 0;
// Possible combinations (they are checked in this order)
- // NOWAIT
- // SPEED | WAITALL
- // SPEED
- // WAITALL
- // NONE
+ // wxSOCKET_NOWAIT
+ // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)
+ // wxSOCKET_BLOCK
+ // wxSOCKET_NONE
//
- if (m_flags & NOWAIT) // NOWAIT
+ if (m_flags & wxSOCKET_NOWAIT)
{
- GSocket_SetNonBlocking(m_socket, TRUE);
- ret = GSocket_Write(m_socket, buffer, nbytes);
- GSocket_SetNonBlocking(m_socket, FALSE);
+ GSocket_SetNonBlocking(m_socket, 1);
+ ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
+ GSocket_SetNonBlocking(m_socket, 0);
if (ret > 0)
total = ret;
}
- else if ((m_flags & SPEED) && (m_flags & WAITALL)) // SPEED, WAITALL
+ else
{
- while (ret > 0 && nbytes > 0)
+ bool more = TRUE;
+
+ while (more)
{
- 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 ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
+ break;
- if (ret > 0)
- total = ret;
- }
- else // NONE or WAITALL
- {
- ret = DeferWrite(buffer, nbytes);
+ ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
- if (ret > 0)
- total = ret;
+ 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));
+ }
}
return total;
}
-wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
{
wxUint32 total;
bool error;
int old_flags;
- struct {
+ struct
+ {
unsigned char sig[4];
unsigned char len[4];
} msg;
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__
+ SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
msg.sig[0] = (unsigned char) 0xad;
msg.sig[1] = (unsigned char) 0xde;
msg.sig[2] = (unsigned char) 0xed;
msg.sig[3] = (unsigned char) 0xfe;
- msg.len[0] = (unsigned char) nbytes & 0xff;
- msg.len[1] = (unsigned char) (nbytes >> 8) & 0xff;
- msg.len[2] = (unsigned char) (nbytes >> 16) & 0xff;
- msg.len[3] = (unsigned char) (nbytes >> 24) & 0xff;
-
- //wxLogMessage("Writemsg: %d %d %d %d -> %d",
- // nbytes & 0xff,
- // (nbytes >> 8) & 0xff,
- // (nbytes >> 16) & 0xff,
- // (nbytes >> 24) & 0xff,
- // nbytes
- // );
+ msg.len[0] = (unsigned char) (nbytes & 0xff);
+ msg.len[1] = (unsigned char) ((nbytes >> 8) & 0xff);
+ msg.len[2] = (unsigned char) ((nbytes >> 16) & 0xff);
+ msg.len[3] = (unsigned char) ((nbytes >> 24) & 0xff);
- if (_Write((char *)&msg, sizeof(msg)) < sizeof(msg))
+ if (_Write(&msg, sizeof(msg)) < sizeof(msg))
goto exit;
total = _Write(buffer, nbytes);
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))
+ if ((_Write(&msg, sizeof(msg))) < sizeof(msg))
goto exit;
// everything was OK
m_lcount = total;
m_writing = FALSE;
- // TODO: TriggerWrite
return *this;
-
-#ifdef __VISUALC__
-# pragma warning(default: 4310)
-#endif // __VISUALC__
}
-wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::Unread(const void *buffer, wxUint32 nbytes)
{
if (nbytes != 0)
Pushback(buffer, nbytes);
return *this;
}
-void wxSocketBase::DoDefer()
-{
- int ret;
-
- 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;
- }
-
- if (ret >= 0)
- m_defer_nbytes -= ret;
-
- // 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);
- }
-
- //wxLogMessage("DoDefer ha transferido %d bytes", ret);
-}
-
wxSocketBase& wxSocketBase::Discard()
{
-#define MAX_BUFSIZE (10*1024)
-
int old_flags;
- char *my_data = new char[MAX_BUFSIZE];
- wxUint32 recv_size = MAX_BUFSIZE;
+ char *buffer = new char[MAX_DISCARD_SIZE];
+ wxUint32 ret;
wxUint32 total = 0;
// Mask read events
m_reading = TRUE;
old_flags = m_flags;
- SetFlags(NOWAIT);
+ SetFlags(wxSOCKET_NOWAIT);
- while (recv_size == MAX_BUFSIZE)
+ do
{
- recv_size = _Read(my_data, MAX_BUFSIZE);
- total += recv_size;
+ ret = _Read(buffer, MAX_DISCARD_SIZE);
+ total += ret;
}
+ while (ret == MAX_DISCARD_SIZE);
- delete [] my_data;
+ delete[] buffer;
m_lcount = total;
- m_error = FALSE;
+ m_error = FALSE;
- // Trigger another read event if there is still data available.
+ // Allow read events again
m_reading = FALSE;
- // TODO: TriggerRead
return *this;
-
-#undef MAX_BUFSIZE
-}
-
-// --------------------------------------------------------------
-// wxSocketBase get local or peer addresses
-// --------------------------------------------------------------
-
-bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
-{
- GAddress *peer;
-
- if (!m_socket)
- return FALSE;
-
- peer = GSocket_GetPeer(m_socket);
- addr_man.SetAddress(peer);
- GAddress_destroy(peer);
-
- return TRUE;
-}
-
-bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
-{
- GAddress *local;
-
- if (!m_socket)
- return FALSE;
-
- local = GSocket_GetLocal(m_socket);
- addr_man.SetAddress(local);
- GAddress_destroy(local);
-
- return TRUE;
}
-// --------------------------------------------------------------
-// wxSocketBase save and restore socket state
-// --------------------------------------------------------------
-
-void wxSocketBase::SaveState()
-{
- wxSocketState *state;
-
- state = new wxSocketState();
-
- state->notify_state = m_notify_state;
- state->evt_notify_state = m_neededreq;
- state->socket_flags = m_flags;
- state->c_callback = m_cbk;
- state->c_callback_data = m_cdata;
-
- m_states.Append(state);
-}
-
-void wxSocketBase::RestoreState()
-{
- wxNode *node;
- wxSocketState *state;
-
- node = m_states.Last();
- if (!node)
- return;
-
- state = (wxSocketState *)node->Data();
-
- SetFlags(state->socket_flags);
- m_neededreq = state->evt_notify_state;
- m_cbk = state->c_callback;
- m_cdata = state->c_callback_data;
- Notify(state->notify_state);
-
- delete node;
- delete state;
-}
-
-
-// --------------------------------------------------------------
-// wxSocketBase Wait functions
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Wait functions
+// --------------------------------------------------------------------------
-// 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.
+// 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.
-bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
+bool wxSocketBase::_Wait(long seconds,
+ long milliseconds,
+ wxSocketEventFlags flags)
{
GSocketEventFlags result;
- _wxSocketInternalTimer timer;
long timeout;
- int state = -1;
+
+ // Set this to TRUE to interrupt ongoing waits
+ m_interrupt = FALSE;
// Check for valid socket
if (!m_socket)
return FALSE;
- // If it is not a server, it must be connected or establishing connection
- if ((m_type != SOCK_SERVER) && (!m_connected && !m_establishing))
- return FALSE;
-
- // Check for valid timeout value
+ // Check for valid timeout value.
if (seconds != -1)
timeout = seconds * 1000 + milliseconds;
else
timeout = m_timeout * 1000;
- // Activate timer
- if (timeout)
- {
- timer.m_state = &state;
- timer.m_new_val = 0;
- timer.Start(timeout, TRUE);
- }
-
- // Active polling (without using events)
+ // Wait in an active polling loop.
//
- // 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.
+ // 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)
- do
+ // 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);
- // 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) )
+ // Data available or output buffer ready
+ if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
{
-/* TODO: remove this
- if (m_defer_buffer == NULL)
-*/
- {
- timer.Stop();
- return TRUE;
- }
+ return TRUE;
+ }
+
+ // Connection lost
+ if (result & GSOCK_LOST_FLAG)
+ {
+ m_connected = FALSE;
+ m_establishing = FALSE;
+ return (flags & GSOCK_LOST_FLAG) != 0;
}
- if (timeout != 0)
+ // Wait more?
+ if ((!timeout) || (chrono.Time() > timeout) || (m_interrupt))
+ done = TRUE;
+ else
PROCESS_EVENTS();
}
- while ((state == -1) && timeout);
- timer.Stop();
return FALSE;
}
bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
{
- // Check pushback buffer
+ // Check pushback buffer before entering _Wait
if (m_unread)
return TRUE;
- return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG);
+ // 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.
+
+ return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+ GSOCK_LOST_FLAG);
}
bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
}
+// --------------------------------------------------------------------------
+// Miscellaneous
+// --------------------------------------------------------------------------
+
+//
+// Get local or peer address
+//
+
+bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
+{
+ GAddress *peer;
+
+ if (!m_socket)
+ return FALSE;
+
+ peer = GSocket_GetPeer(m_socket);
+ addr_man.SetAddress(peer);
+ GAddress_destroy(peer);
+
+ return TRUE;
+}
+
+bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
+{
+ GAddress *local;
+
+ if (!m_socket)
+ return FALSE;
+
+ local = GSocket_GetLocal(m_socket);
+ addr_man.SetAddress(local);
+ GAddress_destroy(local);
+
+ return TRUE;
+}
+
+//
+// Save and restore socket state
+//
+
+void wxSocketBase::SaveState()
+{
+ wxSocketState *state;
+
+ state = new wxSocketState();
+
+ 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
+
+ m_states.Append(state);
+}
+
+void wxSocketBase::RestoreState()
+{
+ wxNode *node;
+ wxSocketState *state;
+
+ node = m_states.Last();
+ if (!node)
+ return;
+
+ state = (wxSocketState *)node->Data();
+
+ 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
+
+ delete node;
+ delete state;
+}
+
+//
+// Timeout and flags
+//
+
void wxSocketBase::SetTimeout(long seconds)
{
m_timeout = seconds;
if (m_socket)
- GSocket_SetTimeout(m_socket, m_timeout);
+ GSocket_SetTimeout(m_socket, m_timeout * 1000);
}
-// --------------------------------------------------------------
-// wxSocketBase flags
-// --------------------------------------------------------------
-
-void wxSocketBase::SetFlags(wxSockFlags _flags)
+void wxSocketBase::SetFlags(wxSocketFlags flags)
{
- m_flags = _flags;
+ m_flags = flags;
}
-
-// --------------------------------------------------------------
-// wxSocketBase callback management
-// --------------------------------------------------------------
+
+
+// --------------------------------------------------------------------------
+// Callbacks (now obsolete - use events instead)
+// --------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY
wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
{
return old_data;
}
-// --------------------------------------------------------------
-// wxSocketBase automatic notifier
-// --------------------------------------------------------------
+#endif // WXWIN_COMPATIBILITY
-// All events (INPUT, OUTPUT, CONNECTION, LOST) are now always
-// internally watched; but users will only be notified of those
-// events they are interested in.
+// --------------------------------------------------------------------------
+// Event handling
+// --------------------------------------------------------------------------
-static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
- GSocketEvent event, char *cdata)
+// 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.
+
+extern "C"
+void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
+ GSocketEvent notification,
+ char *cdata)
{
wxSocketBase *sckobj = (wxSocketBase *)cdata;
- sckobj->OnRequest((wxSocketNotify)event);
+ sckobj->OnRequest((wxSocketNotify) notification);
}
-wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
+void wxSocketBase::OnRequest(wxSocketNotify notification)
{
- 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;
-}
+ // 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.
-void wxSocketBase::SetNotify(wxSocketEventFlags flags)
-{
- m_neededreq = flags;
-}
-
-void wxSocketBase::Notify(bool notify)
-{
- m_notify_state = notify;
-}
-
-void wxSocketBase::OnRequest(wxSocketNotify req_evt)
-{
- wxSocketEvent event(m_id);
- 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)
+ switch(notification)
{
case wxSOCKET_CONNECTION:
m_establishing = FALSE;
m_connected = TRUE;
break;
- case wxSOCKET_LOST:
- m_defer_buffer = NULL;
- Close();
- break;
+
+ // If we are in the middle of a R/W operation, do not
+ // propagate events to users. Also, filter 'late' events
+ // which are no longer valid.
+
case wxSOCKET_INPUT:
+ if (m_reading || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
+ return;
+ break;
+
case wxSOCKET_OUTPUT:
- if (m_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
+ if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
return;
- }
+ break;
+
+ case wxSOCKET_LOST:
+ m_connected = FALSE;
+ m_establishing = FALSE;
+ break;
+
+ default:
break;
}
- // 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))
+ // Schedule the event
+
+ wxSocketEventFlags flag = 0;
+ switch (notification)
{
- // fprintf(stderr, "%s: Swallowed evt %d\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
- return;
+ 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_neededreq & flag) == flag) && m_notify_state)
+ if (((m_eventmask & flag) == flag) && m_notify)
{
- // 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);
+ if (m_handler)
+ {
+ wxSocketEvent event(m_id);
+ event.m_event = notification;
+ event.m_clientData = m_clientData;
+ event.SetEventObject(this);
+ m_handler->AddPendingEvent(event);
+ }
+
+#if WXWIN_COMPATIBILITY
if (m_cbk)
- m_cbk(*this, req_evt, m_cdata);
+ m_cbk(*this, notification, m_cdata);
+#endif // WXWIN_COMPATIBILITY
}
-
- // fprintf(stderr, "%s: Exiting OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
}
-void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt))
+void wxSocketBase::Notify(bool notify)
{
+ m_notify = notify;
}
-// --------------------------------------------------------------
-// wxSocketBase set event handler
-// --------------------------------------------------------------
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)
+{
+ m_eventmask = flags;
+}
-void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
+void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)
{
- SetNextHandler(&h_evt);
- m_id = id;
+ m_handler = &handler;
+ m_id = id;
}
-// --------------------------------------------------------------
-// wxSocketBase pushback
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Pushback buffer
+// --------------------------------------------------------------------------
-void wxSocketBase::Pushback(const char *buffer, wxUint32 size)
+void wxSocketBase::Pushback(const void *buffer, wxUint32 size)
{
+ if (!size) return;
+
if (m_unread == NULL)
- m_unread = (char *)malloc(size);
- else {
- char *tmp;
+ m_unread = malloc(size);
+ else
+ {
+ void *tmp;
- tmp = (char *)malloc(m_unrd_size + size);
- memcpy(tmp+size, m_unread, m_unrd_size);
+ tmp = malloc(m_unrd_size + size);
+ memcpy((char *)tmp + size, m_unread, m_unrd_size);
free(m_unread);
m_unread = tmp;
memcpy(m_unread, buffer, size);
}
-wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek)
+wxUint32 wxSocketBase::GetPushback(void *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);
+ memcpy(buffer, (char *)m_unread + m_unrd_cur, size);
- if (!peek) {
+ if (!peek)
+ {
m_unrd_cur += size;
- if (m_unrd_size == m_unrd_cur) {
+ if (m_unrd_size == m_unrd_cur)
+ {
free(m_unread);
m_unread = NULL;
m_unrd_size = 0;
return size;
}
-// --------------------------------------------------------------
+
+// ==========================================================================
// wxSocketServer
-// --------------------------------------------------------------
+// ==========================================================================
-// --------------------------------------------------------------
-// wxSocketServer ctor and dtor
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Ctor
+// --------------------------------------------------------------------------
wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
- wxSockFlags flags) :
- wxSocketBase(flags, SOCK_SERVER)
+ wxSocketFlags flags)
+ : wxSocketBase(flags, wxSOCKET_SERVER)
{
// Create the socket
m_socket = GSocket_new();
return;
}
- GSocket_SetTimeout(m_socket, m_timeout);
+ 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);
}
-// --------------------------------------------------------------
-// wxSocketServer Accept
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Accept
+// --------------------------------------------------------------------------
bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
{
if (!m_socket)
return FALSE;
- // GRG: If wait == FALSE, then the call should be nonblocking.
+ // 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);
+ GSocket_SetNonBlocking(m_socket, 1);
child_socket = GSocket_WaitConnection(m_socket);
if (!wait)
- GSocket_SetNonBlocking(m_socket, FALSE);
+ GSocket_SetNonBlocking(m_socket, 0);
- // GRG: this was not being handled!
- if (child_socket == NULL)
+ if (!child_socket)
return FALSE;
- sock.m_type = SOCK_INTERNAL;
+ sock.m_type = wxSOCKET_BASE;
sock.m_socket = child_socket;
sock.m_connected = TRUE;
- GSocket_SetTimeout(sock.m_socket, sock.m_timeout);
+ 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);
{
wxSocketBase* sock = new wxSocketBase();
- sock->SetFlags((wxSockFlags)m_flags);
+ sock->SetFlags(m_flags);
if (!AcceptWith(*sock, wait))
- return NULL;
+ {
+ sock->Destroy();
+ sock = NULL;
+ }
return sock;
}
return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
}
-// --------------------------------------------------------------
+// ==========================================================================
// wxSocketClient
-// --------------------------------------------------------------
+// ==========================================================================
-// --------------------------------------------------------------
-// wxSocketClient ctor and dtor
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------
-wxSocketClient::wxSocketClient(wxSockFlags _flags) :
- wxSocketBase(_flags, SOCK_CLIENT)
+wxSocketClient::wxSocketClient(wxSocketFlags flags)
+ : wxSocketBase(flags, wxSOCKET_CLIENT)
{
}
{
}
-// --------------------------------------------------------------
-// wxSocketClient Connect functions
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Connect
+// --------------------------------------------------------------------------
+
bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
{
GSocketError err;
- if (IsConnected())
- Close();
-
- // This should never happen.
if (m_socket)
+ {
+ // Shutdown and destroy the socket
+ Close();
GSocket_destroy(m_socket);
+ }
- // Initialize all socket stuff ...
m_socket = GSocket_new();
m_connected = FALSE;
m_establishing = FALSE;
if (!m_socket)
return FALSE;
- GSocket_SetTimeout(m_socket, m_timeout);
+ 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);
- // GRG: If wait == FALSE, then the call should be nonblocking.
+ // 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);
+ GSocket_SetNonBlocking(m_socket, 1);
GSocket_SetPeer(m_socket, addr_man.GetAddress());
err = GSocket_Connect(m_socket, GSOCK_STREAMED);
if (!wait)
- GSocket_SetNonBlocking(m_socket, FALSE);
+ GSocket_SetNonBlocking(m_socket, 0);
if (err != GSOCK_NOERROR)
{
if (!m_establishing || !m_socket) // No connection in progress
return FALSE;
- return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
+ return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG |
+ GSOCK_LOST_FLAG);
}
-// --------------------------------------------------------------
-// wxSocketEvent
-// --------------------------------------------------------------
+// ==========================================================================
+// wxDatagramSocket
+// ==========================================================================
+
+/* NOTE: experimental stuff - might change */
-wxSocketEvent::wxSocketEvent(int id)
- : wxEvent(id)
+wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr,
+ wxSocketFlags flags )
+ : wxSocketBase( flags, wxSOCKET_DATAGRAM )
{
- wxEventType type = (wxEventType)wxEVT_SOCKET;
+ // Create the socket
+ m_socket = GSocket_new();
+
+ if(!m_socket)
+ return;
+
+ // 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 );
- SetEventType(type);
}
-void wxSocketEvent::CopyObject(wxObject& obj_d) const
+wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,
+ void* buf,
+ wxUint32 nBytes )
{
- wxSocketEvent *event = (wxSocketEvent *)&obj_d;
-
- wxEvent::CopyObject(obj_d);
+ Read(buf, nBytes);
+ GetPeer(addr);
+ return (*this);
+}
- event->m_skevt = m_skevt;
- event->m_socket = m_socket;
+wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
+ const void* buf,
+ wxUint32 nBytes )
+{
+ GSocket_SetPeer(m_socket, addr.GetAddress());
+ Write(buf, nBytes);
+ return (*this);
}
-// --------------------------------------------------------------------------
+// ==========================================================================
// wxSocketModule
-// --------------------------------------------------------------------------
-class WXDLLEXPORT wxSocketModule: public wxModule {
- DECLARE_DYNAMIC_CLASS(wxSocketModule)
- public:
- bool OnInit() {
- return GSocket_Init();
- }
- void OnExit() {
- GSocket_Cleanup();
- }
+// ==========================================================================
+
+class WXDLLEXPORT wxSocketModule : public wxModule
+{
+public:
+ virtual bool OnInit()
+ {
+ // wxSocketBase will call GSocket_Init() itself when/if needed
+ return TRUE;
+ }
+
+ virtual void OnExit()
+ {
+ if ( wxSocketBase::IsInitialized() )
+ wxSocketBase::Shutdown();
+ }
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxSocketModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
projects / wxWidgets.git / blobdiff