/////////////////////////////////////////////////////////////////////////////
// wxWindows headers
/////////////////////////////////////////////////////////////////////////////
+
#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 <stdlib.h>
#include <string.h>
/////////////////////////////////////////////////////////////////////////////
// wxSocket headers
/////////////////////////////////////////////////////////////////////////////
+
#include "wx/sckaddr.h"
#include "wx/socket.h"
-#if defined(__WXMSW__)
#define PROCESS_EVENTS() wxYield()
-#elif defined(__WXGTK__)
-#include <gtk/gtk.h>
-#define PROCESS_EVENTS() gtk_main_iteration()
-#endif
// --------------------------------------------------------------
// ClassInfos
// --------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
+
IMPLEMENT_CLASS(wxSocketBase, wxObject)
IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
-#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;
+ bool m_notify_state;
+ GSocketEventFlags m_neededreq;
+ wxSockFlags m_flags;
+ wxSocketBase::wxSockCbk m_cbk;
+ char *m_cdata;
public:
wxSocketState() : wxObject() {}
// wxSocketBase ctor and dtor
// --------------------------------------------------------------
-wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
- wxSocketBase::wxSockType _type) :
+wxSocketBase::wxSocketBase(wxSockFlags _flags, wxSockType _type) :
wxEvtHandler(),
m_socket(NULL), m_id(-1),
m_flags(_flags), m_type(_type),
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_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::Close()
{
+ // Interrupt pending waits
+ InterruptAllWaits();
+
if (m_socket)
{
// Disable callbacks
void Notify()
{
- *m_state = m_new_val; // Change the value
+ *m_state = (int)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
// If the socket is not connected, or we have got the whole
// needed buffer, return immedately
- if (!m_connected || !m_socket || !nbytes)
+ if (!m_connected || !m_socket || !nbytes)
return total;
// Possible combinations (they are checked in this order)
- // NOWAIT
- // SPEED | WAITALL
- // SPEED
- // WAITALL
- // NONE
+ // wxSOCKET_NOWAIT
+ // wxSOCKET_WAITALL | wxSOCKET_BLOCK
+ // wxSOCKET_WAITALL
+ // 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);
if (ret > 0)
total += ret;
}
- else if ((m_flags & SPEED) && (m_flags & WAITALL)) // SPEED, WAITALL
+ else if (m_flags & wxSOCKET_WAITALL) // wxSOCKET_WAITALL
{
while (ret > 0 && nbytes > 0)
{
+ if (!(m_flags & wxSOCKET_BLOCK) && !(WaitForRead()))
+ break;
+
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;
+ if (ret > 0)
+ {
+ total += ret;
+ buffer += ret;
+ nbytes -= ret;
+ }
+ }
}
- else // NONE or WAITALL
+ else
{
- ret = DeferRead(buffer, nbytes);
+ if ((m_flags & wxSOCKET_BLOCK) || WaitForRead())
+ {
+ ret = GSocket_Read(m_socket, buffer, nbytes);
- if (ret > 0)
- total += ret;
+ if (ret > 0)
+ total += ret;
+ }
}
return total;
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))
goto exit;
if (sig != 0xfeeddead)
{
- wxLogMessage(_T("Warning: invalid signature returned to ReadMsg"));
+ wxLogWarning( _("TCP: invalid signature returned to ReadMsg."));
goto exit;
}
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 (sig != 0xdeadfeed)
{
- //wxLogMessage(_T("Warning: invalid signature returned to ReadMsg"));
+ //wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg"));
goto exit;
}
m_lcount = _Read(buffer, nbytes);
Pushback(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);
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)
{
// Mask write events
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);
return 0;
// Possible combinations (they are checked in this order)
- // NOWAIT
- // SPEED | WAITALL
- // SPEED
- // WAITALL
- // NONE
+ // wxSOCKET_NOWAIT
+ // wxSOCKET_WAITALL | wxSOCKET_BLOCK
+ // wxSOCKET_WAITALL
+ // 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);
if (ret > 0)
total = ret;
}
- else if ((m_flags & SPEED) && (m_flags & WAITALL)) // SPEED, WAITALL
+ else if (m_flags & wxSOCKET_WAITALL)
{
while (ret > 0 && nbytes > 0)
{
+ if (!(m_flags & wxSOCKET_BLOCK) && !(WaitForWrite()))
+ break;
+
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;
+ if (ret > 0)
+ {
+ total += ret;
+ buffer += ret;
+ nbytes -= ret;
+ }
+ }
}
- else // NONE or WAITALL
+ else
{
- ret = DeferWrite(buffer, nbytes);
+ if ((m_flags & wxSOCKET_BLOCK) || WaitForWrite())
+ {
+ ret = GSocket_Write(m_socket, buffer, nbytes);
- if (ret > 0)
- total = ret;
+ if (ret > 0)
+ total = ret;
+ }
}
return total;
error = TRUE;
total = 0;
old_flags = m_flags;
- SetFlags((m_flags & SPEED) | WAITALL);
+ SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
// warning about 'cast truncates constant value'
#ifdef __VISUALC__
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)
m_reading = TRUE;
old_flags = m_flags;
- SetFlags(NOWAIT);
+ SetFlags(wxSOCKET_NOWAIT);
while (recv_size == MAX_BUFSIZE)
{
// TODO: TriggerRead
return *this;
-
+
#undef MAX_BUFSIZE
}
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;
+ state->m_notify_state = m_notify_state;
+ state->m_neededreq = m_neededreq;
+ state->m_flags = m_flags;
+ state->m_cbk = m_cbk;
+ state->m_cdata = m_cdata;
m_states.Append(state);
}
state = (wxSocketState *)node->Data();
- SetFlags(state->socket_flags);
- m_neededreq = state->evt_notify_state;
- m_cbk = state->c_callback;
- m_cdata = state->c_callback_data;
- Notify(state->notify_state);
+ SetFlags(state->m_flags);
+ m_cbk = state->m_cbk;
+ m_cdata = state->m_cdata;
+ m_neededreq = state->m_neededreq;
+ Notify(state->m_notify_state);
delete node;
delete state;
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;
{
timer.m_state = &state;
timer.m_new_val = 0;
- timer.Start(timeout, TRUE);
+ timer.Start((int)timeout, TRUE);
}
// Active polling (without using events)
//
// Do this at least once (important if timeout == 0, when
// we are just polling)
- do
+ //
+ while (state == -1)
{
result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);
if (result & GSOCK_LOST_FLAG)
{
timer.Stop();
- m_defer_buffer = NULL;
Close();
return TRUE;
}
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) )
+ if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
{
-/* TODO: remove this
- if (m_defer_buffer == NULL)
-*/
- {
- timer.Stop();
- return TRUE;
- }
+ timer.Stop();
+ return TRUE;
}
- if (timeout != 0)
- PROCESS_EVENTS();
+ // Wait more?
+ if ((timeout == 0) || (m_interrupt))
+ break;
+
+ PROCESS_EVENTS();
}
- while ((state == -1) && timeout);
timer.Stop();
return FALSE;
m_timeout = seconds;
if (m_socket)
- GSocket_SetTimeout(m_socket, m_timeout);
+ GSocket_SetTimeout(m_socket, m_timeout * 1000);
}
// --------------------------------------------------------------
{
m_flags = _flags;
}
-
+
// --------------------------------------------------------------
// wxSocketBase callback management
// --------------------------------------------------------------
// 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
+ // NOTE: this duplicates some of the code in _Wait, (lost
+ // connections and delayed connection establishment) 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 (req_evt)
{
- case wxSOCKET_CONNECTION:
+ 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 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;
+ //
+ case wxSOCKET_INPUT:
+ if (m_reading) return;
+
+ case wxSOCKET_OUTPUT:
+ if (m_writing) return;
}
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);
+ ProcessEvent(event); // XXX - should be PostEvent
+ OldOnNotify(req_evt);
if (m_cbk)
m_cbk(*this, req_evt, m_cdata);
+
}
// fprintf(stderr, "%s: Exiting OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
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);
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);
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);
projects / wxWidgets.git / blobdiff