X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1539c2f54a43b0de6f6d75437b04d30872da9ea4..93bfd481b7f2f0fec50dd79fcab52374aa59ebbb:/src/common/sckaddr.cpp diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 8e638c3537..f158a55768 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -6,10 +6,10 @@ // Created: 26/04/97 // RCS-ID: $Id$ // Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "sckaddr.h" #endif @@ -22,41 +22,60 @@ #if wxUSE_SOCKETS -#include -#include -#include +#ifndef WX_PRECOMP + #include "wx/defs.h" + #include "wx/object.h" + #include "wx/log.h" + #include "wx/intl.h" -#if !defined(__MWERKS__) && !defined(__SALFORDC__) -#include -#endif + #include + #include + #include + + #if !defined(__MWERKS__) && !defined(__SALFORDC__) + #include + #endif +#endif // !WX_PRECOMP -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/log.h" -#include "wx/intl.h" #include "wx/gsocket.h" +#include "wx/socket.h" #include "wx/sckaddr.h" IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject) -IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress) -#ifdef ENABLE_IPV6 -IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress) +IMPLEMENT_ABSTRACT_CLASS(wxIPaddress, wxSockAddress) +IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress) +#if wxUSE_IPV6 +IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress) #endif -#if defined(__UNIX__) && !defined(__WXMAC__) +#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif // --------------------------------------------------------------------------- -// wxIPV4address +// wxSockAddress // --------------------------------------------------------------------------- +void wxSockAddress::Init() +{ + if ( !wxSocketBase::IsInitialized() ) + { + // we must do it before using GAddress_XXX functions + (void)wxSocketBase::Initialize(); + } +} + wxSockAddress::wxSockAddress() { - m_address = GAddress_new(); + Init(); + + m_address = GAddress_new(); } wxSockAddress::wxSockAddress(const wxSockAddress& other) + : wxObject() { + Init(); + m_address = GAddress_copy(other.m_address); } @@ -83,16 +102,35 @@ void wxSockAddress::Clear() m_address = GAddress_new(); } +// --------------------------------------------------------------------------- +// wxIPaddress +// --------------------------------------------------------------------------- + +wxIPaddress::wxIPaddress() + : wxSockAddress() +{ +} + +wxIPaddress::wxIPaddress(const wxIPaddress& other) + : wxSockAddress(other) +{ +} + +wxIPaddress::~wxIPaddress() +{ +} + // --------------------------------------------------------------------------- // wxIPV4address // --------------------------------------------------------------------------- wxIPV4address::wxIPV4address() + : wxIPaddress() { } wxIPV4address::wxIPV4address(const wxIPV4address& other) - : wxSockAddress(other) + : wxIPaddress(other) { } @@ -108,13 +146,18 @@ bool wxIPV4address::Hostname(const wxString& name) wxLogWarning( _("Trying to solve a NULL hostname: giving up") ); return FALSE; } - + m_origHostname = name; return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR); } bool wxIPV4address::Hostname(unsigned long addr) { - return (GAddress_INET_SetHostAddress(m_address, addr) == GSOCK_NOERROR); + bool rv = (GAddress_INET_SetHostAddress(m_address, addr) == GSOCK_NOERROR); + if (rv) + m_origHostname = Hostname(); + else + m_origHostname = wxEmptyString; + return rv; } bool wxIPV4address::Service(const wxString& name) @@ -132,37 +175,67 @@ bool wxIPV4address::LocalHost() return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR); } +bool wxIPV4address::IsLocalHost() const +{ + return (Hostname() == wxT("localhost") || IPAddress() == wxT("127.0.0.1")); +} + bool wxIPV4address::AnyAddress() { return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR); } -wxString wxIPV4address::Hostname() +wxString wxIPV4address::Hostname() const { char hostname[1024]; hostname[0] = 0; GAddress_INET_GetHostName(m_address, hostname, 1024); - return wxString(hostname); + return wxString::FromAscii(hostname); } -unsigned short wxIPV4address::Service() +unsigned short wxIPV4address::Service() const { return GAddress_INET_GetPort(m_address); } -#if 0 +wxSockAddress *wxIPV4address::Clone() const +{ + wxIPV4address *addr = new wxIPV4address(*this); + addr->m_origHostname = m_origHostname; + return addr; +} + +wxString wxIPV4address::IPAddress() const +{ + unsigned long raw = GAddress_INET_GetHostAddress(m_address); + return wxString::Format( + _T("%u.%u.%u.%u"), + (unsigned char)((raw>>24) & 0xff), + (unsigned char)((raw>>16) & 0xff), + (unsigned char)((raw>>8) & 0xff), + (unsigned char)(raw & 0xff) + ); +} + +bool wxIPV4address::operator==(wxIPV4address& addr) +{ + if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true; + return false; +} + +#if wxUSE_IPV6 // --------------------------------------------------------------------------- // wxIPV6address // --------------------------------------------------------------------------- wxIPV6address::wxIPV6address() - : wxSockAddress() + : wxIPaddress() { } wxIPV6address::wxIPV6address(const wxIPV6address& other) - : wxSockAddress(other) + : wxIPaddress(other) { } @@ -172,17 +245,22 @@ wxIPV6address::~wxIPV6address() bool wxIPV6address::Hostname(const wxString& name) { - return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR); + 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 wxIPV6address::Hostname(unsigned char addr[16]) +bool wxIPV6address::Hostname(unsigned char[16] WXUNUSED(addr)) { return TRUE; } -bool wxIPV6address::Service(const char *name) +bool wxIPV6address::Service(const wxString& name) { - return (GAddress_INET_SetPortName(m_address, name.fn_str()) == GSOCK_NOERROR); + return (GAddress_INET_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR); } bool wxIPV6address::Service(unsigned short port) @@ -195,19 +273,45 @@ bool wxIPV6address::LocalHost() return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR); } -const wxString& wxIPV6address::Hostname() +bool wxIPV6address::IsLocalHost() const { - return wxString(GAddress_INET_GetHostName(m_address)); + return (Hostname() == wxT("localhost") || IPAddress() == wxT("127.0.0.1")); +} + +bool wxIPV6address::AnyAddress() +{ + return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR); +} + +wxString wxIPV6address::IPAddress() const +{ + unsigned long raw = GAddress_INET_GetHostAddress(m_address); + return wxString::Format( + _T("%u.%u.%u.%u"), + (unsigned char)((raw>>24) & 0xff), + (unsigned char)((raw>>16) & 0xff), + (unsigned char)((raw>>8) & 0xff), + (unsigned char)(raw & 0xff) + ); +} + +wxString wxIPV6address::Hostname() const +{ + char hostname[1024]; + + hostname[0] = 0; + GAddress_INET_GetHostName(m_address, hostname, 1024); + return wxString::FromAscii(hostname); } -unsigned short wxIPV6address::Service() +unsigned short wxIPV6address::Service() const { return GAddress_INET_GetPort(m_address); } -#endif // 0 +#endif // wxUSE_IPV6 -#if defined(__UNIX__) && !defined(__WXMAC__) +#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) // --------------------------------------------------------------------------- // wxUNIXaddress @@ -238,7 +342,8 @@ wxString wxUNIXaddress::Filename() path[0] = 0; GAddress_UNIX_GetPath(m_address, path, 1024); - return wxString(path); + + return wxString::FromAscii(path); } #endif // __UNIX__