X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..f0fbbe236452ae27a7577deafbbc44ace2c209e7:/src/common/sckaddr.cpp diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index d7c77768b7..dd801147b3 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sckaddr.cpp +// Name: src/common/sckaddr.cpp // Purpose: Network address manager // Author: Guilhem Lavaux // Modified by: @@ -13,13 +13,12 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SOCKETS #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/object.h" #include "wx/log.h" #include "wx/intl.h" @@ -28,7 +27,7 @@ #include #include - #if !defined(__MWERKS__) && !defined(__SALFORDC__) + #if !defined(__MWERKS__) #include #endif #endif // !WX_PRECOMP @@ -43,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxIPaddress) #if wxUSE_IPV6 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxIPaddress) #endif -#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif @@ -82,8 +81,11 @@ wxSockAddress::~wxSockAddress() void wxSockAddress::SetAddress(GAddress *address) { - GAddress_destroy(m_address); - m_address = GAddress_copy(address); + if ( address != m_address ) + { + GAddress_destroy(m_address); + m_address = GAddress_copy(address); + } } wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr) @@ -176,6 +178,11 @@ bool wxIPV4address::IsLocalHost() const return (Hostname() == wxT("localhost") || IPAddress() == wxT("127.0.0.1")); } +bool wxIPV4address::BroadcastAddress() +{ + return (GAddress_INET_SetBroadcastAddress(m_address) == GSOCK_NOERROR); +} + bool wxIPV4address::AnyAddress() { return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR); @@ -205,19 +212,18 @@ wxSockAddress *wxIPV4address::Clone() const 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) + return wxString::Format(_T("%lu.%lu.%lu.%lu"), + (raw>>24) & 0xff, + (raw>>16) & 0xff, + (raw>>8) & 0xff, + raw & 0xff ); } bool wxIPV4address::operator==(const wxIPV4address& addr) const { - if(Hostname().Cmp(addr.Hostname().c_str()) == 0 && Service() == addr.Service()) return true; - return false; + return Hostname().Cmp(addr.Hostname()) == 0 && + Service() == addr.Service(); } #if wxUSE_IPV6 @@ -231,7 +237,7 @@ wxIPV6address::wxIPV6address() } wxIPV6address::wxIPV6address(const wxIPV6address& other) - : wxIPaddress(other) + : wxIPaddress(other), m_origHostname(other.m_origHostname) { } @@ -246,68 +252,124 @@ bool wxIPV6address::Hostname(const wxString& name) wxLogWarning( _("Trying to solve a NULL hostname: giving up") ); return false; } - return (GAddress_INET_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR); + m_origHostname = name; + return (GAddress_INET6_SetHostName(m_address, name.mb_str()) == GSOCK_NOERROR); } -bool wxIPV6address::Hostname(unsigned char[16] WXUNUSED(addr)) +bool wxIPV6address::Hostname(unsigned char addr[16]) { - return true; + wxString name; + unsigned short wk[8]; + for ( int i = 0; i < 8; ++i ) + { + wk[i] = addr[2*i]; + wk[i] <<= 8; + wk[i] |= addr[2*i+1]; + } + name.Printf("%x:%x:%x:%x:%x:%x:%x:%x", + wk[0], wk[1], wk[2], wk[3], wk[4], wk[5], wk[6], wk[7]); + return Hostname(name); } bool wxIPV6address::Service(const wxString& name) { - return (GAddress_INET_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR); + return (GAddress_INET6_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR); } bool wxIPV6address::Service(unsigned short port) { - return (GAddress_INET_SetPort(m_address, port) == GSOCK_NOERROR); + return (GAddress_INET6_SetPort(m_address, port) == GSOCK_NOERROR); } bool wxIPV6address::LocalHost() { - return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR); + return (GAddress_INET6_SetHostName(m_address, "localhost") == GSOCK_NOERROR); } bool wxIPV6address::IsLocalHost() const { - return (Hostname() == wxT("localhost") || IPAddress() == wxT("127.0.0.1")); + if ( Hostname() == "localhost" ) + return true; + + wxString addr = IPAddress(); + return addr == wxT("::1") || + addr == wxT("0:0:0:0:0:0:0:1") || + addr == wxT("::ffff:127.0.0.1"); +} + +bool wxIPV6address::BroadcastAddress() +{ + wxFAIL_MSG( "not implemented" ); + + return false; } bool wxIPV6address::AnyAddress() { - return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR); + return (GAddress_INET6_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) - ); + unsigned char addr[16]; + GAddress_INET6_GetHostAddress(m_address,(in6_addr*)addr); + + wxUint16 words[8]; + int i, + prefix_zero_count = 0; + for ( i = 0; i < 8; ++i ) + { + words[i] = addr[i*2]; + words[i] <<= 8; + words[i] |= addr[i*2+1]; + if ( i == prefix_zero_count && words[i] == 0 ) + ++prefix_zero_count; + } + + wxString result; + if ( prefix_zero_count == 8 ) + { + result = wxT( "::" ); + } + else if ( prefix_zero_count == 6 && words[5] == 0xFFFF ) + { + // IPv4 mapped + result.Printf("::ffff:%d.%d.%d.%d", + addr[12], addr[13], addr[14], addr[15]); + } + else // general case + { + result = ":"; + for ( i = prefix_zero_count; i < 8; ++i ) + { + result += wxString::Format(":%x", words[i]); + } + } + + return result; } wxString wxIPV6address::Hostname() const { char hostname[1024]; - hostname[0] = 0; - GAddress_INET_GetHostName(m_address, hostname, 1024); + + if ( GAddress_INET6_GetHostName(m_address, + hostname, + WXSIZEOF(hostname)) != GSOCK_NOERROR ) + return wxEmptyString; + return wxString::FromAscii(hostname); } unsigned short wxIPV6address::Service() const { - return GAddress_INET_GetPort(m_address); + return GAddress_INET6_GetPort(m_address); } #endif // wxUSE_IPV6 -#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINDOWS__) && !defined(__WINE__) // --------------------------------------------------------------------------- // wxUNIXaddress