X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96db102a93ed103a1c757c4445dd71789c2d0054..7818b39874176b529be814fdfdfb773d8b211d3a:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index dba14f4829..0058d50318 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -3,9 +3,8 @@ // 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 ///////////////////////////////////////////////////////////////////////////// @@ -26,6 +25,8 @@ ///////////////////////////////////////////////////////////////////////////// // wxWindows headers ///////////////////////////////////////////////////////////////////////////// + +#include "wx/app.h" #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -33,42 +34,42 @@ #include "wx/utils.h" #include "wx/module.h" #include "wx/log.h" - -#include -#include -#include +#include "wx/intl.h" ///////////////////////////////////////////////////////////////////////////// // wxSocket headers ///////////////////////////////////////////////////////////////////////////// + #include "wx/sckaddr.h" #include "wx/socket.h" -// GRG: Why is this needed? +// discard buffer +#define MAX_DISCARD_SIZE (10 * 1024) + +// what to do within waits +#define PROCESS_EVENTS() wxYield() -#ifdef __WXGTK__ -#include -#define wxYield() gtk_main_iteration() -#endif +// use wxPostEvent or not +#define EXPERIMENTAL_USE_POST 1 // -------------------------------------------------------------- // 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 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() {} @@ -78,31 +79,28 @@ public: // 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_socket(NULL), m_evt_handler(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::wxSocketBase() : wxEvtHandler(), - m_socket(NULL), m_id(-1), + m_socket(NULL), m_evt_handler(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) { } @@ -122,6 +120,9 @@ wxSocketBase::~wxSocketBase() bool wxSocketBase::Close() { + // Interrupt pending waits + InterruptAllWaits(); + if (m_socket) { // Disable callbacks @@ -154,53 +155,10 @@ public: 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) - wxYield(); - - 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 @@ -208,15 +166,14 @@ wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes) 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; } @@ -233,17 +190,17 @@ wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes) // If the socket is not connected, or we have got the whole // needed buffer, return immedately - if (!m_connected || !m_socket || !nbytes) + if (!m_socket || !m_connected || !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); @@ -252,32 +209,32 @@ wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 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) && !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; @@ -285,8 +242,6 @@ wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes) wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) { -#define MAX_DISCARD_SIZE (10 * 1024) - wxUint32 len, len2, sig, total; bool error; int old_flags; @@ -302,7 +257,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) 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; @@ -314,7 +269,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) if (sig != 0xfeeddead) { - wxLogMessage(_T("Warning: invalid signature returned to ReadMsg")); + wxLogWarning( _("TCP: invalid signature returned to ReadMsg.")); goto exit; } @@ -352,8 +307,8 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) 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); @@ -372,7 +327,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) if (sig != 0xdeadfeed) { - //wxLogMessage(_T("Warning: invalid signature returned to ReadMsg")); + //wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg")); goto exit; } @@ -385,10 +340,7 @@ exit: m_reading = FALSE; SetFlags(old_flags); - // TODO: TriggerRead return *this; - -#undef MAX_DISCARD_SIZE } wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes) @@ -397,66 +349,20 @@ wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes) 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) - wxYield(); - - 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 @@ -464,16 +370,15 @@ wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes) 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; } @@ -486,13 +391,13 @@ wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes) 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); @@ -501,32 +406,32 @@ wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 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; @@ -548,7 +453,7 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes) 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__ @@ -598,7 +503,6 @@ exit: m_lcount = total; m_writing = FALSE; - // TODO: TriggerWrite return *this; #ifdef __VISUALC__ @@ -617,61 +521,22 @@ wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 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 *my_data = new char[MAX_DISCARD_SIZE]; + wxUint32 recv_size = MAX_DISCARD_SIZE; wxUint32 total = 0; // Mask read events m_reading = TRUE; old_flags = m_flags; - SetFlags(NOWAIT); + SetFlags(wxSOCKET_NOWAIT); - while (recv_size == MAX_BUFSIZE) + while (recv_size == MAX_DISCARD_SIZE) { - recv_size = _Read(my_data, MAX_BUFSIZE); + recv_size = _Read(my_data, MAX_DISCARD_SIZE); total += recv_size; } @@ -679,13 +544,10 @@ wxSocketBase& wxSocketBase::Discard() m_lcount = total; 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 } // -------------------------------------------------------------- @@ -730,11 +592,11 @@ void wxSocketBase::SaveState() 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); } @@ -750,11 +612,11 @@ void wxSocketBase::RestoreState() 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; @@ -765,20 +627,25 @@ void wxSocketBase::RestoreState() // wxSocketBase 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 wxYield(), so this won't block the GUI. - -bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags) +// These WaitXXX unctions do not depend on the event system any +// longer; 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. +// +// XXX: Should it honour the wxSOCKET_BLOCK flag ? +// +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; @@ -798,7 +665,7 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags fla { timer.m_state = &state; timer.m_new_val = 0; - timer.Start(timeout, TRUE); + timer.Start((int)timeout, TRUE); } // Active polling (without using events) @@ -810,8 +677,9 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags fla // because maybe the WaitXXX functions are not 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. + // + while (state == -1) { result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG); @@ -819,7 +687,6 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags fla if (result & GSOCK_LOST_FLAG) { timer.Stop(); - m_defer_buffer = NULL; Close(); return TRUE; } @@ -833,24 +700,18 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags fla 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) - wxYield(); + // Wait more? + if ((timeout == 0) || (m_interrupt)) + break; + else + PROCESS_EVENTS(); } - while ((state == -1) && timeout); timer.Stop(); return FALSE; @@ -888,7 +749,7 @@ void wxSocketBase::SetTimeout(long seconds) m_timeout = seconds; if (m_socket) - GSocket_SetTimeout(m_socket, m_timeout); + GSocket_SetTimeout(m_socket, m_timeout * 1000); } // -------------------------------------------------------------- @@ -899,7 +760,7 @@ void wxSocketBase::SetFlags(wxSockFlags _flags) { m_flags = _flags; } - + // -------------------------------------------------------------- // wxSocketBase callback management // -------------------------------------------------------------- @@ -963,58 +824,60 @@ 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); + // dbg("Entering OnRequest (evt %d)\n", 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 (req_evt) { - case wxSOCKET_CONNECTION: + // This duplicates some code in _Wait(), but this doesn't + // hurt. It has to be here because we don't know whether + // WaitXXX will be used, and it has to be in _Wait as well + // because the event might be a bit delayed. + // + 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: - 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_reading || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG)) return; - } - break; - } + else + 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_OUTPUT: + if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG)) + return; + else + break; } if (((m_neededreq & flag) == flag) && m_notify_state) { - // fprintf(stderr, "%s: Evt %d delivered\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt); + // dbg("Evt %d delivered\n", req_evt); event.m_socket = this; event.m_skevt = req_evt; - ProcessEvent(event); - OldOnNotify(req_evt); + if (m_evt_handler) +#if EXPERIMENTAL_USE_POST + wxPostEvent(m_evt_handler, event); +#else + ProcessEvent(event); +#endif + + 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); + // dbg("Exiting OnRequest (evt %d)\n", req_evt); } void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt)) @@ -1027,8 +890,10 @@ void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt)) void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id) { - SetNextHandler(&h_evt); + m_evt_handler = &h_evt; m_id = id; + + SetNextHandler(&h_evt); } // -------------------------------------------------------------- @@ -1037,9 +902,12 @@ void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id) void wxSocketBase::Pushback(const char *buffer, wxUint32 size) { + if (!size) return; + if (m_unread == NULL) m_unread = (char *)malloc(size); - else { + else + { char *tmp; tmp = (char *)malloc(m_unrd_size + size); @@ -1064,9 +932,11 @@ wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek) memcpy(buffer, (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; @@ -1104,7 +974,7 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man, 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); @@ -1142,7 +1012,7 @@ bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait) 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); @@ -1187,6 +1057,7 @@ wxSocketClient::~wxSocketClient() // -------------------------------------------------------------- // wxSocketClient Connect functions // -------------------------------------------------------------- + bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait) { GSocketError err; @@ -1206,7 +1077,7 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait) 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); @@ -1247,6 +1118,58 @@ bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds) return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); } +// -------------------------------------------------------------- +// wxDatagramSocket +// -------------------------------------------------------------- + +/* NOTE: experimental stuff - might change */ + +wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr, wxSockFlags flags ) + : wxSocketBase( flags, SOCK_DATAGRAM ) +{ + // 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 ); + +} + +wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr, + char* buf, + wxUint32 nBytes ) +{ + Read(buf, nBytes); + GetPeer(addr); + return (*this); +} + +wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr, + const char* buf, + wxUint32 nBytes ) +{ + GSocket_SetPeer(m_socket, addr.GetAddress()); + Write(buf, nBytes); + return (*this); +} + // -------------------------------------------------------------- // wxSocketEvent // -------------------------------------------------------------- @@ -1272,13 +1195,17 @@ void wxSocketEvent::CopyObject(wxObject& obj_d) const // -------------------------------------------------------------------------- // wxSocketModule // -------------------------------------------------------------------------- -class WXDLLEXPORT wxSocketModule: public wxModule { + +class WXDLLEXPORT wxSocketModule: public wxModule +{ DECLARE_DYNAMIC_CLASS(wxSocketModule) - public: - bool OnInit() { +public: + bool OnInit() + { return GSocket_Init(); } - void OnExit() { + void OnExit() + { GSocket_Cleanup(); } };