X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a324a7bccf4bda8f4f2bf09daee8104cae953cee..8708a10fa67501ab9fbf8f6160b89c26f1c59cbd:/src/common/sckaddr.cpp

diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index e6f63b2ca3..fbfea8ce3b 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -30,10 +30,12 @@
 #include <memory.h>
 #endif
 
-#include <wx/defs.h>
-#include <wx/object.h>
-#include <wx/gsocket.h>
-#include <wx/sckaddr.h>
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/gsocket.h"
+#include "wx/sckaddr.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject)
@@ -101,18 +103,24 @@ wxIPV4address::~wxIPV4address()
 
 bool wxIPV4address::Hostname(const wxString& name)
 {
+  // Some people are sometimes fool.
+  if (name == wxT("")) 
+  {
+    wxLogWarning( _("Trying to solve a NULL hostname: giving up") );
+    return FALSE;
+  }
+
   return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::Hostname(unsigned long addr)
 {
-  /* Need API */
-  return TRUE;
+  return (GAddress_INET_SetHostAddress(m_address, addr) == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::Service(const wxString& name)
 {
-  return (GAddress_INET_SetPortName(m_address, name.fn_str()) == GSOCK_NOERROR);
+  return (GAddress_INET_SetPortName(m_address, name.fn_str(), "tcp") == GSOCK_NOERROR);
 }
 
 bool wxIPV4address::Service(unsigned short port)
@@ -139,7 +147,7 @@ unsigned short wxIPV4address::Service()
   return GAddress_INET_GetPort(m_address); 
 }
 
-#ifdef IPV6_ENABLE
+#if 0
 // ---------------------------------------------------------------------------
 // wxIPV6address
 // ---------------------------------------------------------------------------