/*
- * "$Id: http-addr.c 5161 2006-02-24 03:11:46Z mike $"
+ * "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $"
*
- * HTTP address routines for the Common UNIX Printing System (CUPS).
+ * HTTP address routines for CUPS.
*
+ * Copyright 2007-2012 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.
+ * _httpAddrSetPort() - Set 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.
* Include necessary headers...
*/
-#include "globals.h"
-#include "debug.h"
-#include <stdlib.h>
-#include <stddef.h>
+#include "cups-private.h"
+#ifdef HAVE_RESOLV_H
+# include <resolv.h>
+#endif /* HAVE_RESOLV_H */
+#ifdef __APPLE__
+# include <CoreFoundation/CoreFoundation.h>
+# include <SystemConfiguration/SystemConfiguration.h>
+#endif /* __APPLE__ */
/*
* 'httpAddrAny()' - Check for the "any" address.
*
- * @since CUPS 1.2@
+ * @since CUPS 1.2/OS X 10.5@
*/
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)))
/*
* 'httpAddrEqual()' - Compare two addresses.
*
- * @since CUPS 1.2@
+ * @since CUPS 1.2/OS X 10.5@
*/
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);
/*
* 'httpAddrLength()' - Return the length of the address in bytes.
*
- * @since CUPS 1.2@
+ * @since CUPS 1.2/OS X 10.5@
*/
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));
/*
* 'httpAddrLocalhost()' - Check for the local loopback address.
*
- * @since CUPS 1.2@
+ * @since CUPS 1.2/OS X 10.5@
*/
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)))
#endif /* AF_LOCAL */
if (addr->addr.sa_family == AF_INET &&
- ntohl(addr->ipv4.sin_addr.s_addr) == 0x7f000001)
+ (ntohl(addr->ipv4.sin_addr.s_addr) & 0xff000000) == 0x7f000000)
return (1);
return (0);
/*
* 'httpAddrLookup()' - Lookup the hostname associated with the address.
*
- * @since CUPS 1.2@
+ * @since CUPS 1.2/OS X 10.5@
*/
char * /* O - Host name */
char *name, /* I - Host name buffer */
int namelen) /* I - Size of name buffer */
{
- DEBUG_printf(("httpAddrLookup(addr=%p, name=%p, namelen=%d)\n",
- addr, name, namelen));
+ _cups_globals_t *cg = _cupsGlobals();
+ /* Global data */
+
+
+ DEBUG_printf(("httpAddrLookup(addr=%p, name=%p, namelen=%d)", addr, name,
+ namelen));
/*
* Range check input...
#ifdef AF_LOCAL
if (addr->addr.sa_family == AF_LOCAL)
+ {
strlcpy(name, addr->un.sun_path, namelen);
- else
+ return (name);
+ }
#endif /* AF_LOCAL */
+
+ /*
+ * Optimize lookups for localhost/loopback addresses...
+ */
+
+ if (httpAddrLocalhost(addr))
+ {
+ strlcpy(name, "localhost", namelen);
+ return (name);
+ }
+
+#ifdef HAVE_RES_INIT
+ /*
+ * STR #2920: Initialize resolver after failure in cups-polld
+ *
+ * If the previous lookup failed, re-initialize the resolver to prevent
+ * temporary network errors from persisting. This *should* be handled by
+ * the resolver libraries, but apparently the glibc folks do not agree.
+ *
+ * We set a flag at the end of this function if we encounter an error that
+ * requires reinitialization of the resolver functions. We then call
+ * res_init() if the flag is set on the next call here or in httpAddrLookup().
+ */
+
+ if (cg->need_res_init)
+ {
+ res_init();
+
+ cg->need_res_init = 0;
+ }
+#endif /* HAVE_RES_INIT */
+
#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...
- */
+ /*
+ * 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...
+ */
- name[0] = '\0';
+ int error = getnameinfo(&addr->addr, httpAddrLength(addr), name, namelen,
+ NULL, 0, 0);
- return (NULL);
+ if (error)
+ {
+ if (error == EAI_FAIL)
+ cg->need_res_init = 1;
+
+ return (httpAddrString(addr, name, namelen));
}
}
#else
* No hostname, so return the raw address...
*/
- httpAddrString(addr, name, namelen);
- return (NULL);
+ if (h_errno == NO_RECOVERY)
+ cg->need_res_init = 1;
+
+ return (httpAddrString(addr, name, namelen));
}
strlcpy(name, host->h_name, namelen);
}
#endif /* HAVE_GETNAMEINFO */
+ DEBUG_printf(("1httpAddrLookup: returning \"%s\"...", name));
+
return (name);
}
+/*
+ * '_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());
+}
+
+
+/*
+ * '_httpAddrSetPort()' - Set the port number associated with an address.
+ */
+
+void
+_httpAddrSetPort(http_addr_t *addr, /* I - Address */
+ int port) /* I - Port */
+{
+ if (!addr || port <= 0)
+ return;
+
+#ifdef AF_INET6
+ if (addr->addr.sa_family == AF_INET6)
+ addr->ipv6.sin6_port = htons(port);
+ else
+#endif /* AF_INET6 */
+ if (addr->addr.sa_family == AF_INET)
+ addr->ipv4.sin_port = htons(port);
+}
+
+
/*
* 'httpAddrString()' - Convert an address to a numeric string.
*
- * @since CUPS 1.2@
+ * @since CUPS 1.2/OS X 10.5@
*/
char * /* O - Numeric address string */
char *s, /* I - String buffer */
int slen) /* I - Length of string */
{
- DEBUG_printf(("httpAddrString(addr=%p, s=%p, slen=%d)\n",
- addr, s, slen));
+ DEBUG_printf(("httpAddrString(addr=%p, s=%p, slen=%d)", addr, s, slen));
/*
* Range check input...
#ifdef AF_LOCAL
if (addr->addr.sa_family == AF_LOCAL)
- strlcpy(s, addr->un.sun_path, slen);
+ {
+ if (addr->un.sun_path[0] == '/')
+ strlcpy(s, addr->un.sun_path, slen);
+ else
+ strlcpy(s, "localhost", slen);
+ }
else
#endif /* AF_LOCAL */
if (addr->addr.sa_family == AF_INET)
#ifdef AF_INET6
else if (addr->addr.sa_family == AF_INET6)
{
+ char *sptr, /* Pointer into string */
+ temps[64]; /* Temporary string for address */
+
# ifdef HAVE_GETNAMEINFO
- if (getnameinfo(&addr->addr, httpAddrLength(addr), s, slen,
+ if (getnameinfo(&addr->addr, httpAddrLength(addr), temps, sizeof(temps),
NULL, 0, NI_NUMERICHOST))
{
/*
return (NULL);
}
+ else if ((sptr = strchr(temps, '%')) != NULL)
+ {
+ /*
+ * Convert "%zone" to "+zone" to match URI form...
+ */
+
+ *sptr = '+';
+ }
+
# else
- char *sptr; /* Pointer into string */
int i; /* Looping var */
unsigned temp; /* Current value */
const char *prefix; /* Prefix for address */
prefix = "";
- for (sptr = s, i = 0; i < 4 && addr->ipv6.sin6_addr.s6_addr32[i]; i ++)
+ for (sptr = temps, i = 0; i < 4 && addr->ipv6.sin6_addr.s6_addr32[i]; i ++)
{
temp = ntohl(addr->ipv6.sin6_addr.s6_addr32[i]);
- snprintf(sptr, slen, "%s%x", prefix, (temp >> 16) & 0xffff);
+ snprintf(sptr, sizeof(temps) - (sptr - temps), "%s%x", prefix,
+ (temp >> 16) & 0xffff);
prefix = ":";
- slen -= strlen(sptr);
sptr += strlen(sptr);
temp &= 0xffff;
if (temp || i == 3 || addr->ipv6.sin6_addr.s6_addr32[i + 1])
{
- snprintf(sptr, slen, "%s%x", prefix, temp);
- slen -= strlen(sptr);
+ snprintf(sptr, sizeof(temps) - (sptr - temps), "%s%x", prefix, temp);
sptr += strlen(sptr);
}
}
if (i < 4)
{
- snprintf(sptr, slen, "%s:", prefix);
+ snprintf(sptr, sizeof(temps) - (sptr - temps), "%s:", prefix);
prefix = ":";
- slen -= strlen(sptr);
sptr += strlen(sptr);
for (; i < 4; i ++)
{
temp = ntohl(addr->ipv6.sin6_addr.s6_addr32[i]);
- if ((temp & 0xffff0000) || addr->ipv6.sin6_addr.s6_addr32[i - 1])
+ if ((temp & 0xffff0000) ||
+ (i > 0 && addr->ipv6.sin6_addr.s6_addr32[i - 1]))
{
- snprintf(sptr, slen, "%s%x", prefix, (temp >> 16) & 0xffff);
- slen -= strlen(sptr);
+ snprintf(sptr, sizeof(temps) - (sptr - temps), "%s%x", prefix,
+ (temp >> 16) & 0xffff);
sptr += strlen(sptr);
}
- snprintf(sptr, slen, "%s%x", prefix, temp & 0xffff);
- slen -= strlen(sptr);
+ snprintf(sptr, sizeof(temps) - (sptr - temps), "%s%x", prefix,
+ temp & 0xffff);
sptr += strlen(sptr);
}
}
* Empty address...
*/
- strlcpy(s, "::", slen);
- sptr = s + 2;
- slen -= 2;
+ strlcpy(temps, "::", sizeof(temps));
}
else
{
* Empty at end...
*/
- strlcpy(sptr, "::", slen);
- sptr += 2;
- slen -= 2;
+ strlcpy(sptr, "::", sizeof(temps) - (sptr - temps));
}
}
# endif /* HAVE_GETNAMEINFO */
+
+ /*
+ * Add "[v1." and "]" around IPv6 address to convert to URI form.
+ */
+
+ snprintf(s, slen, "[v1.%s]", temps);
}
#endif /* AF_INET6 */
else
strlcpy(s, "UNKNOWN", slen);
- DEBUG_printf(("httpAddrString: returning \"%s\"...\n", s));
+ DEBUG_printf(("1httpAddrString: returning \"%s\"...", s));
return (s);
}
/* Pointer to library globals */
- DEBUG_printf(("httpGetHostByName(name=\"%s\")\n", name));
+ DEBUG_printf(("httpGetHostByName(name=\"%s\")", name));
/*
* Avoid lookup delays and configuration problems when connecting
cg->ip_ptrs[0] = (char *)name;
cg->ip_ptrs[1] = NULL;
- DEBUG_puts("httpGetHostByName: returning domain socket address...");
+ DEBUG_puts("1httpGetHostByName: returning domain socket address...");
return (&cg->hostent);
}
cg->ip_ptrs[0] = (char *)&(cg->ip_addr);
cg->ip_ptrs[1] = NULL;
- DEBUG_puts("httpGetHostByName: returning IPv4 address...");
+ DEBUG_puts("1httpGetHostByName: returning IPv4 address...");
return (&cg->hostent);
}
* the name...
*/
- DEBUG_puts("httpGetHostByName: returning domain lookup address(es)...");
+ DEBUG_puts("1httpGetHostByName: returning domain lookup address(es)...");
return (gethostbyname(name));
}
/*
- * 'httpGetHostname()' - Get the FQDN for the local system.
+ * 'httpGetHostname()' - Get the FQDN for the connection or local system.
*
- * This function uses both gethostname() and gethostbyname() to
- * get the local hostname with domain.
+ * When "http" points to a connected socket, return the hostname or
+ * address that was used in the call to httpConnect() or httpConnectEncrypt().
+ * Otherwise, return the FQDN for the local system using both gethostname()
+ * and gethostbyname() to get the local hostname with domain.
*
- * @since CUPS 1.2@
+ * @since CUPS 1.2/OS X 10.5@
*/
-const char * /* O - FQDN for this system */
-httpGetHostname(char *s, /* I - String buffer for name */
- int slen) /* I - Size of buffer */
+const char * /* O - FQDN for connection or system */
+httpGetHostname(http_t *http, /* I - HTTP connection or NULL */
+ char *s, /* I - String buffer for name */
+ int slen) /* I - Size of buffer */
{
- struct hostent *host; /* Host entry to get FQDN */
-
-
- /*
- * Get the hostname...
- */
-
- gethostname(s, slen);
+ if (!s || slen <= 1)
+ return (NULL);
- if (!strchr(s, '.'))
+ if (http)
+ {
+ if (http->hostname[0] == '/')
+ strlcpy(s, "localhost", slen);
+ else
+ strlcpy(s, http->hostname, slen);
+ }
+ else
{
/*
- * The hostname is not a FQDN, so look it up...
+ * Get the hostname...
*/
- if ((host = gethostbyname(s)) != NULL)
- strlcpy(s, host->h_name, slen);
+ if (gethostname(s, slen) < 0)
+ strlcpy(s, "localhost", slen);
+
+ if (!strchr(s, '.'))
+ {
+#ifdef HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME
+ /*
+ * The hostname is not a FQDN, so use the local hostname from the
+ * SystemConfiguration framework...
+ */
+
+ SCDynamicStoreRef sc = SCDynamicStoreCreate(kCFAllocatorDefault,
+ CFSTR("libcups"), NULL, NULL);
+ /* System configuration data */
+ CFStringRef local = sc ? SCDynamicStoreCopyLocalHostName(sc) : NULL;
+ /* Local host name */
+ char localStr[1024]; /* Local host name C string */
+
+ if (local && CFStringGetCString(local, localStr, sizeof(localStr),
+ kCFStringEncodingUTF8))
+ {
+ /*
+ * Append ".local." to the hostname we get...
+ */
+
+ snprintf(s, slen, "%s.local.", localStr);
+ }
+
+ if (local)
+ CFRelease(local);
+ if (sc)
+ CFRelease(sc);
+
+#else
+ /*
+ * The hostname is not a FQDN, so look it up...
+ */
+
+ struct hostent *host; /* Host entry to get FQDN */
+
+ if ((host = gethostbyname(s)) != NULL && host->h_name)
+ {
+ /*
+ * Use the resolved hostname...
+ */
+
+ strlcpy(s, host->h_name, slen);
+ }
+#endif /* HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME */
+ }
}
/*
/*
- * End of "$Id: http-addr.c 5161 2006-02-24 03:11:46Z mike $".
+ * End of "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $".
*/
projects / thirdparty / cups.git / blobdiff