#include "wx/object.h"
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/thread.h"
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__CYGWIN__)
#include <netdb.h>
#include <arpa/inet.h>
#endif // __UNIX__
#ifdef __WXMSW__
#define HAVE_INET_ADDR
+ #ifndef HAVE_GETHOSTBYNAME
#define HAVE_GETHOSTBYNAME
+ #endif
+ #ifndef HAVE_GETSERVBYNAME
#define HAVE_GETSERVBYNAME
+ #endif
// under MSW getxxxbyname() functions are MT-safe (but not reentrant) so
// we don't need to serialize calls to them
#endif
// the _r functions need the extra buffer parameter but unfortunately its type
-// differs between different systems
+// differs between different systems and for the systems which use opaque
+// structs for it (at least AIX and OpenBSD) it must be zero-filled before
+// being passed to the system functions
#ifdef HAVE_FUNC_GETHOSTBYNAME_R_3
- typedef hostent_data wxGethostBuf;
+ struct wxGethostBuf : hostent_data
+ {
+ wxGethostBuf()
+ {
+ memset(this, 0, sizeof(hostent_data));
+ }
+ };
#else
typedef char wxGethostBuf[1024];
#endif
-#ifdef HAVE_FUNC_GETSERVBYNAME_R_3
- typedef servent_data wxGetservBuf;
+#ifdef HAVE_FUNC_GETSERVBYNAME_R_4
+ struct wxGetservBuf : servent_data
+ {
+ wxGethostBuf()
+ {
+ memset(this, 0, sizeof(servent_data));
+ }
+ };
#else
typedef char wxGetservBuf[1024];
#endif
-#ifdef wxHAS_MT_SAFE_GETBY_FUNCS
+#if defined(wxHAS_MT_SAFE_GETBY_FUNCS) || !wxUSE_THREADS
#define wxLOCK_GETBY_MUTEX(name)
#else // may need mutexes to protect getxxxbyxxx() calls
#if defined(HAVE_GETHOSTBYNAME) || \
servent *wxGetservbyname_r(const char *port,
const char *protocol,
servent *serv,
- wxGetservBuf buffer,
+ wxGetservBuf& buffer,
int size)
{
servent *se;
#elif defined(HAVE_FUNC_GETSERVBYNAME_R_5)
se = getservbyname_r(port, protocol, serv, buffer, size);
#elif defined(HAVE_FUNC_GETSERVBYNAME_R_4)
- se = getservbyname_r(port, protocol, serv, &buffer);
+ if ( getservbyname_r(port, protocol, serv, &buffer) != 0 )
+ return NULL;
#elif defined(HAVE_GETSERVBYNAME)
wxLOCK_GETBY_MUTEX(serv);
if ( !addr )
return false;
- const wxUTF8Buf namebuf(name.utf8_str());
+ const wxScopedCharBuffer namebuf(name.utf8_str());
// first check if this is an address in quad dotted notation
#if defined(HAVE_INET_ATON)
if ( !addr )
return false;
- const wxUTF8Buf buf(path.utf8_str());
+ const wxScopedCharBuffer buf(path.utf8_str());
if ( strlen(buf) >= UNIX_PATH_MAX )
return false;
// wxSockAddress
// ----------------------------------------------------------------------------
+const sockaddr *wxSockAddress::GetAddressData() const
+{
+ return GetAddress().GetAddr();
+}
+
+int wxSockAddress::GetAddressDataLen() const
+{
+ return GetAddress().GetLen();
+}
+
void wxSockAddress::Init()
{
- if ( !wxSocketBase::IsInitialized() )
+ if ( wxIsMainThread() && !wxSocketBase::IsInitialized() )
{
// we must do it before using any socket functions
(void)wxSocketBase::Initialize();
return wxString::Format
(
- "%lu.%lu.%lu.%lu",
+ "%u.%u.%u.%u",
(addr >> 24) & 0xff,
(addr >> 16) & 0xff,
(addr >> 8) & 0xff,