X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d7eaf91403705cdd94acaae0d7413e711cce3dc..3c3b35589a13813433617be9d212fdc768246938:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 4525cfa2d7..11d97cccc4 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: socket.cpp +// Name: src/common/socket.cpp // Purpose: Socket handler classes // Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia // Created: April 1997 // Copyright: (C) 1999-1997, Guilhem Lavaux // (C) 2000-1999, Guillermo Rodriguez Garcia // RCS_ID: $Id$ -// License: see wxWindows licence +// License: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ========================================================================== @@ -17,25 +17,28 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SOCKETS -#include "wx/app.h" +#include "wx/socket.h" + +#ifndef WX_PRECOMP + #include "wx/object.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/event.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/timer.h" +#endif + #include "wx/apptrait.h" -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/timer.h" -#include "wx/utils.h" #include "wx/module.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/event.h" #include "wx/sckaddr.h" -#include "wx/socket.h" #include "wx/datetime.h" // DLL options compatibility check: @@ -327,11 +330,9 @@ wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes) // 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. + // - we got all the data if ( !m_socket || - !nbytes || - ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) ) + !nbytes ) return total; // Possible combinations (they are checked in this order) @@ -694,6 +695,8 @@ bool wxSocketBase::_Wait(long seconds, else timeout = m_timeout * 1000; + bool has_event_loop = wxTheApp->GetTraits() ? (wxTheApp->GetTraits()->GetSocketGUIFunctionsTable() ? true : false) : false; + // Wait in an active polling loop. // // NOTE: We duplicate some of the code in OnRequest, but this doesn't @@ -709,14 +712,15 @@ bool wxSocketBase::_Wait(long seconds, bool done = false; bool valid_result = false; -#if !defined(wxUSE_GUI) || !wxUSE_GUI + if (!has_event_loop) + { // This is used to avoid a busy loop on wxBase - having a select // timeout of 50 ms per iteration should be enough. if (timeout > 50) m_socket->SetTimeout(50); else m_socket->SetTimeout(timeout); -#endif + } while (!done) { @@ -754,30 +758,32 @@ bool wxSocketBase::_Wait(long seconds, done = true; else { -#if !defined(wxUSE_GUI) || !wxUSE_GUI + if (has_event_loop) + { + PROCESS_EVENTS(); + } + else + { // If there's less than 50 ms left, just call select with that timeout. if (time_left < 50) m_socket->SetTimeout(time_left); -#else - PROCESS_EVENTS(); -#endif - } + } + } } // Set timeout back to original value (we overwrote it for polling) -#if !defined(wxUSE_GUI) || !wxUSE_GUI - m_socket->SetTimeout(m_timeout*1000); -#endif + if (!has_event_loop) + m_socket->SetTimeout(m_timeout*1000); return valid_result; } bool wxSocketBase::Wait(long seconds, long milliseconds) { - return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | - GSOCK_OUTPUT_FLAG | - GSOCK_CONNECTION_FLAG | - GSOCK_LOST_FLAG); + return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | + GSOCK_OUTPUT_FLAG | + GSOCK_CONNECTION_FLAG | + GSOCK_LOST_FLAG); } bool wxSocketBase::WaitForRead(long seconds, long milliseconds) @@ -798,12 +804,12 @@ bool wxSocketBase::WaitForRead(long seconds, long milliseconds) bool wxSocketBase::WaitForWrite(long seconds, long milliseconds) { - return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG); + return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG); } bool wxSocketBase::WaitForLost(long seconds, long milliseconds) { - return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG); + return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG); } // -------------------------------------------------------------------------- @@ -836,16 +842,16 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const { - GAddress *local; + GAddress *local; - if (!m_socket) - return false; + if (!m_socket) + return false; - local = m_socket->GetLocal(); - addr_man.SetAddress(local); - GAddress_destroy(local); + local = m_socket->GetLocal(); + addr_man.SetAddress(local); + GAddress_destroy(local); - return true; + return true; } // @@ -854,36 +860,36 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const void wxSocketBase::SaveState() { - wxSocketState *state; + wxSocketState *state; - state = new wxSocketState(); + state = new wxSocketState(); - state->m_flags = m_flags; - state->m_notify = m_notify; - state->m_eventmask = m_eventmask; - state->m_clientData = m_clientData; + state->m_flags = m_flags; + state->m_notify = m_notify; + state->m_eventmask = m_eventmask; + state->m_clientData = m_clientData; - m_states.Append(state); + m_states.Append(state); } void wxSocketBase::RestoreState() { - wxList::compatibility_iterator node; - wxSocketState *state; + wxList::compatibility_iterator node; + wxSocketState *state; - node = m_states.GetLast(); - if (!node) - return; + node = m_states.GetLast(); + if (!node) + return; - state = (wxSocketState *)node->GetData(); + state = (wxSocketState *)node->GetData(); - m_flags = state->m_flags; - m_notify = state->m_notify; - m_eventmask = state->m_eventmask; - m_clientData = state->m_clientData; + m_flags = state->m_flags; + m_notify = state->m_notify; + m_eventmask = state->m_eventmask; + m_clientData = state->m_clientData; - m_states.Erase(node); - delete state; + m_states.Erase(node); + delete state; } // @@ -892,15 +898,15 @@ void wxSocketBase::RestoreState() void wxSocketBase::SetTimeout(long seconds) { - m_timeout = seconds; + m_timeout = seconds; - if (m_socket) - m_socket->SetTimeout(m_timeout * 1000); + if (m_socket) + m_socket->SetTimeout(m_timeout * 1000); } void wxSocketBase::SetFlags(wxSocketFlags flags) { - m_flags = flags; + m_flags = flags; } @@ -931,9 +937,9 @@ void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket), GSocketEvent notification, char *cdata) { - wxSocketBase *sckobj = (wxSocketBase *)cdata; + wxSocketBase *sckobj = (wxSocketBase *)cdata; - sckobj->OnRequest((wxSocketNotify) notification); + sckobj->OnRequest((wxSocketNotify) notification); } void wxSocketBase::OnRequest(wxSocketNotify notification) @@ -1004,18 +1010,18 @@ void wxSocketBase::OnRequest(wxSocketNotify notification) void wxSocketBase::Notify(bool notify) { - m_notify = notify; + m_notify = notify; } void wxSocketBase::SetNotify(wxSocketEventFlags flags) { - m_eventmask = flags; + m_eventmask = flags; } void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id) { - m_handler = &handler; - m_id = id; + m_handler = &handler; + m_id = id; } // -------------------------------------------------------------------------- @@ -1170,7 +1176,7 @@ wxSocketBase *wxSocketServer::Accept(bool wait) bool wxSocketServer::WaitForAccept(long seconds, long milliseconds) { - return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); + return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG); } bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen) @@ -1189,7 +1195,7 @@ bool wxSocketBase::SetOption(int level, int optname, const void *optval, int optlen) { wxASSERT_MSG( m_socket, _T("Socket not initialised") ); - + if (m_socket->SetSockOpt(level, optname, optval, optlen) != GSOCK_NOERROR) { @@ -1198,13 +1204,14 @@ bool wxSocketBase::SetOption(int level, int optname, const void *optval, return true; } -bool wxSocketBase::SetLocal(wxSockAddress& local) +bool wxSocketBase::SetLocal(wxIPV4address& local) { GAddress* la = local.GetAddress(); + // If the address is valid, save it for use when we call Connect if (la && la->m_addr) { - m_socket->SetLocal(la); + m_localAddress = local; return true; } @@ -1269,6 +1276,12 @@ bool wxSocketClient::DoConnect(wxSockAddress& addr_man, wxSockAddress* local, bo m_socket->SetReusable(); } + // If no local address was passed and one has been set, use the one that was Set + if (!local && m_localAddress.GetAddress()) + { + local = &m_localAddress; + } + // Bind to the local IP address and port, when provided if (local) { @@ -1298,24 +1311,24 @@ bool wxSocketClient::DoConnect(wxSockAddress& addr_man, wxSockAddress* local, bo bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait) { - return (DoConnect(addr_man, NULL, wait)); + return (DoConnect(addr_man, NULL, wait)); } bool wxSocketClient::Connect(wxSockAddress& addr_man, wxSockAddress& local, bool wait) { - return (DoConnect(addr_man, &local, wait)); + return (DoConnect(addr_man, &local, wait)); } bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds) { - if (m_connected) // Already connected - return true; + if (m_connected) // Already connected + return true; - if (!m_establishing || !m_socket) // No connection in progress - return false; + if (!m_establishing || !m_socket) // No connection in progress + return false; - return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG | - GSOCK_LOST_FLAG); + return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG | + GSOCK_LOST_FLAG); } // ========================================================================== @@ -1328,31 +1341,30 @@ wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr, wxSocketFlags flags ) : wxSocketBase( flags, wxSOCKET_DATAGRAM ) { - // Create the socket - m_socket = GSocket_new(); - - if(!m_socket) - { - wxASSERT_MSG( 0, _T("datagram socket not new'd") ); - return; - } - // Setup the socket as non connection oriented - m_socket->SetLocal(addr.GetAddress()); - if( m_socket->SetNonOriented() != GSOCK_NOERROR ) - { - delete m_socket; - m_socket = NULL; - return; - } + // Create the socket + m_socket = GSocket_new(); - // Initialize all stuff - m_connected = false; - m_establishing = false; - m_socket->SetTimeout( m_timeout ); - m_socket->SetCallback( GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | - GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, - wx_socket_callback, (char*)this ); + if(!m_socket) + { + wxFAIL_MSG( _T("datagram socket not new'd") ); + return; + } + // Setup the socket as non connection oriented + m_socket->SetLocal(addr.GetAddress()); + if( m_socket->SetNonOriented() != GSOCK_NOERROR ) + { + delete m_socket; + m_socket = NULL; + return; + } + // Initialize all stuff + m_connected = false; + m_establishing = false; + m_socket->SetTimeout( m_timeout ); + m_socket->SetCallback( GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | + GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, + wx_socket_callback, (char*)this ); } wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr, @@ -1369,7 +1381,7 @@ wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr, wxUint32 nBytes ) { wxASSERT_MSG( m_socket, _T("Socket not initialised") ); - + m_socket->SetPeer(addr.GetAddress()); Write(buf, nBytes); return (*this); @@ -1402,5 +1414,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule) #endif // wxUSE_SOCKETS - -// vi:sts=4:sw=4:et