X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fhost.c;h=86bf83b3dfe04ccb6abcfeaa7ea5656248691ae0;hb=85b98d08341ccd2abd2b0335465927e85eb20757;hp=fee5e40499f5a4ad13fbc66a1530d641c63fd4c6;hpb=6633b74930870ffb148c46129c738af78082d934;p=wget
diff --git a/src/host.c b/src/host.c
index fee5e404..86bf83b3 100644
--- a/src/host.c
+++ b/src/host.c
@@ -1,6 +1,7 @@
/* Host name resolution and matching.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
+ Inc.
This file is part of GNU Wget.
@@ -17,17 +18,18 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Wget. If not, see .
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables. You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL". If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version. */
+Additional permission under GNU GPL version 3 section 7
-#include
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work. */
+
+#include "wget.h"
#include
#include
@@ -35,20 +37,26 @@ so, delete this exception statement from your version. */
#include
#ifndef WINDOWS
+# include
# include
# include
# ifndef __BEOS__
# include
# endif
-# include
+# ifdef __VMS
+# include "vms_ip.h"
+# else /* def __VMS */
+# include
+# endif /* def __VMS [else] */
# define SET_H_ERRNO(err) ((void)(h_errno = (err)))
#else /* WINDOWS */
+# include
+# include
# define SET_H_ERRNO(err) WSASetLastError (err)
#endif /* WINDOWS */
#include
-#include "wget.h"
#include "utils.h"
#include "host.h"
#include "url.h"
@@ -58,6 +66,11 @@ so, delete this exception statement from your version. */
# define NO_ADDRESS NO_DATA
#endif
+#if !HAVE_DECL_H_ERRNO && !defined(WINDOWS)
+extern int h_errno;
+#endif
+
+
/* Lists of IP addresses that result from running DNS queries. See
lookup_host for details. */
@@ -192,7 +205,7 @@ address_list_from_addrinfo (const struct addrinfo *ai)
ip = al->addresses;
for (ptr = ai; ptr != NULL; ptr = ptr->ai_next)
- if (ptr->ai_family == AF_INET6)
+ if (ptr->ai_family == AF_INET6)
{
const struct sockaddr_in6 *sin6 =
(const struct sockaddr_in6 *)ptr->ai_addr;
@@ -202,7 +215,7 @@ address_list_from_addrinfo (const struct addrinfo *ai)
ip->ipv6_scope = sin6->sin6_scope_id;
#endif
++ip;
- }
+ }
else if (ptr->ai_family == AF_INET)
{
const struct sockaddr_in *sin =
@@ -335,7 +348,7 @@ gethostbyname_with_timeout (const char *host_name, double timeout)
}
/* Print error messages for host errors. */
-static char *
+static const char *
host_errstr (int error)
{
/* Can't use switch since some of these constants can be equal,
@@ -452,7 +465,7 @@ is_valid_ipv4_address (const char *str, const char *end)
}
if (octets < 4)
return false;
-
+
return true;
}
@@ -477,7 +490,7 @@ is_valid_ipv6_address (const char *str, const char *end)
if (str == end)
return false;
-
+
/* Leading :: requires some special handling. */
if (*str == ':')
{
@@ -495,7 +508,7 @@ is_valid_ipv6_address (const char *str, const char *end)
int ch = *str++;
/* if ch is a number, add it to val. */
- if (ISXDIGIT (ch))
+ if (c_isxdigit (ch))
{
val <<= 4;
val |= XDIGIT_TO_NUM (ch);
@@ -534,20 +547,20 @@ is_valid_ipv6_address (const char *str, const char *end)
saw_xdigit = false;
break;
}
-
+
return false;
}
if (saw_xdigit)
{
- if (tp > ns_in6addrsz - ns_int16sz)
+ if (tp > ns_in6addrsz - ns_int16sz)
return false;
tp += ns_int16sz;
}
if (colonp != NULL)
{
- if (tp == ns_in6addrsz)
+ if (tp == ns_in6addrsz)
return false;
tp = ns_in6addrsz;
}
@@ -712,7 +725,24 @@ lookup_host (const char *host, int flags)
/* No luck with the cache; resolve HOST. */
if (!silent && !numeric_address)
- logprintf (LOG_VERBOSE, _("Resolving %s... "), escnonprint (host));
+ {
+ char *str = NULL, *name;
+
+ if (opt.enable_iri && (name = idn_decode ((char *) host)) != NULL)
+ {
+ int len = strlen (host) + strlen (name) + 4;
+ str = xmalloc (len);
+ snprintf (str, len, "%s (%s)", name, host);
+ str[len-1] = '\0';
+ xfree (name);
+ }
+
+ logprintf (LOG_VERBOSE, _("Resolving %s... "),
+ quotearg_style (escape_quoting_style, str ? str : host));
+
+ if (str)
+ xfree (str);
+ }
#ifdef ENABLE_IPV6
{
@@ -792,11 +822,15 @@ lookup_host (const char *host, int flags)
#endif /* not ENABLE_IPV6 */
/* Print the addresses determined by DNS lookup, but no more than
- three. */
+ three if show_all_dns_entries is not specified. */
if (!silent && !numeric_address)
{
int i;
- int printmax = al->count <= 3 ? al->count : 3;
+ int printmax = al->count;
+
+ if (!opt.show_all_dns_entries && printmax > 3)
+ printmax = 3;
+
for (i = 0; i < printmax; i++)
{
logputs (LOG_VERBOSE, print_address (al->addresses + i));
@@ -847,8 +881,11 @@ sufmatch (const char **list, const char *what)
lw = strlen (what);
for (i = 0; list[i]; i++)
{
+ if (list[i][0] == '\0')
+ continue;
+
for (j = strlen (list[i]), k = lw; j >= 0 && k >= 0; j--, k--)
- if (TOLOWER (list[i][j]) != TOLOWER (what[k]))
+ if (c_tolower (list[i][j]) != c_tolower (what[k]))
break;
/* The domain must be first to reach to beginning. */
if (j == -1)
@@ -877,3 +914,18 @@ host_cleanup (void)
host_name_addresses_map = NULL;
}
}
+
+bool
+is_valid_ip_address (const char *name)
+{
+ const char *endp;
+
+ endp = name + strlen(name);
+ if (is_valid_ipv4_address (name, endp))
+ return true;
+#ifdef ENABLE_IPV6
+ if (is_valid_ipv6_address (name, endp))
+ return true;
+#endif
+ return false;
+}