X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a96d2f45fec76a2d0da1c0c7672b62c19280f43..6342bd1ab36c1957684c00d408d09fba65d33db6:/src/common/sckaddr.cpp?ds=inline diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 1e126d81af..7924cee54f 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -30,12 +30,13 @@ #include #endif -#include -#include -#include -#include +#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) IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress) #ifdef ENABLE_IPV6 @@ -44,7 +45,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress) #ifdef __UNIX__ IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif -#endif // --------------------------------------------------------------------------- // wxIPV4address @@ -101,7 +101,14 @@ wxIPV4address::~wxIPV4address() bool wxIPV4address::Hostname(const wxString& name) { - return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR); + // 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.mb_str()) == GSOCK_NOERROR); } bool wxIPV4address::Hostname(unsigned long addr) @@ -111,7 +118,7 @@ bool wxIPV4address::Hostname(unsigned long addr) bool wxIPV4address::Service(const wxString& name) { - return (GAddress_INET_SetPortName(m_address, name.fn_str(), "tcp") == GSOCK_NOERROR); + return (GAddress_INET_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR); } bool wxIPV4address::Service(unsigned short port) @@ -124,6 +131,11 @@ bool wxIPV4address::LocalHost() return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR); } +bool wxIPV4address::AnyAddress() +{ + return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR); +} + wxString wxIPV4address::Hostname() { char hostname[1024];