X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/783b6cfda43499b5c12022127401e7c8b28e390d..d1efca1a2ac2dd20d47d217ce2be1bcc506377e0:/src/common/sckaddr.cpp diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index 1656a2c8b7..ff8739c79d 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -10,416 +10,268 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "sckaddr.h" + #pragma implementation "sckaddr.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_SOCKETS #ifndef WX_PRECOMP -#endif - -#include -#include -#include - -#if !defined(__MWERKS__) && !defined(__SALFORDC__) -#include -#endif - -#include "wx/defs.h" -#include "wx/object.h" - -#if defined(__WXMAC__) -#include "/wx/mac/macsock.h" -#endif - -#if defined(__WINDOWS__) -#include -#endif // __WINDOWS__ - -#if defined(__UNIX__) -#ifdef VMS -#include -#include -#else -#include -#include -#include -#include -#endif -#include -#include - -#ifdef __SUN__ -extern "C" -{ - struct hostent *gethostbyname(const char *name); - int gethostname(char *name, int namelen); -}; -#endif - -#endif // __UNIX__ - + #include "wx/defs.h" + #include "wx/object.h" + #include "wx/log.h" + #include "wx/intl.h" + + #include + #include + #include + + #if !defined(__MWERKS__) && !defined(__SALFORDC__) + #include + #endif +#endif // !WX_PRECOMP + +#include "wx/gsocket.h" +#include "wx/socket.h" #include "wx/sckaddr.h" -#define CHECK_ADDRTYPE(var, type) - -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxSockAddress, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress) #ifdef ENABLE_IPV6 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress) #endif -#ifdef __UNIX__ +#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__)) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif -#endif -wxIPV4address::wxIPV4address() +// --------------------------------------------------------------------------- +// wxIPV4address +// --------------------------------------------------------------------------- + +void wxSockAddress::Init() { - m_addr = new sockaddr_in; - Clear(); + if ( !wxSocketBase::IsInitialized() ) + { + // we must do it before using GAddress_XXX functions + (void)wxSocketBase::Initialize(); + } } -wxIPV4address::~wxIPV4address() +wxSockAddress::wxSockAddress() { + Init(); + + m_address = GAddress_new(); } -int wxIPV4address::SockAddrLen() +wxSockAddress::wxSockAddress(const wxSockAddress& other) + : wxObject() { - return sizeof(*m_addr); + Init(); + + m_address = GAddress_copy(other.m_address); } -int wxIPV4address::GetFamily() +wxSockAddress::~wxSockAddress() { - return AF_INET; + GAddress_destroy(m_address); } -void wxIPV4address::Clear() +void wxSockAddress::SetAddress(GAddress *address) { - memset(m_addr, 0, sizeof(*m_addr)); - m_addr->sin_family = AF_INET; - m_addr->sin_addr.s_addr = INADDR_ANY; + GAddress_destroy(m_address); + m_address = GAddress_copy(address); } -/* -const wxSockAddress& wxIPV4address::operator =(const wxSockAddress& addr) +wxSockAddress& wxSockAddress::operator=(const wxSockAddress& addr) { - wxIPV4address *ip_addr = (wxIPV4address *)&addr; - CHECK_ADDRTYPE(addr, wxIPV4address); - m_addr = ip_addr->m_addr; + SetAddress(addr.GetAddress()); return *this; } -*/ -bool wxIPV4address::Hostname(const wxString& name) +void wxSockAddress::Clear() { - struct hostent *theHostent; - struct in_addr *addr; - - if (name.IsNull()) - return FALSE; - - if (!name.IsNumber()) { - if ((theHostent = gethostbyname(name.fn_str())) == 0) { - return FALSE; - } - } else { -#ifdef __WXMAC__ - long len_addr = inet_addr(name.fn_str()).s_addr ; -#else - long len_addr = inet_addr(name.fn_str()); -#endif - if (len_addr == -1) - return FALSE; - m_addr->sin_addr.s_addr = len_addr; - return TRUE; - } + GAddress_destroy(m_address); + m_address = GAddress_new(); +} - addr = (struct in_addr *) *(theHostent->h_addr_list); +// --------------------------------------------------------------------------- +// wxIPV4address +// --------------------------------------------------------------------------- - m_addr->sin_addr.s_addr = addr[0].s_addr; - return TRUE; +wxIPV4address::wxIPV4address() +{ } -bool wxIPV4address::Hostname(unsigned long addr) +wxIPV4address::wxIPV4address(const wxIPV4address& other) + : wxSockAddress(other) { - m_addr->sin_addr.s_addr = htonl(addr); - return TRUE; } -bool wxIPV4address::Service(const wxString& name) +wxIPV4address::~wxIPV4address() { - struct servent *theServent; - - if (name.IsNull()) - return FALSE; - - if (!name.IsNumber()) { - if ((theServent = getservbyname(name.fn_str(), "tcp")) == 0) - return FALSE; - } else { - if ((theServent = getservbyport(wxAtoi(name), "tcp")) == 0) { - m_addr->sin_port = htons(wxAtoi(name)); - return TRUE; - } - } - - m_addr->sin_port = theServent->s_port; - return TRUE; } -bool wxIPV4address::Service(unsigned short port) +bool wxIPV4address::Hostname(const wxString& name) { - m_addr->sin_port = htons(port); - return TRUE; + // Some people are sometimes fool. + if (name == wxT("")) + { + 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::LocalHost() +bool wxIPV4address::Hostname(unsigned long addr) { - static char buf[256]; - - if (gethostname(buf, sizeof(buf)) < 0) - return Hostname("localhost"); + bool rv = (GAddress_INET_SetHostAddress(m_address, addr) == GSOCK_NOERROR); + if (rv) + m_origHostname = Hostname(); else - return Hostname(buf); + m_origHostname = ""; + return rv; } -wxString wxIPV4address::Hostname() +bool wxIPV4address::Service(const wxString& name) { - struct hostent *h_ent; - - h_ent = gethostbyaddr((char *)&(m_addr->sin_addr), sizeof(m_addr->sin_addr), - GetFamily()); - - if (!h_ent) - return wxString(""); - else - return wxString(h_ent->h_name); + return (GAddress_INET_SetPortName(m_address, name.mb_str(), "tcp") == GSOCK_NOERROR); } -unsigned short wxIPV4address::Service() +bool wxIPV4address::Service(unsigned short port) { - return ntohs(m_addr->sin_port); + return (GAddress_INET_SetPort(m_address, port) == GSOCK_NOERROR); } -void wxIPV4address::Build(struct sockaddr *&addr, size_t& len) +bool wxIPV4address::LocalHost() { - addr = (struct sockaddr *)m_addr; - len = sizeof(*m_addr); + return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR); } -void wxIPV4address::Disassemble(struct sockaddr *addr, size_t len) +bool wxIPV4address::AnyAddress() { - if (len != sizeof(*m_addr)) - return; - *m_addr = *(struct sockaddr_in *)addr; + return (GAddress_INET_SetAnyAddress(m_address) == GSOCK_NOERROR); } -#ifdef IPV6_ENABLE - -wxIPV6address::wxIPV6address() +wxString wxIPV4address::Hostname() { - m_addr = new sockaddr_in6; - Clear(); + char hostname[1024]; + + hostname[0] = 0; + GAddress_INET_GetHostName(m_address, hostname, 1024); + return wxString(hostname); } -wxIPV6address::~wxIPV6address() +unsigned short wxIPV4address::Service() { + return GAddress_INET_GetPort(m_address); } -int wxIPV6address::SockAddrLen() +wxSockAddress *wxIPV4address::Clone() const { - return sizeof(*m_addr); + wxIPV4address *addr = new wxIPV4address(*this); + addr->m_origHostname = m_origHostname; + return addr; } -int wxIPV6address::GetFamily() +#if 0 +// --------------------------------------------------------------------------- +// wxIPV6address +// --------------------------------------------------------------------------- + +wxIPV6address::wxIPV6address() + : wxSockAddress() { - return AF_INET6; } -void wxIPV6address::Clear() -{ - memset(m_addr, 0, sizeof(*m_addr)); - m_addr->sin6_family = AF_INET6; - m_addr->sin6_addr.s_addr = INADDR_ANY; +wxIPV6address::wxIPV6address(const wxIPV6address& other) + : wxSockAddress(other) +{ } -/* -const wxSockAddress& wxIPV6address::operator =(const wxSockAddress& addr) +wxIPV6address::~wxIPV6address() { - wxIPV6address *ip_addr = (wxIPV6address *)&addr; - - CHECK_ADDRTYPE(addr, wxIPV6address); - m_addr = ip_addr->m_addr; - return *this; } -*/ bool wxIPV6address::Hostname(const wxString& name) { - struct hostent *theHostent; - struct in_addr *addr; - - if (name.IsNull()) - return FALSE; - - if (!name.IsNumber()) { - hostent = gethostbyname2((char*) name, AF_INET6); - if (!theHostent) - return FALSE; - } else { - // Don't how to do - return FALSE; - } - - addr = (struct in6_addr *) *(theHostent->h_addr_list); - - m_addr->sin6_addr.s6_addr = addr[0].s6_addr; - return TRUE; + return (GAddress_INET_SetHostName(m_address, name.fn_str()) == GSOCK_NOERROR); } bool wxIPV6address::Hostname(unsigned char addr[16]) { - m_addr->sin6_addr.s6_addr = addr; return TRUE; } bool wxIPV6address::Service(const char *name) { - struct servent *theServent; - - if (!name || !strlen(name)) - return FALSE; - - if (!isdigit(*name)) { - if ((theServent = getservbyname((char*) name, "tcp")) == 0) - return FALSE; - } else { - if ((theServent = getservbyport(atoi(name), "tcp")) == 0) { - m_addr->sin_port = htons(atoi(name)); - return TRUE; - } - } - - m_addr->sin_port = theServent->s_port; - return TRUE; + return (GAddress_INET_SetPortName(m_address, name.fn_str()) == GSOCK_NOERROR); } bool wxIPV6address::Service(unsigned short port) { - m_addr->sin_port = htons(port); - return TRUE; + return (GAddress_INET_SetPort(m_address, port) == GSOCK_NOERROR); } bool wxIPV6address::LocalHost() { - static char buf[256]; - - if (gethostname(buf, sizeof(buf)) < 0) - return Hostname("localhost"); - else - return Hostname(buf); + return (GAddress_INET_SetHostName(m_address, "localhost") == GSOCK_NOERROR); } const wxString& wxIPV6address::Hostname() { - struct hostent *h_ent; - - h_ent = gethostbyaddr((char *)&(m_addr->sin_addr), sizeof(m_addr->sin_addr), - GetFamily()); - return wxString(h_ent->h_name); + return wxString(GAddress_INET_GetHostName(m_address)); } unsigned short wxIPV6address::Service() { - return ntohs(m_addr->sin_port); + return GAddress_INET_GetPort(m_address); } -void wxIPV6address::Build(struct sockaddr& *addr, size_t& len) -{ - len = sizeof(*m_addr); - addr = m_addr; -} +#endif // 0 -void wxIPV6address::Disassemble(struct sockaddr& *addr, size_t len) -{ - if (len != sizeof(*m_addr)) - return; - *m_addr = *(struct sockaddr_in6 *)addr; -} +#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__)) -#endif - -#ifdef __UNIX__ -#include +// --------------------------------------------------------------------------- +// wxUNIXaddress +// --------------------------------------------------------------------------- wxUNIXaddress::wxUNIXaddress() + : wxSockAddress() { - m_addr = new sockaddr_un; - Clear(); -} - -wxUNIXaddress::~wxUNIXaddress() -{ -} - -int wxUNIXaddress::SockAddrLen() -{ - return sizeof(*m_addr); } -int wxUNIXaddress::GetFamily() +wxUNIXaddress::wxUNIXaddress(const wxUNIXaddress& other) + : wxSockAddress(other) { - return AF_UNIX; } -void wxUNIXaddress::Clear() -{ - memset(m_addr, 0, sizeof(m_addr)); - m_addr->sun_family = AF_UNIX; -} - -/* -const wxSockAddress& wxUNIXaddress::operator =(const wxSockAddress& addr) +wxUNIXaddress::~wxUNIXaddress() { - wxUNIXaddress *unx_addr = (wxUNIXaddress *)&addr; - CHECK_ADDRTYPE(addr, wxUNIXaddress); - m_addr = unx_addr->m_addr; - return *this; } -*/ void wxUNIXaddress::Filename(const wxString& fname) { - sprintf(m_addr->sun_path, "%s", MBSTRINGCAST fname.mb_str()); + GAddress_UNIX_SetPath(m_address, fname.fn_str()); } wxString wxUNIXaddress::Filename() { - return wxString(m_addr->sun_path); -} + char path[1024]; -void wxUNIXaddress::Build(struct sockaddr*& addr, size_t& len) -{ - addr = (struct sockaddr *)m_addr; - len = sizeof(*m_addr); + path[0] = 0; + GAddress_UNIX_GetPath(m_address, path, 1024); + return wxString(path); } -void wxUNIXaddress::Disassemble(struct sockaddr *addr, size_t len) -{ - if (len != sizeof(*m_addr)) - return; - *m_addr = *(struct sockaddr_un *)addr; -} -#endif +#endif // __UNIX__ -#endif +#endif // wxUSE_SOCKETS