Ticket #1532: filezilla_2530.patch

configure.in

@@ -102 +102 @@
   AC_CHECK_HEADERS([utmpx.h sys/select.h],,,[
   #include <sys/types.h>
   #include <utmp.h>])
+  AC_CHECK_HEADERS([netinet/in.h arpa/inet.h netdb.h])
 
   AC_SEARCH_LIBS([socket], [xnet])
-  AC_SEARCH_LIBS([getaddrinfo], [xnet])
+  AC_SEARCH_LIBS([getaddrinfo], [xnet ws2_32])
   AC_SEARCH_LIBS([in6addr_loopback], [socket])
 
-  AC_CHECK_FUNCS([getaddrinfo ptsname setresuid strsignal updwtmpx])
+  AC_CHECK_FUNCS([getaddrinfo freeaddrinfo getnameinfo ptsname setresuid strsignal updwtmpx])
   AC_CHECK_FUNCS([gettimeofday ftime])
   AC_CHECK_FUNCS([in6addr_loopback in6addr_any])
+  AC_CHECK_FUNC([inet_ntop])
 
 AH_BOTTOM([
 /* Convert autoconf definitions to ones that PuTTY wants. */
 
-#ifndef HAVE_GETADDRINFO
+#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_FREEADDRINFO) || !defined(HAVE_GETNAMEINFO)
 # define NO_IPV6
 #endif
 #ifndef HAVE_SETRESUID

src/engine/inet_ntop.h

@@ +1 @@
+/* Convert internet address from internal to printable, presentable format.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef INET_NTOP_H
+#define INET_NTOP_H
+
+#include "FileZilla.h"
+#ifdef __WXMSW__
+  #include <winsock2.h>
+  #include <ws2tcpip.h>
+#else
+  #include <sys/types.h>
+  #include <sys/socket.h>
+  #if HAVE_NETINET_IN_H
+    #include <netinet/in.h>
+  #endif
+  #if HAVE_ARPA_INET_H
+    #include <arpa/inet.h>
+  #endif
+#endif
+
+/* Converts an internet address from internal format to a printable,
+   presentable format.
+   AF is an internet address family, such as AF_INET or AF_INET6.
+   SRC points to a 'struct in_addr' (for AF_INET) or 'struct in6_addr'
+   (for AF_INET6).
+   DST points to a buffer having room for CNT bytes.
+   The printable representation of the address (in numeric form, not
+   surrounded by [...], no reverse DNS is done) is placed in DST, and
+   DST is returned.  If an error occurs, the return value is NULL and
+   errno is set.  If CNT bytes are not sufficient to hold the result,
+   the return value is NULL and errno is set to ENOSPC.  A good value
+   for CNT is 46.
+
+   For more details, see the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/inet_ntop.html>.  */
+
+#if !HAVE_INET_NTOP
+const char *inet_ntop (int af, const void *src,
+                  char *dst, socklen_t cnt);
+#endif
+
+#endif /* INET_NTOP_H */

src/engine/getaddrinfo.cpp

@@ +1 @@
+/* Get address information (partial implementation).
+   Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006, 2007 Free Software
+   Foundation, Inc.
+   Contributed by Simon Josefsson <simon@josefsson.org>.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "FileZilla.h"
+#include <wx/dynlib.h>
+
+#include "getaddrinfo.h"
+
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+/* Get calloc. */
+#include <stdlib.h>
+
+/* Get memcpy, strdup. */
+#include <string.h>
+
+/* Get snprintf. */
+#include <stdio.h>
+
+#include <stdbool.h>
+
+#include "inet_ntop.h"
+
+/* BeOS has AF_INET, but not PF_INET.  */
+#ifndef PF_INET
+# define PF_INET AF_INET
+#endif
+/* BeOS also lacks PF_UNSPEC.  */
+#ifndef PF_UNSPEC
+# define PF_UNSPEC 0
+#endif
+
+#if defined _WIN32 || defined __WIN32__ || defined __WXMSW__
+# define WIN32_NATIVE
+#endif
+
+#ifdef WIN32_NATIVE
+typedef int (WSAAPI *getaddrinfo_func) (const char*, const char*,
+                    const struct addrinfo*,
+                    struct addrinfo**);
+typedef void (WSAAPI *freeaddrinfo_func) (struct addrinfo*);
+typedef int (WSAAPI *getnameinfo_func) (const struct sockaddr*,
+                    socklen_t, char*, DWORD,
+                    char*, DWORD, int);
+
+static getaddrinfo_func getaddrinfo_ptr = NULL;
+static freeaddrinfo_func freeaddrinfo_ptr = NULL;
+static getnameinfo_func getnameinfo_ptr = NULL;
+
+wxDynamicLibrary *ws2_32;
+
+static int
+use_win32_p (void)
+{
+  static int done = 0;
+
+  if (done)
+    return getaddrinfo_ptr ? 1 : 0;
+
+  done = 1;
+  
+  ws2_32 = new wxDynamicLibrary(_("ws2_32"));
+
+  if (ws2_32)
+    {
+      getaddrinfo_ptr = (getaddrinfo_func) ws2_32->GetSymbol (_("getaddrinfo"));
+      freeaddrinfo_ptr = (freeaddrinfo_func) ws2_32->GetSymbol (_("freeaddrinfo"));
+      getnameinfo_ptr = (getnameinfo_func) ws2_32->GetSymbol (_("getnameinfo"));
+    }
+
+  /* If either is missing, something is odd. */
+  if (!getaddrinfo_ptr || !freeaddrinfo_ptr || !getnameinfo_ptr)
+    {
+      getaddrinfo_ptr = NULL;
+      freeaddrinfo_ptr = NULL;
+      getnameinfo_ptr = NULL;
+      delete ws2_32;
+      return 0;
+    }
+
+  return 1;
+}
+#endif
+
+static inline bool
+validate_family (int family)
+{
+  /* FIXME: Support more families. */
+#ifdef NO_IPV6
+     if (family == PF_INET)
+       return true;
+#else
+     if (family == PF_INET6)
+       return true;
+#endif
+     if (family == PF_UNSPEC)
+       return true;
+     return false;
+}
+
+#if !HAVE_GETADDRINFO
+/* Translate name of a service location and/or a service name to set of
+   socket addresses. */
+int
+getaddrinfo (const char *nodename,
+         const char *servname,
+         const struct addrinfo *hints,
+         struct addrinfo **res)
+{
+  struct addrinfo *tmp;
+  int port = 0;
+  struct hostent *he;
+  void *storage;
+  size_t size;
+#ifdef NO_IPV6
+  struct v4_pair {
+    struct addrinfo addrinfo;
+    struct sockaddr_in sockaddr_in;
+  };
+#else
+  struct v6_pair {
+    struct addrinfo addrinfo;
+    struct sockaddr_in6 sockaddr_in6;
+  };
+#endif
+
+#ifdef WIN32_NATIVE
+  if (use_win32_p ())
+    return getaddrinfo_ptr (nodename, servname, hints, res);
+#endif
+
+  if (hints && (hints->ai_flags & ~(AI_CANONNAME|AI_PASSIVE)))
+    /* FIXME: Support more flags. */
+    return EAI_BADFLAGS;
+
+  if (hints && !validate_family (hints->ai_family))
+    return EAI_FAMILY;
+
+  if (hints &&
+      hints->ai_socktype != SOCK_STREAM && hints->ai_socktype != SOCK_DGRAM)
+    /* FIXME: Support other socktype. */
+    return EAI_SOCKTYPE; /* FIXME: Better return code? */
+
+  if (!nodename)
+    {
+      if (!(hints->ai_flags & AI_PASSIVE))
+    return EAI_NONAME;
+
+#ifdef NO_IPV6
+      nodename = "0.0.0.0";
+#else
+      nodename = (hints->ai_family == AF_INET6) ? "::" : "0.0.0.0";
+#endif
+    }
+
+  if (servname)
+    {
+      struct servent *se = NULL;
+      const char *proto =
+    (hints && hints->ai_socktype == SOCK_DGRAM) ? "udp" : "tcp";
+
+      if (hints == NULL || !(hints->ai_flags & AI_NUMERICSERV))
+    /* FIXME: Use getservbyname_r if available. */
+    se = getservbyname (servname, proto);
+
+      if (!se)
+    {
+      char *c;
+      if (!(*servname >= '0' && *servname <= '9'))
+        return EAI_NONAME;
+      port = strtoul (servname, &c, 10);
+      if (*c || port > 0xffff)
+        return EAI_NONAME;
+      port = htons (port);
+    }
+      else
+    port = se->s_port;
+    }
+
+  /* FIXME: Use gethostbyname_r if available. */
+  he = gethostbyname (nodename);
+  if (!he || he->h_addr_list[0] == NULL)
+    return EAI_NONAME;
+
+  switch (he->h_addrtype)
+    {
+#ifdef NO_IPV6
+    case PF_INET:
+      size = sizeof (struct v4_pair);
+      break;
+#else
+    case PF_INET6:
+      size = sizeof (struct v6_pair);
+      break;
+#endif
+
+    default:
+      return EAI_NODATA;
+    }
+
+  storage = calloc (1, size);
+  if (!storage)
+    return EAI_MEMORY;
+
+  switch (he->h_addrtype)
+    {
+#ifdef NO_IPV6
+    case PF_INET:
+      {
+    struct v4_pair *p = (struct v4_pair *)storage;
+    struct sockaddr_in *sinp = &p->sockaddr_in;
+    tmp = &p->addrinfo;
+
+    if (port)
+      sinp->sin_port = port;
+
+    if (he->h_length != sizeof (sinp->sin_addr))
+      {
+        free (storage);
+        return EAI_SYSTEM; /* FIXME: Better return code?  Set errno? */
+      }
+
+    memcpy (&sinp->sin_addr, he->h_addr_list[0], sizeof sinp->sin_addr);
+
+    tmp->ai_addr = (struct sockaddr *) sinp;
+    tmp->ai_addrlen = sizeof *sinp;
+      }
+      break;
+#else
+    case PF_INET6:
+      {
+    struct v6_pair *p = (struct v6_pair *)storage;
+    struct sockaddr_in6 *sinp = &p->sockaddr_in6;
+    tmp = &p->addrinfo;
+
+    if (port)
+      sinp->sin6_port = port;
+
+    if (he->h_length != sizeof (sinp->sin6_addr))
+      {
+        free (storage);
+        return EAI_SYSTEM; /* FIXME: Better return code?  Set errno? */
+      }
+
+    memcpy (&sinp->sin6_addr, he->h_addr_list[0], sizeof sinp->sin6_addr);
+
+    tmp->ai_addr = (struct sockaddr *) sinp;
+    tmp->ai_addrlen = sizeof *sinp;
+      }
+      break;
+#endif
+
+    default:
+      free (storage);
+      return EAI_NODATA;
+    }
+
+  if (hints && hints->ai_flags & AI_CANONNAME)
+    {
+      const char *cn;
+      if (he->h_name)
+    cn = he->h_name;
+      else
+    cn = nodename;
+
+      tmp->ai_canonname = strdup (cn);
+      if (!tmp->ai_canonname)
+    {
+      free (storage);
+      return EAI_MEMORY;
+    }
+    }
+
+  tmp->ai_protocol = (hints) ? hints->ai_protocol : 0;
+  tmp->ai_socktype = (hints) ? hints->ai_socktype : 0;
+  tmp->ai_addr->sa_family = he->h_addrtype;
+  tmp->ai_family = he->h_addrtype;
+
+  /* FIXME: If more than one address, create linked list of addrinfo's. */
+
+  *res = tmp;
+
+  return 0;
+}
+#endif /* !HAVE_GETADDRINFO */
+
+#if !HAVE_FREEADDRINFO
+/* Free `addrinfo' structure AI including associated storage.  */
+void
+freeaddrinfo (struct addrinfo *ai)
+{
+#ifdef WIN32_NATIVE
+  if (use_win32_p ())
+    {
+      freeaddrinfo_ptr (ai);
+      return;
+    }
+#endif
+
+  while (ai)
+    {
+      struct addrinfo *cur;
+
+      cur = ai;
+      ai = ai->ai_next;
+
+      if (cur->ai_canonname) free (cur->ai_canonname);
+      free (cur);
+    }
+}
+#endif /* !HAVE_FREEADDRINFO */
+
+#if !HAVE_GETNAMEINFO
+int getnameinfo(const struct sockaddr *sa, socklen_t salen,
+        char *node, socklen_t nodelen,
+        char *service, socklen_t servicelen,
+        int flags)
+{
+#ifdef WIN32_NATIVE
+  if (use_win32_p ())
+    return getnameinfo_ptr (sa, salen, node, nodelen,
+                service, servicelen, flags);
+#endif
+
+  /* FIXME: Support other flags. */
+  if ((node && nodelen > 0 && !(flags & NI_NUMERICHOST)) ||
+      (service && servicelen > 0 && !(flags & NI_NUMERICHOST)) ||
+      (flags & ~(NI_NUMERICHOST|NI_NUMERICSERV)))
+    return EAI_BADFLAGS;
+
+  if (sa == NULL || salen < sizeof (sa->sa_family))
+    return EAI_FAMILY;
+
+  switch (sa->sa_family)
+    {
+#ifdef NO_IPV6
+    case AF_INET:
+      if (salen < sizeof (struct sockaddr_in))
+    return EAI_FAMILY;
+      break;
+#else
+    case AF_INET6:
+      if (salen < sizeof (struct sockaddr_in6))
+    return EAI_FAMILY;
+      break;
+#endif
+    default:
+      return EAI_FAMILY;
+    }
+
+  if (node && nodelen > 0 && flags & NI_NUMERICHOST)
+    {
+      switch (sa->sa_family)
+    {
+#ifdef NO_IPV6
+    case AF_INET:
+      if (!inet_ntop (AF_INET,
+              &(((const struct sockaddr_in *) sa)->sin_addr),
+              node, nodelen))
+        return EAI_SYSTEM;
+      break;
+#else
+    case AF_INET6:
+      if (!inet_ntop (AF_INET6,
+              &(((const struct sockaddr_in6 *) sa)->sin6_addr),
+              node, nodelen))
+        return EAI_SYSTEM;
+      break;
+#endif
+
+    default:
+      return EAI_FAMILY;
+    }
+    }
+
+  if (service && servicelen > 0 && flags & NI_NUMERICSERV)
+    switch (sa->sa_family)
+      {
+#ifdef NO_IPV6
+      case AF_INET:
+#else
+      case AF_INET6:
+#endif
+    {
+      unsigned short int port
+        = ntohs (((const struct sockaddr_in *) sa)->sin_port);
+      if (servicelen <= snprintf (service, servicelen, "%u", port))
+        return EAI_OVERFLOW;
+    }
+    break;
+      }
+
+  return 0;
+}
+#endif /* !HAVE_GETNAMEINFO */

src/engine/socket.cpp

@@ +1 @@
+#include "FileZilla.h"
 #include <wx/defs.h>
 #ifdef __WXMSW__
+  #include <winsock2.h>
+  #include <ws2tcpip.h>
   // MinGW needs this for getaddrinfo
   #if defined(_WIN32_WINNT)
     #if _WIN32_WINNT < 0x0501
-      #undef _WIN32_WINNT
-      #define _WIN32_WINNT 0x0501
+      #include "getaddrinfo.h"
     #endif
   #else
-    #define _WIN32_WINNT 0x0501
+    #include "getaddrinfo.h"
   #endif
-  #include <winsock2.h>
-  #include <ws2tcpip.h>
 #endif
-#include "FileZilla.h"
 #include "socket.h"
 #include "threadex.h"
 #include <errno.h>

src/engine/inet_ntop.cpp

@@ +1 @@
+/* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
+
+   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/*
+ * Copyright (c) 1996-1999 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#include "FileZilla.h"
+
+/* Specification.  */
+#include "inet_ntop.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#ifndef EAFNOSUPPORT
+# define EAFNOSUPPORT EINVAL
+#endif
+
+#define NS_IN6ADDRSZ 16
+#define NS_INT16SZ 2
+
+/*
+ * WARNING: Don't even consider trying to compile this on a system where
+ * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
+ */
+typedef int verify_int_size[2 * sizeof (int) - 7];
+
+#ifdef NO_IPV6
+static const char *inet_ntop4 (const unsigned char *src, char *dst, socklen_t size);
+#else
+static const char *inet_ntop6 (const unsigned char *src, char *dst, socklen_t size);
+#endif
+
+
+#if !HAVE_INET_NTOP
+/* char *
+ * inet_ntop(af, src, dst, size)
+ *  convert a network format address to presentation format.
+ * return:
+ *  pointer to presentation format address (`dst'), or NULL (see errno).
+ * author:
+ *  Paul Vixie, 1996.
+ */
+const char *
+inet_ntop (int af, const void *src,
+       char *dst, socklen_t cnt)
+{
+  switch (af)
+    {
+#ifdef NO_IPV6
+    case AF_INET:
+      return (inet_ntop4 ((unsigned char *)src, dst, cnt));
+#else
+    case AF_INET6:
+      return (inet_ntop6 ((unsigned char *)src, dst, cnt));
+#endif
+
+    default:
+      errno = EAFNOSUPPORT;
+      return (NULL);
+    }
+  /* NOTREACHED */
+}
+#endif /* !HAVE_INET_NTOP */
+
+#ifdef NO_IPV6
+/* const char *
+ * inet_ntop4(src, dst, size)
+ *  format an IPv4 address
+ * return:
+ *  `dst' (as a const)
+ * notes:
+ *  (1) uses no statics
+ *  (2) takes a u_char* not an in_addr as input
+ * author:
+ *  Paul Vixie, 1996.
+ */
+static const char *
+inet_ntop4 (const unsigned char *src, char *dst, socklen_t size)
+{
+  char tmp[sizeof "255.255.255.255"];
+  int len;
+
+  len = sprintf (tmp, "%u.%u.%u.%u", src[0], src[1], src[2], src[3]);
+  if (len < 0)
+    return NULL;
+
+  if (len > size)
+    {
+      errno = ENOSPC;
+      return NULL;
+    }
+
+  return strcpy (dst, tmp);
+}
+
+#else
+  
+/* const char *
+ * inet_ntop6(src, dst, size)
+ *  convert IPv6 binary address into presentation (printable) format
+ * author:
+ *  Paul Vixie, 1996.
+ */
+static const char *
+inet_ntop6 (const unsigned char *src, char *dst, socklen_t size)
+{
+  /*
+   * Note that int32_t and int16_t need only be "at least" large enough
+   * to contain a value of the specified size.  On some systems, like
+   * Crays, there is no such thing as an integer variable with 16 bits.
+   * Keep this in mind if you think this function should have been coded
+   * to use pointer overlays.  All the world's not a VAX.
+   */
+  char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
+  struct
+  {
+    int base, len;
+  } best, cur;
+  unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];
+  int i;
+
+  /*
+   * Preprocess:
+   *      Copy the input (bytewise) array into a wordwise array.
+   *      Find the longest run of 0x00's in src[] for :: shorthanding.
+   */
+  memset (words, '\0', sizeof words);
+  for (i = 0; i < NS_IN6ADDRSZ; i += 2)
+    words[i / 2] = (src[i] << 8) | src[i + 1];
+  best.base = -1;
+  cur.base = -1;
+  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
+    {
+      if (words[i] == 0)
+    {
+      if (cur.base == -1)
+        cur.base = i, cur.len = 1;
+      else
+        cur.len++;
+    }
+      else
+    {
+      if (cur.base != -1)
+        {
+          if (best.base == -1 || cur.len > best.len)
+        best = cur;
+          cur.base = -1;
+        }
+    }
+    }
+  if (cur.base != -1)
+    {
+      if (best.base == -1 || cur.len > best.len)
+    best = cur;
+    }
+  if (best.base != -1 && best.len < 2)
+    best.base = -1;
+
+  /*
+   * Format the result.
+   */
+  tp = tmp;
+  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++)
+    {
+      /* Are we inside the best run of 0x00's? */
+      if (best.base != -1 && i >= best.base && i < (best.base + best.len))
+    {
+      if (i == best.base)
+        *tp++ = ':';
+      continue;
+    }
+      /* Are we following an initial run of 0x00s or any real hex? */
+      if (i != 0)
+    *tp++ = ':';
+      /* Is this address an encapsulated IPv4? */
+      if (i == 6 && best.base == 0 &&
+      (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
+    {
+      if (!inet_ntop4 (src + 12, tp, sizeof tmp - (tp - tmp)))
+        return (NULL);
+      tp += strlen (tp);
+      break;
+    }
+      {
+    int len = sprintf (tp, "%x", words[i]);
+    if (len < 0)
+      return NULL;
+    tp += len;
+      }
+    }
+  /* Was it a trailing run of 0x00's? */
+  if (best.base != -1 && (best.base + best.len) ==
+      (NS_IN6ADDRSZ / NS_INT16SZ))
+    *tp++ = ':';
+  *tp++ = '\0';
+
+  /*
+   * Check for overflow, copy, and we're done.
+   */
+  if ((socklen_t) (tp - tmp) > size)
+    {
+      errno = ENOSPC;
+      return NULL;
+    }
+
+  return strcpy (dst, tmp);
+}
+
+#endif

src/engine/Makefile.am

@@ -26 +26 @@
         server.cpp serverpath.cpp\
         servercapabilities.cpp \
         sftpcontrolsocket.cpp \
+        inet_ntop.cpp \
+        getaddrinfo.cpp \
         socket.cpp \
         tlssocket.cpp \
         threadex.cpp timeex.cpp transfersocket.cpp
@@ -40 +42 @@
         ratelimiter.h \
         servercapabilities.h \
         sftpcontrolsocket.h \
+        inet_ntop.h \
+        getaddrinfo.h \
         socket.h \
         tlssocket.h \
         transfersocket.h

src/engine/getaddrinfo.h

@@ +1 @@
+/* Get address information.
+   Copyright (C) 1996-2002, 2003, 2004, 2005, 2006
+                 Free Software Foundation, Inc.
+   Contributed by Simon Josefsson <simon@josefsson.org>.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef GETADDRINFO_H
+#define GETADDRINFO_H
+
+#include "FileZilla.h"
+#ifdef __WXMSW__
+  #include <winsock2.h>
+  #include <ws2tcpip.h>
+#else
+  /* sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 require sys/types.h, so include it first.
+     Then we'll also get 'socklen_t' and 'struct sockaddr' which are
+     used below. */
+  #include <sys/types.h>
+  /* Get all getaddrinfo related declarations, if available.  */
+  #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
+
+/* Possible values for `ai_flags' field in `addrinfo' structure.  */
+#ifndef AI_PASSIVE
+# define AI_PASSIVE 0x0001  /* Socket address is intended for `bind'.  */
+#endif
+#ifndef AI_CANONNAME
+# define AI_CANONNAME   0x0002  /* Request for canonical name.  */
+#endif
+#ifndef AI_NUMERICSERV
+# define AI_NUMERICSERV 0x0400  /* Don't use name resolution.  */
+#endif
+
+#if 0
+/* The commented out definitions below are not yet implemented in the
+   GNULIB getaddrinfo() replacement, so are not yet needed and may, in fact,
+   cause conflicts on systems with a getaddrinfo() function which does not
+   define them.
+
+   If they are restored, be sure to protect the definitions with #ifndef.  */
+#define AI_NUMERICHOST  0x0004  /* Don't use name resolution.  */
+#define AI_V4MAPPED 0x0008  /* IPv4 mapped addresses are acceptable.  */
+#define AI_ALL      0x0010  /* Return IPv4 mapped and IPv6 addresses.  */
+#define AI_ADDRCONFIG   0x0020  /* Use configuration of this host to choose
+                   returned address type..  */
+#endif /* 0 */
+
+/* Error values for `getaddrinfo' function.  */
+#ifndef EAI_BADFLAGS
+# define EAI_BADFLAGS     -1    /* Invalid value for `ai_flags' field.  */
+# define EAI_NONAME   -2    /* NAME or SERVICE is unknown.  */
+# define EAI_AGAIN    -3    /* Temporary failure in name resolution.  */
+# define EAI_FAIL     -4    /* Non-recoverable failure in name res.  */
+# define EAI_NODATA   -5    /* No address associated with NAME.  */
+# define EAI_FAMILY   -6    /* `ai_family' not supported.  */
+# define EAI_SOCKTYPE     -7    /* `ai_socktype' not supported.  */
+# define EAI_SERVICE      -8    /* SERVICE not supported for `ai_socktype'.  */
+# define EAI_MEMORY   -10   /* Memory allocation failure.  */
+#endif
+#ifndef EAI_OVERFLOW
+/* Not defined on mingw32. */
+# define EAI_OVERFLOW     -12   /* Argument buffer overflow.  */
+#endif
+#ifndef EAI_ADDRFAMILY
+/* Not defined on mingw32. */
+# define EAI_ADDRFAMILY  -9 /* Address family for NAME not supported.  */
+#endif
+#ifndef EAI_SYSTEM
+/* Not defined on mingw32. */
+# define EAI_SYSTEM   -11   /* System error returned in `errno'.  */
+#endif
+
+#ifdef __USE_GNU
+# ifndef EAI_INPROGRESS
+#  define EAI_INPROGRESS    -100    /* Processing request in progress.  */
+#  define EAI_CANCELED      -101    /* Request canceled.  */
+#  define EAI_NOTCANCELED   -102    /* Request not canceled.  */
+#  define EAI_ALLDONE       -103    /* All requests done.  */
+#  define EAI_INTR      -104    /* Interrupted by a signal.  */
+#  define EAI_IDN_ENCODE    -105    /* IDN encoding failed.  */
+# endif
+#endif
+
+#if !HAVE_GETADDRINFO
+/* Translate name of a service location and/or a service name to set of
+   socket addresses.
+   For more details, see the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/getaddrinfo.html>.  */
+int getaddrinfo (const char *nodename,
+            const char *servname,
+            const struct addrinfo *hints,
+            struct addrinfo **res);
+#endif
+
+#if !HAVE_FREEADDRINFO
+/* Free `addrinfo' structure AI including associated storage.
+   For more details, see the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/getaddrinfo.html>.  */
+void freeaddrinfo (struct addrinfo *ai);
+#endif
+
+#if !HAVE_GETNAMEINFO
+/* Convert socket address to printable node and service names.
+   For more details, see the POSIX:2001 specification
+   <http://www.opengroup.org/susv3xsh/getnameinfo.html>.  */
+int getnameinfo(const struct sockaddr *sa, socklen_t salen,
+               char *node, socklen_t nodelen,
+               char *service, socklen_t servicelen,
+               int flags);
+
+#endif
+
+/* Possible flags for getnameinfo.  */
+#ifndef NI_NUMERICHOST
+# define NI_NUMERICHOST 1
+#endif
+#ifndef NI_NUMERICSERV
+# define NI_NUMERICSERV 2
+#endif
+
+#endif /* GETADDRINFO_H */

README

@@ -35 +35 @@
 -----------------
 
 FileZilla has been tested on the following platforms:
-- Windows XP, 2003 and Vista (9x/ME/NT4/2000 not supported)
+- Windows XP, 2003 and Vista (9x/ME/NT4 not supported)
 - Several major Linux distributions
 - FreeBSD and other BSD variants
 - Mac OS X

data/install.nsi.in

@@ -257 +257 @@
 
 Function .onInit
 
-  ${Unless} ${AtLeastWinXP}
-    MessageBox MB_YESNO|MB_ICONSTOP "Unsupported operating system.$\nFileZilla ${VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?" IDYES installonoldwindows
+  ${Unless} ${AtLeastWin2000}
+    MessageBox MB_YESNO|MB_ICONSTOP "Unsupported operating system.$\nFileZilla ${VERSION} requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?" IDYES installonoldwindows
     Abort
 installonoldwindows:
   ${EndUnless}