Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / cups / http-addr.c

diff --git a/cups/http-addr.c b/cups/http-addr.c
index d3c100fbdb6a0ff83d3a9e84697079959eb87386..0bc71f6fa711f08e172bd68cfd5a0127bef06672 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: http-addr.c 5251 2006-03-08 18:34:07Z mike $"
+ * "$Id: http-addr.c 6814 2007-08-20 20:09:25Z mike $"
  *
  *   HTTP address routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *
@@ -27,6 +18,7 @@
  *   httpAddrEqual()     - Compare two addresses.
  *   httpAddrLocalhost() - Check for the local loopback address.
  *   httpAddrLookup()    - Lookup the hostname associated with the address.
+ *   _httpAddrPort()     - Get the port number associated with an address.
  *   httpAddrString()    - Convert an IP address to a dotted string.
  *   httpGetHostByName() - Lookup a hostname or IP address, and return
  *                         address records for the specified name.
@@ -52,6 +44,9 @@
 int                                    /* O - 1 if "any", 0 otherwise */
 httpAddrAny(const http_addr_t *addr)   /* I - Address to check */
 {
+  if (!addr)
+    return (0);
+
 #ifdef AF_INET6
   if (addr->addr.sa_family == AF_INET6 &&
       IN6_IS_ADDR_UNSPECIFIED(&(addr->ipv6.sin6_addr)))
@@ -76,6 +71,12 @@ int                                          /* O - 1 if equal, 0 if not */
 httpAddrEqual(const http_addr_t *addr1,                /* I - First address */
               const http_addr_t *addr2)                /* I - Second address */
 {
+  if (!addr1 && !addr2)
+    return (1);
+
+  if (!addr1 || !addr2)
+    return (0);
+
   if (addr1->addr.sa_family != addr2->addr.sa_family)
     return (0);
 
@@ -102,6 +103,9 @@ httpAddrEqual(const http_addr_t *addr1,             /* I - First address */
 int                                    /* O - Length in bytes */
 httpAddrLength(const http_addr_t *addr)        /* I - Address */
 {
+  if (!addr)
+    return (0);
+
 #ifdef AF_INET6
   if (addr->addr.sa_family == AF_INET6)
     return (sizeof(addr->ipv6));
@@ -131,6 +135,9 @@ int                                 /* O - 1 if local host, 0 otherwise */
 httpAddrLocalhost(
     const http_addr_t *addr)           /* I - Address to check */
 {
+  if (!addr)
+    return (1);
+
 #ifdef AF_INET6
   if (addr->addr.sa_family == AF_INET6 &&
       IN6_IS_ADDR_LOOPBACK(&(addr->ipv6.sin6_addr)))
@@ -191,18 +198,17 @@ httpAddrLookup(
 #endif /* AF_LOCAL */
 #ifdef HAVE_GETNAMEINFO
   {
-    if (getnameinfo(&addr->addr, httpAddrLength(addr), name, namelen,
-                    NULL, 0, 0))
-    {
-     /*
-      * If we get an error back, then the address type is not supported
-      * and we should zero out the buffer...
-      */
-
-      name[0] = '\0';
+   /*
+    * STR #2486: httpAddrLookup() fails when getnameinfo() returns EAI_AGAIN
+    *
+    * FWIW, I think this is really a bug in the implementation of
+    * getnameinfo(), but falling back on httpAddrString() is easy to
+    * do...
+    */
 
-      return (NULL);
-    }
+    if (getnameinfo(&addr->addr, httpAddrLength(addr), name, namelen,
+                   NULL, 0, 0))
+      return (httpAddrString(addr, name, namelen));
   }
 #else
   {
@@ -236,6 +242,26 @@ httpAddrLookup(
 }
 
 
+/*
+ * '_httpAddrPort()' - Get the port number associated with an address.
+ */
+
+int                                    /* O - Port number */
+_httpAddrPort(http_addr_t *addr)       /* I - Address */
+{
+  if (!addr)
+    return (ippPort());
+#ifdef AF_INET6
+  else if (addr->addr.sa_family == AF_INET6)
+    return (ntohs(addr->ipv6.sin6_port));
+#endif /* AF_INET6 */
+  else if (addr->addr.sa_family == AF_INET)
+    return (ntohs(addr->ipv4.sin_port));
+  else
+    return (ippPort());
+}
+
+
 /*
  * 'httpAddrString()' - Convert an address to a numeric string.
  *
@@ -508,6 +534,9 @@ httpGetHostname(http_t *http,               /* I - HTTP connection or NULL */
   struct hostent       *host;          /* Host entry to get FQDN */
 
 
+  if (!s || slen <= 1)
+    return (NULL);
+
   if (http)
   {
     if (http->hostname[0] == '/')
@@ -521,7 +550,8 @@ httpGetHostname(http_t *http,               /* I - HTTP connection or NULL */
     * Get the hostname...
     */
 
-    gethostname(s, slen);
+    if (gethostname(s, slen) < 0)
+      strlcpy(s, "localhost", slen);
 
     if (!strchr(s, '.'))
     {
@@ -529,7 +559,7 @@ httpGetHostname(http_t *http,               /* I - HTTP connection or NULL */
       * The hostname is not a FQDN, so look it up...
       */
 
-      if ((host = gethostbyname(s)) != NULL)
+      if ((host = gethostbyname(s)) != NULL && host->h_name)
        strlcpy(s, host->h_name, slen);
     }
   }
@@ -543,5 +573,5 @@ httpGetHostname(http_t *http,               /* I - HTTP connection or NULL */
 
 
 /*
- * End of "$Id: http-addr.c 5251 2006-03-08 18:34:07Z mike $".
+ * End of "$Id: http-addr.c 6814 2007-08-20 20:09:25Z mike $".
  */