X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81b92e17cd24740ce46877d1c87fb4187264831a..c0eba78b86232bf8c2ef886e0a35808ab09df25f:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 3e2ceee503..078079063b 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 ///////////////////////////////////////////////////////////////////////////// @@ -27,6 +26,7 @@ // wxWindows headers ///////////////////////////////////////////////////////////////////////////// +#include "wx/app.h" #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -36,10 +36,6 @@ #include "wx/log.h" #include "wx/intl.h" -#include -#include -#include - ///////////////////////////////////////////////////////////////////////////// // wxSocket headers ///////////////////////////////////////////////////////////////////////////// @@ -47,9 +43,14 @@ #include "wx/sckaddr.h" #include "wx/socket.h" +// discard buffer +#define MAX_DISCARD_SIZE (10 * 1024) +// what to do within waits #define PROCESS_EVENTS() wxYield() +// use wxPostEvent or not +#define EXPERIMENTAL_USE_POST 1 // -------------------------------------------------------------- // ClassInfos @@ -58,6 +59,7 @@ IMPLEMENT_CLASS(wxSocketBase, wxObject) IMPLEMENT_CLASS(wxSocketServer, wxSocketBase) IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) +IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase) IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent) class wxSocketState : public wxObject @@ -79,7 +81,7 @@ public: 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), @@ -92,7 +94,7 @@ wxSocketBase::wxSocketBase(wxSockFlags _flags, wxSockType _type) : 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), @@ -164,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; } @@ -189,7 +190,7 @@ 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) @@ -208,11 +209,11 @@ wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes) if (ret > 0) total += ret; } - else if (m_flags & wxSOCKET_WAITALL) // wxSOCKET_WAITALL + else if (m_flags & wxSOCKET_WAITALL) { while (ret > 0 && nbytes > 0) { - if (!(m_flags & wxSOCKET_BLOCK) && !(WaitForRead())) + if (!(m_flags & wxSOCKET_BLOCK) && !WaitForRead()) break; ret = GSocket_Read(m_socket, buffer, nbytes); @@ -241,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; @@ -341,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) @@ -353,7 +349,7 @@ wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes) m_reading = TRUE; m_lcount = _Read(buffer, nbytes); - Pushback(buffer, nbytes); + Pushback(buffer, m_lcount); // If in wxSOCKET_WAITALL mode, all bytes should have been read. if (m_flags & wxSOCKET_WAITALL) @@ -361,10 +357,9 @@ wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 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; } @@ -381,10 +376,9 @@ wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 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; } @@ -416,7 +410,7 @@ wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes) { while (ret > 0 && nbytes > 0) { - if (!(m_flags & wxSOCKET_BLOCK) && !(WaitForWrite())) + if (!(m_flags & wxSOCKET_BLOCK) && !WaitForWrite()) break; ret = GSocket_Write(m_socket, buffer, nbytes); @@ -509,7 +503,6 @@ exit: m_lcount = total; m_writing = FALSE; - // TODO: TriggerWrite return *this; #ifdef __VISUALC__ @@ -530,11 +523,9 @@ wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes) 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 @@ -543,9 +534,9 @@ wxSocketBase& wxSocketBase::Discard() old_flags = m_flags; 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; } @@ -553,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 } // -------------------------------------------------------------- @@ -639,14 +627,16 @@ 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 PROCESS_EVENTS(), 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; @@ -687,20 +677,12 @@ 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) + // we are just polling). Also, if just polling, do not yield. // while (state == -1) { result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG); - // Connection lost - if (result & GSOCK_LOST_FLAG) - { - timer.Stop(); - Close(); - return TRUE; - } - // Incoming connection (server) or connection established (client) if (result & GSOCK_CONNECTION_FLAG) { @@ -716,11 +698,18 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags fla return TRUE; } + // Connection lost + if (result & GSOCK_LOST_FLAG) + { + timer.Stop(); + return TRUE; // XXX: should be FALSE if !(flags & GSOCK_LOST_FLAG) ! + } + // Wait more? if ((timeout == 0) || (m_interrupt)) break; - - PROCESS_EVENTS(); + else + PROCESS_EVENTS(); } timer.Stop(); @@ -834,40 +823,45 @@ 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 - // 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. + // 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. // - switch (req_evt) + if (req_evt == wxSOCKET_CONNECTION) { - case wxSOCKET_CONNECTION : - m_establishing = FALSE; - m_connected = TRUE; - break; - case wxSOCKET_LOST: - Close(); - break; - - // If we are in the middle of a R/W operation, do not - // propagate events to users. - // - case wxSOCKET_INPUT: - if (m_reading) return; - - case wxSOCKET_OUTPUT: - if (m_writing) return; + m_establishing = FALSE; + m_connected = TRUE; + } + else if (req_evt == wxSOCKET_INPUT) + { + // 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. + // + if (m_reading || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG)) + return; + } + else if (req_evt == wxSOCKET_OUTPUT) + { + if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG)) + return; } 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); // XXX - should be PostEvent + + if (m_evt_handler) +#if EXPERIMENTAL_USE_POST + wxPostEvent(m_evt_handler, event); +#else + ProcessEvent(event); +#endif OldOnNotify(req_evt); if (m_cbk) @@ -875,7 +869,7 @@ void wxSocketBase::OnRequest(wxSocketNotify req_evt) } - // 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)) @@ -888,8 +882,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); } // -------------------------------------------------------------- @@ -898,9 +894,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); @@ -925,9 +924,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; @@ -1048,6 +1049,7 @@ wxSocketClient::~wxSocketClient() // -------------------------------------------------------------- // wxSocketClient Connect functions // -------------------------------------------------------------- + bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait) { GSocketError err; @@ -1055,7 +1057,6 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait) if (IsConnected()) Close(); - // This should never happen. if (m_socket) GSocket_destroy(m_socket); @@ -1108,6 +1109,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 // -------------------------------------------------------------- @@ -1133,13 +1186,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(); } };