remove default wxDC ctor to make it impossible to construct DCs without the associate...

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index a5b9eff86a8b12630f04bb16152cc682047bebdc..203d79a063ee15f2f94fd29dfa31f47b820d7c9b 100644 (file)
--- 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$
 // 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,26 +17,29 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_SOCKETS
 
 #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"
+    #include "wx/module.h"
+#endif
+

 #include "wx/apptrait.h"
 #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/sckaddr.h"

-#include "wx/socket.h"
-#include "wx/datetime.h"
+#include "wx/stopwatch.h"

 
 // DLL options compatibility check:
 #include "wx/build.h"
 
 // DLL options compatibility check:
 #include "wx/build.h"


@@ -159,7 +162,7 @@ void wxSocketBase::Shutdown()
 {
     // we should be initialized
     wxASSERT_MSG( m_countInit, _T("extra call to Shutdown()") );
 {
     // we should be initialized
     wxASSERT_MSG( m_countInit, _T("extra call to Shutdown()") );

-    if ( !--m_countInit )
+    if ( --m_countInit == 0 )

     {
         GSocket_Cleanup();
     }
     {
         GSocket_Cleanup();
     }


@@ -327,11 +330,9 @@ wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
 
   // Return now in one of the following cases:
   // - the socket is invalid,
 
   // 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 ||
   if ( !m_socket ||

-       !nbytes ||
-       ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )
+       !nbytes )

     return total;
 
   // Possible combinations (they are checked in this order)
     return total;
 
   // Possible combinations (they are checked in this order)


@@ -679,7 +680,7 @@ bool wxSocketBase::_Wait(long seconds,
                          wxSocketEventFlags flags)
 {
   GSocketEventFlags result;
                          wxSocketEventFlags flags)
 {
   GSocketEventFlags result;

-  long timeout;
+  long timeout; // in ms

 
   // Set this to true to interrupt ongoing waits
   m_interrupt = false;
 
   // Set this to true to interrupt ongoing waits
   m_interrupt = false;


@@ -694,6 +695,8 @@ bool wxSocketBase::_Wait(long seconds,
   else
     timeout = m_timeout * 1000;
 
   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
   // Wait in an active polling loop.
   //
   // NOTE: We duplicate some of the code in OnRequest, but this doesn't


@@ -704,19 +707,19 @@ bool wxSocketBase::_Wait(long seconds,
   // Do this at least once (important if timeout == 0, when
   // we are just polling). Also, if just polling, do not yield.
 
   // Do this at least once (important if timeout == 0, when
   // we are just polling). Also, if just polling, do not yield.
 

-  wxDateTime current_time = wxDateTime::UNow();
-  unsigned int time_limit = (current_time.GetTicks() * 1000) + current_time.GetMillisecond() + timeout;
+  const wxMilliClock_t time_limit = wxGetLocalTimeMillis() + timeout;

   bool done = false;
   bool valid_result = false;
 
   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);
     // 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)
   {
 
   while (!done)
   {


@@ -748,36 +751,37 @@ bool wxSocketBase::_Wait(long seconds,
     }
 
     // Wait more?
     }
 
     // Wait more?

-    current_time = wxDateTime::UNow();
-    int time_left = time_limit - ((current_time.GetTicks() * 1000) + current_time.GetMillisecond());
+    long time_left = wxMilliClockToLong(time_limit - wxGetLocalTimeMillis());

     if ((!timeout) || (time_left <= 0) || (m_interrupt))
       done = true;
     else
     {
     if ((!timeout) || (time_left <= 0) || (m_interrupt))
       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);
         // 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)
   }
 
   // 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 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)
 }
 
 bool wxSocketBase::WaitForRead(long seconds, long milliseconds)


@@ -798,12 +802,12 @@ bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
 
 bool wxSocketBase::WaitForWrite(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)
 {
 }
 
 bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
 {

-  return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
+    return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);

 }
 
 // --------------------------------------------------------------------------
 }
 
 // --------------------------------------------------------------------------


@@ -836,16 +840,16 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 
 bool wxSocketBase::GetLocal(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 +858,36 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 
 void wxSocketBase::SaveState()
 {
 
 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()
 {
 }
 
 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 +896,15 @@ void wxSocketBase::RestoreState()
 
 void wxSocketBase::SetTimeout(long seconds)
 {
 
 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)
 {
 }
 
 void wxSocketBase::SetFlags(wxSocketFlags flags)
 {

-  m_flags = flags;
+    m_flags = flags;

 }
 
 
 }
 
 


@@ -931,9 +935,9 @@ void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
                                     GSocketEvent notification,
                                     char *cdata)
 {
                                     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)
 }
 
 void wxSocketBase::OnRequest(wxSocketNotify notification)


@@ -1004,18 +1008,18 @@ void wxSocketBase::OnRequest(wxSocketNotify notification)
 
 void wxSocketBase::Notify(bool notify)
 {
 
 void wxSocketBase::Notify(bool notify)
 {

-  m_notify = notify;
+    m_notify = notify;

 }
 
 void wxSocketBase::SetNotify(wxSocketEventFlags flags)
 {
 }
 
 void wxSocketBase::SetNotify(wxSocketEventFlags flags)
 {

-  m_eventmask = flags;
+    m_eventmask = flags;

 }
 
 void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)
 {
 }
 
 void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)
 {

-  m_handler = &handler;
-  m_id      = id;
+    m_handler = &handler;
+    m_id      = id;

 }
 
 // --------------------------------------------------------------------------
 }
 
 // --------------------------------------------------------------------------


