/*
- * "$Id: http-addr.c 177 2006-06-21 00:20:03Z jlovell $"
+ * "$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:
*
* 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.
#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
{
}
+/*
+ * '_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.
*
/*
- * End of "$Id: http-addr.c 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: http-addr.c 6814 2007-08-20 20:09:25Z mike $".
*/