Make SetLocal actually work instead of crashing immediately; due to required longevit...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/socket.tex b/docs/latex/wx/socket.tex
index fae16a9068e70069f7aad0b4a228d748ac692506..4afed4bb82f66398a2d5a4e8fa414f1110bb12cf 100644 (file)
--- a/docs/latex/wx/socket.tex
+++ b/docs/latex/wx/socket.tex
@@ -589,7 +589,7 @@ reusing local addresses/ports.
 %
 \membersection{wxSocketBase::SetLocal}\label{wxsocketbasesetlocal}
 
-\func{bool}{SetLocal}{\param{wxSockAddress\&}{ local}}
+\func{bool}{SetLocal}{\param{wxIPV4address\&}{ local}}
 
 This function allows you to set the local address and port,
 useful when an application needs to reuse a particular port. When

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 266a24321da99350f6aacb698b125c164c5ed934..d04a733fd0f778da1123312a9d9e4a22610cc676 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -121,7 +121,7 @@ public:
   // addresses
   virtual bool GetLocal(wxSockAddress& addr_man) const;
   virtual bool GetPeer(wxSockAddress& addr_man) const;
-  virtual bool SetLocal(wxSockAddress& local);
+  virtual bool SetLocal(wxIPV4address& local);
 
   // base IO
   virtual bool  Close();
@@ -202,6 +202,7 @@ private:
   wxList        m_states;           // stack of states
   bool          m_interrupt;        // interrupt ongoing wait operations?
   bool          m_beingDeleted;     // marked for delayed deletion?
+  wxIPV4address m_localAddress;     // bind to local address?
 
   // pushback buffer
   void         *m_unread;           // pushback buffer

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 7285254c4b11971e29f607cecdb886564b5eaad6..05f337bfc370080d6a159340fe1cc35f3ac183bd 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1203,13 +1203,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;
   }
@@ -1274,6 +1275,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)
   {