@@ -1099,6 +1103,12 @@ wxSocketServer::wxSocketServer(const wxSockAddress& addr_man,
     if (GetFlags() & wxSOCKET_REUSEADDR) {
         m_socket->SetReusable();
     }
     if (GetFlags() & wxSOCKET_REUSEADDR) {
         m_socket->SetReusable();
     }

+    if (GetFlags() & wxSOCKET_BROADCAST) {
+        m_socket->SetBroadcast();
+    }
+    if (GetFlags() & wxSOCKET_NOBIND) {
+        m_socket->DontDoBind();
+    }

 
     if (m_socket->SetServer() != GSOCK_NOERROR)
     {
 
     if (m_socket->SetServer() != GSOCK_NOERROR)
     {


@@ -1170,7 +1180,7 @@ wxSocketBase *wxSocketServer::Accept(bool wait)
 
 bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
 {
 
 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)
 }
 
 bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)


@@ -1189,7 +1199,7 @@ bool wxSocketBase::SetOption(int level, int optname, const void *optval,
                               int optlen)
 {
     wxASSERT_MSG( m_socket, _T("Socket not initialised") );
                               int optlen)
 {
     wxASSERT_MSG( m_socket, _T("Socket not initialised") );

-    
+

     if (m_socket->SetSockOpt(level, optname, optval, optlen)
         != GSOCK_NOERROR)
     {
     if (m_socket->SetSockOpt(level, optname, optval, optlen)
         != GSOCK_NOERROR)
     {


@@ -1198,13 +1208,14 @@ bool wxSocketBase::SetOption(int level, int optname, const void *optval,
     return true;
 }
 
     return true;
 }
 

-bool wxSocketBase::SetLocal(wxSockAddress& local)
+bool wxSocketBase::SetLocal(wxIPV4address& local)

 {
   GAddress* la = local.GetAddress();
 
 {
   GAddress* la = local.GetAddress();
 

+  // If the address is valid, save it for use when we call Connect

   if (la && la->m_addr)
   {
   if (la && la->m_addr)
   {

-    m_socket->SetLocal(la);
+    m_localAddress = local;

 
     return true;
   }
 
     return true;
   }


@@ -1268,6 +1279,20 @@ bool wxSocketClient::DoConnect(wxSockAddress& addr_man, wxSockAddress* local, bo
   {
     m_socket->SetReusable();
   }
   {
     m_socket->SetReusable();
   }

+  if (GetFlags() & wxSOCKET_BROADCAST)
+  {
+    m_socket->SetBroadcast();
+  }
+  if (GetFlags() & wxSOCKET_NOBIND)
+  {
+    m_socket->DontDoBind();
+  }
+
+  // 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)
 
   // Bind to the local IP address and port, when provided
   if (local)


@@ -1278,6 +1303,10 @@ bool wxSocketClient::DoConnect(wxSockAddress& addr_man, wxSockAddress* local, bo
       m_socket->SetLocal(la);
   }
 
       m_socket->SetLocal(la);
   }
 

+#if defined(__WXMSW__) || defined(__WXGTK__)
+  m_socket->SetInitialSocketBuffers(m_initialRecvBufferSize, m_initialSendBufferSize);
+#endif
+

   m_socket->SetPeer(addr_man.GetAddress());
   err = m_socket->Connect(GSOCK_STREAMED);
 
   m_socket->SetPeer(addr_man.GetAddress());
   err = m_socket->Connect(GSOCK_STREAMED);
 


@@ -1298,24 +1327,24 @@ bool wxSocketClient::DoConnect(wxSockAddress& addr_man, wxSockAddress* local, bo
 
 bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
 {
 
 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)
 {
 }
 
 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)
 {
 }
 
 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 +1357,42 @@ wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr,
                                     wxSocketFlags flags )
                 : wxSocketBase( flags, wxSOCKET_DATAGRAM )
 {
                                     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 (flags & wxSOCKET_REUSEADDR)
+    {
+        m_socket->SetReusable();
+    }
+    if (GetFlags() & wxSOCKET_BROADCAST)
+    {
+        m_socket->SetBroadcast();
+    }
+    if (GetFlags() & wxSOCKET_NOBIND)
+    {
+        m_socket->DontDoBind();
+    }
+    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,
 }
 
 wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,


@@ -1369,7 +1409,7 @@ wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr,
                                             wxUint32 nBytes )
 {
     wxASSERT_MSG( m_socket, _T("Socket not initialised") );
                                             wxUint32 nBytes )
 {
     wxASSERT_MSG( m_socket, _T("Socket not initialised") );

-    
+

     m_socket->SetPeer(addr.GetAddress());
     Write(buf, nBytes);
     return (*this);
     m_socket->SetPeer(addr.GetAddress());
     Write(buf, nBytes);
     return (*this);


@@ -1402,5 +1442,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
 
 #endif
   // wxUSE_SOCKETS
 
 #endif
   // wxUSE_SOCKETS

-
-// vi:sts=4:sw=4:et