]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - cups/dest.c
Import CUPS v1.7.1
[thirdparty/cups.git] / cups / dest.c
index bd738bf00e6727e86b2b2b760869adf26d8516ed..cdf1c4491570418147556295163f52691143a369 100644 (file)
@@ -1,9 +1,9 @@
 /*
- * "$Id: dest.c 9568 2011-02-25 06:13:56Z mike $"
+ * "$Id: dest.c 11141 2013-07-16 14:58:25Z msweet $"
  *
  *   User-defined destination (and option) support for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2013 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *
  * Contents:
  *
- *   cupsAddDest()                  - Add a destination to the list of
- *                                    destinations.
+ *   cupsAddDest()                 - Add a destination to the list of
+ *                                   destinations.
  *   _cupsAppleCopyDefaultPaperID() - Get the default paper ID.
  *   _cupsAppleCopyDefaultPrinter() - Get the default printer at this location.
  *   _cupsAppleGetUseLastPrinter()  - Get whether to use the last used printer.
  *   _cupsAppleSetDefaultPaperID()  - Set the default paper id.
- *   _cupsAppleSetDefaultPrinter()  - Set the default printer for this location.
+ *   _cupsAppleSetDefaultPrinter()  - Set the default printer for this
+ *                                   location.
  *   _cupsAppleSetUseLastPrinter()  - Set whether to use the last used printer.
- *   cupsFreeDests()                - Free the memory used by the list of
- *                                    destinations.
- *   cupsGetDest()                  - Get the named destination from the list.
- *   _cupsGetDests()                - Get destinations from a server.
- *   cupsGetDests()                 - Get the list of destinations from the
- *                                    default server.
- *   cupsGetDests2()                - Get the list of destinations from the
- *                                    specified server.
- *   cupsGetNamedDest()             - Get options for the named destination.
- *   cupsRemoveDest()               - Remove a destination from the destination
- *                                    list.
- *   cupsSetDefaultDest()           - Set the default destination.
- *   cupsSetDests()                 - Save the list of destinations for the
- *                                    default server.
- *   cupsSetDests2()                - Save the list of destinations for the
- *                                    specified server.
- *   _cupsUserDefault()             - Get the user default printer from
- *                                    environment variables and location
- *                                    information.
- *   appleCopyLocations()           - Copy the location history array.
- *   appleCopyNetwork()             - Get the network ID for the current
- *                                    location.
- *   appleGetPaperSize()            - Get the default paper size.
- *   appleGetPrinter()              - Get a printer from the history array.
- *   cups_add_dest()                - Add a destination to the array.
- *   cups_compare_dests()           - Compare two destinations.
- *   cups_find_dest()               - Find a destination using a binary search.
- *   cups_get_default()             - Get the default destination from an
- *                                    lpoptions file.
- *   cups_get_dests()               - Get destinations from a file.
- *   cups_make_string()             - Make a comma-separated string of values
- *                                    from an IPP attribute.
+ *   cupsConnectDest()             - Connect to the server for a destination.
+ *   cupsConnectDestBlock()        - Connect to the server for a destination.
+ *   cupsCopyDest()                - Copy a destination.
+ *   cupsEnumDests()               - Enumerate available destinations with a
+ *                                   callback function.
+ *   cupsEnumDestsBlock()          - Enumerate available destinations with a
+ *                                   block.
+ *   cupsFreeDests()               - Free the memory used by the list of
+ *                                   destinations.
+ *   cupsGetDest()                 - Get the named destination from the list.
+ *   _cupsGetDestResource()        - Get the resource path and URI for a
+ *                                   destination.
+ *   _cupsGetDests()               - Get destinations from a server.
+ *   cupsGetDests()                - Get the list of destinations from the
+ *                                   default server.
+ *   cupsGetDests2()               - Get the list of destinations from the
+ *                                   specified server.
+ *   cupsGetNamedDest()            - Get options for the named destination.
+ *   cupsRemoveDest()              - Remove a destination from the destination
+ *                                   list.
+ *   cupsSetDefaultDest()          - Set the default destination.
+ *   cupsSetDests()                - Save the list of destinations for the
+ *                                   default server.
+ *   cupsSetDests2()               - Save the list of destinations for the
+ *                                   specified server.
+ *   _cupsUserDefault()            - Get the user default printer from
+ *                                   environment variables and location
+ *                                   information.
+ *   appleCopyLocations()          - Copy the location history array.
+ *   appleCopyNetwork()            - Get the network ID for the current
+ *                                   location.
+ *   appleGetPaperSize()           - Get the default paper size.
+ *   appleGetPrinter()             - Get a printer from the history array.
+ *   cups_add_dest()               - Add a destination to the array.
+ *   cups_block_cb()               - Enumeration callback for block API.
+ *   cups_compare_dests()          - Compare two destinations.
+ *   cups_dnssd_browse_cb()        - Browse for printers.
+ *   cups_dnssd_browse_cb()        - Browse for printers.
+ *   cups_dnssd_client_cb()        - Avahi client callback function.
+ *   cups_dnssd_compare_device()    - Compare two devices.
+ *   cups_dnssd_free_device()      - Free the memory used by a device.
+ *   cups_dnssd_get_device()       - Lookup a device and create it as needed.
+ *   cups_dnssd_local_cb()         - Browse for local printers.
+ *   cups_dnssd_poll_cb()          - Wait for input on the specified file
+ *                                   descriptors.
+ *   cups_dnssd_query_cb()         - Process query data.
+ *   cups_dnssd_resolve()          - Resolve a Bonjour printer URI.
+ *   cups_dnssd_resolve_cb()       - See if we should continue resolving.
+ *   cups_dnssd_unquote()          - Unquote a name string.
+ *   cups_find_dest()              - Find a destination using a binary search.
+ *   cups_get_default()            - Get the default destination from an
+ *                                   lpoptions file.
+ *   cups_get_dests()              - Get destinations from a file.
+ *   cups_make_string()            - Make a comma-separated string of values
+ *                                   from an IPP attribute.
  */
 
 /*
 #  include <notify.h>
 #endif /* HAVE_NOTIFY_H */
 
+#ifdef HAVE_POLL
+#  include <poll.h>
+#endif /* HAVE_POLL */
+
+#ifdef HAVE_DNSSD
+#  include <dns_sd.h>
+#endif /* HAVE_DNSSD */
+
+#ifdef HAVE_AVAHI
+#  include <avahi-client/client.h>
+#  include <avahi-client/lookup.h>
+#  include <avahi-common/simple-watch.h>
+#  include <avahi-common/domain.h>
+#  include <avahi-common/error.h>
+#  include <avahi-common/malloc.h>
+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
+#endif /* HAVE_AVAHI */
+
+
+/*
+ * Constants...
+ */
+
 #ifdef __APPLE__
 #  include <SystemConfiguration/SystemConfiguration.h>
 #  define kCUPSPrintingPrefs   CFSTR("org.cups.PrintingPrefs")
 #endif /* __APPLE__ */
 
 
+/*
+ * Types...
+ */
+
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+typedef enum _cups_dnssd_state_e       /* Enumerated device state */
+{
+  _CUPS_DNSSD_NEW,
+  _CUPS_DNSSD_QUERY,
+  _CUPS_DNSSD_PENDING,
+  _CUPS_DNSSD_ACTIVE,
+  _CUPS_DNSSD_LOCAL,
+  _CUPS_DNSSD_INCOMPATIBLE,
+  _CUPS_DNSSD_ERROR
+} _cups_dnssd_state_t;
+
+typedef struct _cups_dnssd_data_s      /* Enumeration data */
+{
+#  ifdef HAVE_DNSSD
+  DNSServiceRef                main_ref;       /* Main service reference */
+#  else /* HAVE_AVAHI */
+  AvahiSimplePoll      *simple_poll;   /* Polling interface */
+  AvahiClient          *client;        /* Client information */
+  int                  got_data;       /* Did we get data? */
+#  endif /* HAVE_DNSSD */
+  cups_dest_cb_t       cb;             /* Callback */
+  void                 *user_data;     /* User data pointer */
+  cups_ptype_t         type,           /* Printer type filter */
+                       mask;           /* Printer type mask */
+  cups_array_t         *devices;       /* Devices found so far */
+} _cups_dnssd_data_t;
+
+typedef struct _cups_dnssd_device_s    /* Enumerated device */
+{
+  _cups_dnssd_state_t  state;          /* State of device listing */
+#  ifdef HAVE_DNSSD
+  DNSServiceRef                ref;            /* Service reference for query */
+#  else /* HAVE_AVAHI */
+  AvahiRecordBrowser   *ref;           /* Browser for query */
+#  endif /* HAVE_DNSSD */
+  char                 *domain,        /* Domain name */
+                       *fullName,      /* Full name */
+                       *regtype;       /* Registration type */
+  cups_ptype_t         type;           /* Device registration type */
+  cups_dest_t          dest;           /* Destination record */
+} _cups_dnssd_device_t;
+
+typedef struct _cups_dnssd_resolve_s   /* Data for resolving URI */
+{
+  int                  *cancel;        /* Pointer to "cancel" variable */
+  struct timeval       end_time;       /* Ending time */
+} _cups_dnssd_resolve_t;
+#endif /* HAVE_DNSSD */
+
+
 /*
  * Local functions...
  */
 
 #ifdef __APPLE__
-static CFArrayRef appleCopyLocations(void);
-static CFStringRef appleCopyNetwork(void);
-static char    *appleGetPaperSize(char *name, int namesize);
-static CFStringRef appleGetPrinter(CFArrayRef locations, CFStringRef network,
-                                  CFIndex *locindex);
+static CFArrayRef      appleCopyLocations(void);
+static CFStringRef     appleCopyNetwork(void);
+static char            *appleGetPaperSize(char *name, int namesize);
+static CFStringRef     appleGetPrinter(CFArrayRef locations,
+                                       CFStringRef network, CFIndex *locindex);
 #endif /* __APPLE__ */
-static cups_dest_t *cups_add_dest(const char *name, const char *instance,
-                                 int *num_dests, cups_dest_t **dests);
-static int     cups_compare_dests(cups_dest_t *a, cups_dest_t *b);
-static int     cups_find_dest(const char *name, const char *instance,
-                              int num_dests, cups_dest_t *dests, int prev,
-                              int *rdiff);
-static char    *cups_get_default(const char *filename, char *namebuf,
-                                 size_t namesize, const char **instance);
-static int     cups_get_dests(const char *filename, const char *match_name,
-                              const char *match_inst, int user_default_set,
-                              int num_dests, cups_dest_t **dests);
-static char    *cups_make_string(ipp_attribute_t *attr, char *buffer,
-                                 size_t bufsize);
+static cups_dest_t     *cups_add_dest(const char *name, const char *instance,
+                                      int *num_dests, cups_dest_t **dests);
+#ifdef __BLOCKS__
+static int             cups_block_cb(cups_dest_block_t block, unsigned flags,
+                                     cups_dest_t *dest);
+#endif /* __BLOCKS__ */
+static int             cups_compare_dests(cups_dest_t *a, cups_dest_t *b);
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+#  ifdef HAVE_DNSSD
+static void            cups_dnssd_browse_cb(DNSServiceRef sdRef,
+                                            DNSServiceFlags flags,
+                                            uint32_t interfaceIndex,
+                                            DNSServiceErrorType errorCode,
+                                            const char *serviceName,
+                                            const char *regtype,
+                                            const char *replyDomain,
+                                            void *context);
+#  else /* HAVE_AVAHI */
+static void            cups_dnssd_browse_cb(AvahiServiceBrowser *browser,
+                                            AvahiIfIndex interface,
+                                            AvahiProtocol protocol,
+                                            AvahiBrowserEvent event,
+                                            const char *serviceName,
+                                            const char *regtype,
+                                            const char *replyDomain,
+                                            AvahiLookupResultFlags flags,
+                                            void *context);
+static void            cups_dnssd_client_cb(AvahiClient *client,
+                                            AvahiClientState state,
+                                            void *context);
+#  endif /* HAVE_DNSSD */
+static int             cups_dnssd_compare_devices(_cups_dnssd_device_t *a,
+                                                  _cups_dnssd_device_t *b);
+static void            cups_dnssd_free_device(_cups_dnssd_device_t *device,
+                                              _cups_dnssd_data_t *data);
+static _cups_dnssd_device_t *
+                       cups_dnssd_get_device(_cups_dnssd_data_t *data,
+                                             const char *serviceName,
+                                             const char *regtype,
+                                             const char *replyDomain);
+#  ifdef HAVE_DNSSD
+static void            cups_dnssd_local_cb(DNSServiceRef sdRef,
+                                           DNSServiceFlags flags,
+                                           uint32_t interfaceIndex,
+                                           DNSServiceErrorType errorCode,
+                                           const char *serviceName,
+                                           const char *regtype,
+                                           const char *replyDomain,
+                                           void *context);
+static void            cups_dnssd_query_cb(DNSServiceRef sdRef,
+                                           DNSServiceFlags flags,
+                                           uint32_t interfaceIndex,
+                                           DNSServiceErrorType errorCode,
+                                           const char *fullName,
+                                           uint16_t rrtype, uint16_t rrclass,
+                                           uint16_t rdlen, const void *rdata,
+                                           uint32_t ttl, void *context);
+#  else /* HAVE_AVAHI */
+static int             cups_dnssd_poll_cb(struct pollfd *pollfds,
+                                          unsigned int num_pollfds,
+                                          int timeout, void *context);
+static void            cups_dnssd_query_cb(AvahiRecordBrowser *browser,
+                                           AvahiIfIndex interface,
+                                           AvahiProtocol protocol,
+                                           AvahiBrowserEvent event,
+                                           const char *name, uint16_t rrclass,
+                                           uint16_t rrtype, const void *rdata,
+                                           size_t rdlen,
+                                           AvahiLookupResultFlags flags,
+                                           void *context);
+#  endif /* HAVE_DNSSD */
+static const char      *cups_dnssd_resolve(cups_dest_t *dest, const char *uri,
+                                           int msec, int *cancel,
+                                           cups_dest_cb_t cb, void *user_data);
+static int             cups_dnssd_resolve_cb(void *context);
+static void            cups_dnssd_unquote(char *dst, const char *src,
+                                          size_t dstsize);
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+static int             cups_find_dest(const char *name, const char *instance,
+                                      int num_dests, cups_dest_t *dests, int prev,
+                                      int *rdiff);
+static char            *cups_get_default(const char *filename, char *namebuf,
+                                         size_t namesize, const char **instance);
+static int             cups_get_dests(const char *filename, const char *match_name,
+                                      const char *match_inst, int user_default_set,
+                                      int num_dests, cups_dest_t **dests);
+static char            *cups_make_string(ipp_attribute_t *attr, char *buffer,
+                                         size_t bufsize);
 
 
 /*
@@ -142,7 +319,8 @@ cupsAddDest(const char  *name,              /* I  - Destination name */
     if (instance && !cupsGetDest(name, NULL, num_dests, *dests))
       return (num_dests);
 
-    dest = cups_add_dest(name, instance, &num_dests, dests);
+    if ((dest = cups_add_dest(name, instance, &num_dests, dests)) == NULL)
+      return (num_dests);
 
    /*
     * Find the base dest again now the array has been realloc'd.
@@ -226,11 +404,6 @@ _cupsAppleCopyDefaultPrinter(void)
     return (NULL);
   }
 
-//#  ifdef DEBUG
-//  CFStringGetCString(network, name, namesize, kCFStringEncodingUTF8);
-//  DEBUG_printf(("2_cupsUserDefault: network=\"%s\"", name));
-//#  endif /* DEBUG */
-
  /*
   * Lookup the network in the preferences...
   */
@@ -248,7 +421,7 @@ _cupsAppleCopyDefaultPrinter(void)
 
     return (NULL);
   }
-  
+
   DEBUG_printf(("1_cupsAppleCopyDefaultPrinter: Got locations, %d entries.",
                 (int)CFArrayGetCount(locations)));
 
@@ -404,12 +577,12 @@ _cupsAppleSetDefaultPrinter(
 /*
  * '_cupsAppleSetUseLastPrinter()' - Set whether to use the last used printer.
  */
-void                           
+
+void
 _cupsAppleSetUseLastPrinter(
     int uselast)                       /* O - 1 to use last printer, 0 otherwise */
 {
-  CFPreferencesSetAppValue(kUseLastPrinter, 
+  CFPreferencesSetAppValue(kUseLastPrinter,
                           uselast ? kCFBooleanTrue : kCFBooleanFalse,
                           kCUPSPrintingPrefs);
   CFPreferencesAppSynchronize(kCUPSPrintingPrefs);
@@ -418,6 +591,612 @@ _cupsAppleSetUseLastPrinter(
 #endif /* __APPLE__ */
 
 
+/*
+ * 'cupsConnectDest()' - Connect to the server for a destination.
+ *
+ * Connect to the destination, returning a new http_t connection object and
+ * optionally the resource path to use for the destination.  These calls will
+ * block until a connection is made, the timeout expires, the integer pointed
+ * to by "cancel" is non-zero, or the callback function (or block) returns 0,
+ * The caller is responsible for calling httpClose() on the returned object.
+ *
+ * @since CUPS 1.6/OS X 10.8@
+ */
+
+http_t *                               /* O - Connection to server or @code NULL@ */
+cupsConnectDest(
+    cups_dest_t    *dest,              /* I - Destination */
+    unsigned       flags,              /* I - Connection flags */
+    int            msec,               /* I - Timeout in milliseconds */
+    int            *cancel,            /* I - Pointer to "cancel" variable */
+    char           *resource,          /* I - Resource buffer */
+    size_t         resourcesize,       /* I - Size of resource buffer */
+    cups_dest_cb_t cb,                 /* I - Callback function */
+    void           *user_data)         /* I - User data pointer */
+{
+  const char   *uri;                   /* Printer URI */
+  char         scheme[32],             /* URI scheme */
+               userpass[256],          /* Username and password (unused) */
+               hostname[256],          /* Hostname */
+               tempresource[1024];     /* Temporary resource buffer */
+  int          port;                   /* Port number */
+  char         portstr[16];            /* Port number string */
+  http_encryption_t encryption;                /* Encryption to use */
+  http_addrlist_t *addrlist;           /* Address list for server */
+  http_t       *http;                  /* Connection to server */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!dest)
+  {
+    if (resource)
+      *resource = '\0';
+
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    return (NULL);
+  }
+
+  if (!resource || resourcesize < 1)
+  {
+    resource     = tempresource;
+    resourcesize = sizeof(tempresource);
+  }
+
+ /*
+  * Grab the printer URI...
+  */
+
+  if ((uri = cupsGetOption("printer-uri-supported", dest->num_options,
+                           dest->options)) == NULL)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOENT), 0);
+
+    if (cb)
+      (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR,
+            dest);
+
+    return (NULL);
+  }
+
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+  if (strstr(uri, "._tcp"))
+  {
+    if ((uri = cups_dnssd_resolve(dest, uri, msec, cancel, cb,
+                                  user_data)) == NULL)
+      return (NULL);
+  }
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme),
+                      userpass, sizeof(userpass), hostname, sizeof(hostname),
+                      &port, resource, resourcesize) < HTTP_URI_STATUS_OK)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer URI."), 1);
+
+    if (cb)
+      (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR,
+            dest);
+
+    return (NULL);
+  }
+
+ /*
+  * Lookup the address for the server...
+  */
+
+  if (cb)
+    (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_RESOLVING,
+          dest);
+
+  snprintf(portstr, sizeof(portstr), "%d", port);
+
+  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portstr)) == NULL)
+  {
+    if (cb)
+      (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR,
+            dest);
+
+    return (NULL);
+  }
+
+  if (cancel && *cancel)
+  {
+    httpAddrFreeList(addrlist);
+
+    if (cb)
+      (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_CANCELED,
+            dest);
+
+    return (NULL);
+  }
+
+ /*
+  * Create the HTTP object pointing to the server referenced by the URI...
+  */
+
+  if (!strcmp(scheme, "ipps") || port == 443)
+    encryption = HTTP_ENCRYPTION_ALWAYS;
+  else
+    encryption = HTTP_ENCRYPTION_IF_REQUESTED;
+
+  http = httpConnect2(hostname, port, addrlist, AF_UNSPEC, encryption, 1, 0,
+                      NULL);
+
+ /*
+  * Connect if requested...
+  */
+
+  if (flags & CUPS_DEST_FLAGS_UNCONNECTED)
+  {
+    if (cb)
+      (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED, dest);
+  }
+  else
+  {
+    if (cb)
+      (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_CONNECTING,
+            dest);
+
+    if (!httpReconnect2(http, msec, cancel) && cb)
+    {
+      if (cancel && *cancel)
+       (*cb)(user_data,
+             CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_CONNECTING, dest);
+      else
+       (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR,
+             dest);
+    }
+    else if (cb)
+      (*cb)(user_data, CUPS_DEST_FLAGS_NONE, dest);
+  }
+
+  return (http);
+}
+
+
+#ifdef __BLOCKS__
+/*
+ * 'cupsConnectDestBlock()' - Connect to the server for a destination.
+ *
+ * Connect to the destination, returning a new http_t connection object and
+ * optionally the resource path to use for the destination.  These calls will
+ * block until a connection is made, the timeout expires, the integer pointed
+ * to by "cancel" is non-zero, or the callback function (or block) returns 0,
+ * The caller is responsible for calling httpClose() on the returned object.
+ *
+ * @since CUPS 1.6/OS X 10.8@
+ */
+
+http_t *                               /* O - Connection to server or @code NULL@ */
+cupsConnectDestBlock(
+    cups_dest_t       *dest,           /* I - Destination */
+    unsigned          flags,           /* I - Connection flags */
+    int               msec,            /* I - Timeout in milliseconds */
+    int               *cancel,         /* I - Pointer to "cancel" variable */
+    char              *resource,       /* I - Resource buffer */
+    size_t            resourcesize,    /* I - Size of resource buffer */
+    cups_dest_block_t block)           /* I - Callback block */
+{
+  return (cupsConnectDest(dest, flags, msec, cancel, resource, resourcesize,
+                          (cups_dest_cb_t)cups_block_cb, (void *)block));
+}
+#endif /* __BLOCKS__ */
+
+
+/*
+ * 'cupsCopyDest()' - Copy a destination.
+ *
+ * Make a copy of the destination to an array of destinations (or just a single
+ * copy) - for use with the cupsEnumDests* functions. The caller is responsible
+ * for calling cupsFreeDests() on the returned object(s).
+ *
+ * @since CUPS 1.6/OS X 10.8@
+ */
+
+int
+cupsCopyDest(cups_dest_t *dest,
+             int         num_dests,
+             cups_dest_t **dests)
+{
+  int          i;                      /* Looping var */
+  cups_dest_t  *new_dest;              /* New destination pointer */
+  cups_option_t        *new_option,            /* Current destination option */
+               *option;                /* Current parent option */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!dest || num_dests < 0 || !dests)
+    return (num_dests);
+
+ /*
+  * See if the destination already exists...
+  */
+
+  if ((new_dest = cupsGetDest(dest->name, dest->instance, num_dests,
+                              *dests)) != NULL)
+  {
+   /*
+    * Protect against copying destination to itself...
+    */
+
+    if (new_dest == dest)
+      return (num_dests);
+
+   /*
+    * Otherwise, free the options...
+    */
+
+    cupsFreeOptions(new_dest->num_options, new_dest->options);
+
+    new_dest->num_options = 0;
+    new_dest->options     = NULL;
+  }
+  else
+    new_dest = cups_add_dest(dest->name, dest->instance, &num_dests, dests);
+
+  if (new_dest)
+  {
+    if ((new_dest->options = calloc(sizeof(cups_option_t),
+                                    dest->num_options)) == NULL)
+      return (cupsRemoveDest(dest->name, dest->instance, num_dests, dests));
+
+    new_dest->num_options = dest->num_options;
+
+    for (i = dest->num_options, option = dest->options,
+            new_option = new_dest->options;
+        i > 0;
+        i --, option ++, new_option ++)
+    {
+      new_option->name  = _cupsStrRetain(option->name);
+      new_option->value = _cupsStrRetain(option->value);
+    }
+  }
+
+  return (num_dests);
+}
+
+
+/*
+ * 'cupsEnumDests()' - Enumerate available destinations with a callback function.
+ *
+ * Destinations are enumerated from one or more sources. The callback function
+ * receives the @code user_data@ pointer, destination name, instance, number of
+ * options, and options which can be used as input to the @link cupsAddDest@
+ * function.  The function must return 1 to continue enumeration or 0 to stop.
+ *
+ * Enumeration happens on the current thread and does not return until all
+ * destinations have been enumerated or the callback function returns 0.
+ *
+ * @since CUPS 1.6/OS X 10.8@
+ */
+
+int                                    /* O - 1 on success, 0 on failure */
+cupsEnumDests(
+    unsigned       flags,              /* I - Enumeration flags */
+    int            msec,               /* I - Timeout in milliseconds,
+                                        *     -1 for indefinite */
+    int            *cancel,            /* I - Pointer to "cancel" variable */
+    cups_ptype_t   type,               /* I - Printer type bits */
+    cups_ptype_t   mask,               /* I - Mask for printer type bits */
+    cups_dest_cb_t cb,                 /* I - Callback function */
+    void           *user_data)         /* I - User data */
+{
+  int                  i,              /* Looping var */
+                       num_dests;      /* Number of destinations */
+  cups_dest_t          *dests = NULL,  /* Destinations */
+                       *dest;          /* Current destination */
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+  int                  count,          /* Number of queries started */
+                       remaining;      /* Remainder of timeout */
+  _cups_dnssd_data_t   data;           /* Data for callback */
+  _cups_dnssd_device_t *device;        /* Current device */
+#  ifdef HAVE_DNSSD
+  int                  nfds,           /* Number of files responded */
+                       main_fd;        /* File descriptor for lookups */
+  DNSServiceRef                ipp_ref,        /* IPP browser */
+                       local_ipp_ref;  /* Local IPP browser */
+#    ifdef HAVE_SSL
+  DNSServiceRef                ipps_ref,       /* IPPS browser */
+                       local_ipps_ref; /* Local IPPS browser */
+#    endif /* HAVE_SSL */
+#    ifdef HAVE_POLL
+  struct pollfd                pfd;            /* Polling data */
+#    else
+  fd_set               input;          /* Input set for select() */
+  struct timeval       timeout;        /* Timeout for select() */
+#    endif /* HAVE_POLL */
+#  else /* HAVE_AVAHI */
+  int                  error;          /* Error value */
+  AvahiServiceBrowser  *ipp_ref;       /* IPP browser */
+#    ifdef HAVE_SSL
+  AvahiServiceBrowser  *ipps_ref;      /* IPPS browser */
+#    endif /* HAVE_SSL */
+#  endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_AVAHI */
+
+ /*
+  * Range check input...
+  */
+
+  (void)flags;
+
+  if (!cb)
+    return (0);
+
+ /*
+  * Get the list of local printers and pass them to the callback function...
+  */
+
+  num_dests = _cupsGetDests(CUPS_HTTP_DEFAULT, IPP_OP_CUPS_GET_PRINTERS, NULL,
+                            &dests, type, mask);
+
+  for (i = num_dests, dest = dests;
+       i > 0 && (!cancel || !*cancel);
+       i --, dest ++)
+    if (!(*cb)(user_data, i > 1 ? CUPS_DEST_FLAGS_MORE : CUPS_DEST_FLAGS_NONE,
+               dest))
+      break;
+
+  cupsFreeDests(num_dests, dests);
+
+  if (i > 0 || msec == 0)
+    return (1);
+
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+ /*
+  * Get Bonjour-shared printers...
+  */
+
+  data.type    = type;
+  data.mask    = mask;
+  data.devices = cupsArrayNew3((cups_array_func_t)cups_dnssd_compare_devices,
+                               NULL, NULL, 0, NULL,
+                               (cups_afree_func_t)cups_dnssd_free_device);
+
+#  ifdef HAVE_DNSSD
+  if (DNSServiceCreateConnection(&data.main_ref) != kDNSServiceErr_NoError)
+    return (0);
+
+  main_fd = DNSServiceRefSockFD(data.main_ref);
+
+  ipp_ref = data.main_ref;
+  DNSServiceBrowse(&ipp_ref, kDNSServiceFlagsShareConnection, 0,
+                   "_ipp._tcp", NULL,
+                   (DNSServiceBrowseReply)cups_dnssd_browse_cb, &data);
+
+  local_ipp_ref = data.main_ref;
+  DNSServiceBrowse(&local_ipp_ref, kDNSServiceFlagsShareConnection,
+                   kDNSServiceInterfaceIndexLocalOnly,
+                   "_ipp._tcp", NULL,
+                   (DNSServiceBrowseReply)cups_dnssd_local_cb, &data);
+
+#    ifdef HAVE_SSL
+  ipps_ref = data.main_ref;
+  DNSServiceBrowse(&ipps_ref, kDNSServiceFlagsShareConnection, 0,
+                   "_ipps._tcp", NULL,
+                   (DNSServiceBrowseReply)cups_dnssd_browse_cb, &data);
+
+  local_ipps_ref = data.main_ref;
+  DNSServiceBrowse(&local_ipps_ref, kDNSServiceFlagsShareConnection,
+                   kDNSServiceInterfaceIndexLocalOnly,
+                   "_ipps._tcp", NULL,
+                   (DNSServiceBrowseReply)cups_dnssd_local_cb, &data);
+#    endif /* HAVE_SSL */
+
+#  else /* HAVE_AVAHI */
+  if ((data.simple_poll = avahi_simple_poll_new()) == NULL)
+  {
+    DEBUG_puts("cupsEnumDests: Unable to create Avahi simple poll object.");
+    return (1);
+  }
+
+  avahi_simple_poll_set_func(data.simple_poll, cups_dnssd_poll_cb, &data);
+
+  data.client = avahi_client_new(avahi_simple_poll_get(data.simple_poll),
+                                0, cups_dnssd_client_cb, &data,
+                                &error);
+  if (!data.client)
+  {
+    DEBUG_puts("cupsEnumDests: Unable to create Avahi client.");
+    avahi_simple_poll_free(data.simple_poll);
+    return (1);
+  }
+
+  ipp_ref  = avahi_service_browser_new(data.client, AVAHI_IF_UNSPEC,
+                                      AVAHI_PROTO_UNSPEC, "_ipp._tcp", NULL,
+                                      0, cups_dnssd_browse_cb, &data);
+#    ifdef HAVE_SSL
+  ipps_ref = avahi_service_browser_new(data.client, AVAHI_IF_UNSPEC,
+                                      AVAHI_PROTO_UNSPEC, "_ipps._tcp", NULL,
+                                      0, cups_dnssd_browse_cb, &data);
+#    endif /* HAVE_SSL */
+#  endif /* HAVE_DNSSD */
+
+  if (msec < 0)
+    remaining = INT_MAX;
+  else
+    remaining = msec;
+
+  while (remaining > 0 && (!cancel || !*cancel))
+  {
+   /*
+    * Check for input...
+    */
+
+#  ifdef HAVE_DNSSD
+#    ifdef HAVE_POLL
+    pfd.fd     = main_fd;
+    pfd.events = POLLIN;
+
+    nfds = poll(&pfd, 1, remaining > 250 ? 250 : remaining);
+
+#    else
+    FD_ZERO(&input);
+    FD_SET(main_fd, &input);
+
+    timeout.tv_sec  = 0;
+    timeout.tv_usec = remaining > 250 ? 250000 : remaining * 1000;
+
+    nfds = select(main_fd + 1, &input, NULL, NULL, &timeout);
+#    endif /* HAVE_POLL */
+
+    if (nfds > 0)
+      DNSServiceProcessResult(data.main_ref);
+    else if (nfds == 0)
+      remaining -= 250;
+
+#  else /* HAVE_AVAHI */
+    data.got_data = 0;
+
+    if ((error = avahi_simple_poll_iterate(data.simple_poll, 250)) > 0)
+    {
+     /*
+      * We've been told to exit the loop.  Perhaps the connection to
+      * Avahi failed.
+      */
+
+      break;
+    }
+
+    if (!data.got_data)
+      remaining -= 250;
+#  endif /* HAVE_DNSSD */
+
+    for (device = (_cups_dnssd_device_t *)cupsArrayFirst(data.devices),
+             count = 0;
+         device;
+         device = (_cups_dnssd_device_t *)cupsArrayNext(data.devices))
+    {
+      if (device->ref)
+        count ++;
+
+      if (!device->ref && device->state == _CUPS_DNSSD_NEW)
+      {
+       DEBUG_printf(("1cupsEnumDests: Querying '%s'.", device->fullName));
+
+#  ifdef HAVE_DNSSD
+        device->ref = data.main_ref;
+
+       if (DNSServiceQueryRecord(&(device->ref),
+                                 kDNSServiceFlagsShareConnection,
+                                 0, device->fullName,
+                                 kDNSServiceType_TXT,
+                                 kDNSServiceClass_IN,
+                                 (DNSServiceQueryRecordReply)cups_dnssd_query_cb,
+                                 &data) == kDNSServiceErr_NoError)
+       {
+         count ++;
+       }
+       else
+       {
+         device->ref   = 0;
+         device->state = _CUPS_DNSSD_ERROR;
+
+         DEBUG_puts("1cupsEnumDests: Query failed.");
+       }
+
+#  else /* HAVE_AVAHI */
+       if ((device->ref = avahi_record_browser_new(data.client,
+                                                   AVAHI_IF_UNSPEC,
+                                                   AVAHI_PROTO_UNSPEC,
+                                                   device->fullName,
+                                                   AVAHI_DNS_CLASS_IN,
+                                                   AVAHI_DNS_TYPE_TXT,
+                                                   0,
+                                                   cups_dnssd_query_cb,
+                                                   &data)) != NULL)
+        {
+         count ++;
+       }
+       else
+       {
+         device->state = _CUPS_DNSSD_ERROR;
+
+         DEBUG_printf(("1cupsEnumDests: Query failed: %s",
+                       avahi_strerror(avahi_client_errno(data.client))));
+       }
+#  endif /* HAVE_DNSSD */
+      }
+      else if (device->ref && device->state == _CUPS_DNSSD_PENDING)
+      {
+        if ((device->type & mask) == type)
+        {
+         if (!(*cb)(user_data, CUPS_DEST_FLAGS_NONE, &device->dest))
+         {
+           remaining = -1;
+           break;
+         }
+        }
+
+        device->state = _CUPS_DNSSD_ACTIVE;
+      }
+    }
+  }
+
+  cupsArrayDelete(data.devices);
+
+#  ifdef HAVE_DNSSD
+  DNSServiceRefDeallocate(ipp_ref);
+  DNSServiceRefDeallocate(local_ipp_ref);
+
+#    ifdef HAVE_SSL
+  DNSServiceRefDeallocate(ipp_ref);
+  DNSServiceRefDeallocate(local_ipp_ref);
+#    endif /* HAVE_SSL */
+
+  DNSServiceRefDeallocate(data.main_ref);
+
+#  else /* HAVE_AVAHI */
+  avahi_service_browser_free(ipp_ref);
+#    ifdef HAVE_SSL
+  avahi_service_browser_free(ipps_ref);
+#    endif /* HAVE_SSL */
+
+  avahi_client_free(data.client);
+  avahi_simple_poll_free(data.simple_poll);
+#  endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD || HAVE_DNSSD */
+
+  return (1);
+}
+
+
+#  ifdef __BLOCKS__
+/*
+ * 'cupsEnumDestsBlock()' - Enumerate available destinations with a block.
+ *
+ * Destinations are enumerated from one or more sources. The block receives the
+ * destination name, instance, number of options, and options which can be used
+ * as input to the @link cupsAddDest@ function.  The block must return 1 to
+ * continue enumeration or 0 to stop.
+ *
+ * Enumeration happens on the current thread and does not return until all
+ * destinations have been enumerated or the block returns 0.
+ *
+ * @since CUPS 1.6/OS X 10.8@
+ */
+
+int                                    /* O - 1 on success, 0 on failure */
+cupsEnumDestsBlock(
+    unsigned          flags,           /* I - Enumeration flags */
+    int               timeout,         /* I - Timeout in milliseconds, 0 for indefinite */
+    int               *cancel,         /* I - Pointer to "cancel" variable */
+    cups_ptype_t      type,            /* I - Printer type bits */
+    cups_ptype_t      mask,            /* I - Mask for printer type bits */
+    cups_dest_block_t block)           /* I - Block */
+{
+  return (cupsEnumDests(flags, timeout, cancel, type, mask,
+                        (cups_dest_cb_t)cups_block_cb, (void *)block));
+}
+#  endif /* __BLOCKS__ */
+
+
 /*
  * 'cupsFreeDests()' - Free the memory used by the list of destinations.
  */
@@ -497,14 +1276,80 @@ cupsGetDest(const char  *name,           /* I - Destination name or @code NULL@ for the d
 
 
 /*
- * '_cupsGetDests()' - Get destinations from a server.
+ * '_cupsGetDestResource()' - Get the resource path and URI for a destination.
+ */
+
+const char *                           /* O - Printer URI */
+_cupsGetDestResource(
+    cups_dest_t *dest,                 /* I - Destination */
+    char        *resource,             /* I - Resource buffer */
+    size_t      resourcesize)          /* I - Size of resource buffer */
+{
+  const char   *uri;                   /* Printer URI */
+  char         scheme[32],             /* URI scheme */
+               userpass[256],          /* Username and password (unused) */
+               hostname[256];          /* Hostname */
+  int          port;                   /* Port number */
+
+
+ /*
+  * Range check input...
+  */
+
+  if (!dest || !resource || resourcesize < 1)
+  {
+    if (resource)
+      *resource = '\0';
+
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0);
+    return (NULL);
+  }
+
+ /*
+  * Grab the printer URI...
+  */
+
+  if ((uri = cupsGetOption("printer-uri-supported", dest->num_options,
+                           dest->options)) == NULL)
+  {
+    if (resource)
+      *resource = '\0';
+
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(ENOENT), 0);
+
+    return (NULL);
+  }
+
+#ifdef HAVE_DNSSD
+  if (strstr(uri, "._tcp"))
+  {
+    if ((uri = cups_dnssd_resolve(dest, uri, 5000, NULL, NULL, NULL)) == NULL)
+      return (NULL);
+  }
+#endif /* HAVE_DNSSD */
+
+  if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme),
+                      userpass, sizeof(userpass), hostname, sizeof(hostname),
+                      &port, resource, resourcesize) < HTTP_URI_STATUS_OK)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad printer URI."), 1);
+
+    return (NULL);
+  }
+
+  return (uri);
+}
+
+
+/*
+ * '_cupsGetDests()' - Get destinations from a server.
  *
- * "op" is CUPS_GET_PRINTERS to get a full list, CUPS_GET_DEFAULT to get the
- * system-wide default printer, or IPP_GET_PRINTER_ATTRIBUTES for a known
- * printer.
+ * "op" is IPP_OP_CUPS_GET_PRINTERS to get a full list, IPP_OP_CUPS_GET_DEFAULT
+ * to get the system-wide default printer, or IPP_OP_GET_PRINTER_ATTRIBUTES for
+ * a known printer.
  *
  * "name" is the name of an existing printer and is only used when "op" is
- * IPP_GET_PRINTER_ATTRIBUTES.
+ * IPP_OP_GET_PRINTER_ATTRIBUTES.
  *
  * "dest" is initialized to point to the array of destinations.
  *
@@ -514,16 +1359,19 @@ cupsGetDest(const char  *name,           /* I - Destination name or @code NULL@ for the d
  * Free the memory used by the destination array using the @link cupsFreeDests@
  * function.
  *
- * Note: On Mac OS X this function also gets the default paper from the system
+ * Note: On OS X this function also gets the default paper from the system
  * preferences (~/L/P/org.cups.PrintingPrefs.plist) and includes it in the
  * options array for each destination that supports it.
  */
 
-int                                    /* O - Number of destinations */
-_cupsGetDests(http_t      *http,       /* I - Connection to server or CUPS_HTTP_DEFAULT */
-             ipp_op_t    op,           /* I - IPP operation */
-             const char  *name,        /* I - Name of destination */
-             cups_dest_t **dests)      /* IO - Destinations */
+int                                    /* O  - Number of destinations */
+_cupsGetDests(http_t       *http,      /* I  - Connection to server or
+                                        *      @code CUPS_HTTP_DEFAULT@ */
+             ipp_op_t     op,          /* I  - IPP operation */
+             const char   *name,       /* I  - Name of destination */
+             cups_dest_t  **dests,     /* IO - Destinations */
+             cups_ptype_t type,        /* I  - Printer type bits */
+             cups_ptype_t mask)        /* I  - Printer type mask */
 {
   int          num_dests = 0;          /* Number of destinations */
   cups_dest_t  *dest;                  /* Current destination */
@@ -563,6 +1411,7 @@ _cupsGetDests(http_t      *http,   /* I - Connection to server or CUPS_HTTP_DEFAUL
                  "printer-is-shared",
                  "printer-location",
                  "printer-make-and-model",
+                 "printer-mandatory-job-attributes",
                  "printer-name",
                  "printer-state",
                  "printer-state-change-time",
@@ -581,13 +1430,13 @@ _cupsGetDests(http_t      *http, /* I - Connection to server or CUPS_HTTP_DEFAUL
 #endif /* __APPLE__ */
 
  /*
-  * Build a CUPS_GET_PRINTERS or IPP_GET_PRINTER_ATTRIBUTES request, which
+  * Build a IPP_OP_CUPS_GET_PRINTERS or IPP_OP_GET_PRINTER_ATTRIBUTES request, which
   * require the following attributes:
   *
   *    attributes-charset
   *    attributes-natural-language
   *    requesting-user-name
-  *    printer-uri [for IPP_GET_PRINTER_ATTRIBUTES]
+  *    printer-uri [for IPP_OP_GET_PRINTER_ATTRIBUTES]
   */
 
   request = ippNewRequest(op);
@@ -599,13 +1448,20 @@ _cupsGetDests(http_t      *http, /* I - Connection to server or CUPS_HTTP_DEFAUL
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                "requesting-user-name", NULL, cupsUser());
 
-  if (name && op != CUPS_GET_DEFAULT)
+  if (name && op != IPP_OP_CUPS_GET_DEFAULT)
   {
     httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
                      "localhost", ippPort(), "/printers/%s", name);
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
                  uri);
   }
+  else if (mask)
+  {
+    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, "printer-type",
+                  type);
+    ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM, "printer-type-mask",
+                  mask);
+  }
 
  /*
   * Do the request and get back a response...
@@ -661,6 +1517,7 @@ _cupsGetDests(http_t      *http,   /* I - Connection to server or CUPS_HTTP_DEFAUL
            !strcmp(attr->name, "printer-info") ||
            !strcmp(attr->name, "printer-is-shared") ||
            !strcmp(attr->name, "printer-make-and-model") ||
+           !strcmp(attr->name, "printer-mandatory-job-attributes") ||
            !strcmp(attr->name, "printer-state") ||
            !strcmp(attr->name, "printer-state-change-time") ||
            !strcmp(attr->name, "printer-type") ||
@@ -688,7 +1545,7 @@ _cupsGetDests(http_t      *http,   /* I - Connection to server or CUPS_HTTP_DEFAUL
           int  i;                      /* Looping var */
 
          for (i = 0; i < attr->num_values; i ++)
-           if (!strcasecmp(media_default, attr->values[i].string.text))
+           if (!_cups_strcasecmp(media_default, attr->values[i].string.text))
            {
              num_options = cupsAddOption("media", media_default, num_options,
                                          &options);
@@ -715,7 +1572,7 @@ _cupsGetDests(http_t      *http,   /* I - Connection to server or CUPS_HTTP_DEFAUL
           strlcpy(optname, attr->name, sizeof(optname));
          optname[ptr - attr->name] = '\0';
 
-         if (strcasecmp(optname, "media") ||
+         if (_cups_strcasecmp(optname, "media") ||
              !cupsGetOption("media", num_options, options))
            num_options = cupsAddOption(optname,
                                        cups_make_string(attr, value,
@@ -797,14 +1654,13 @@ cupsGetDests(cups_dest_t **dests)        /* O - Destinations */
  * Use the @link cupsFreeDests@ function to free the destination list and
  * the @link cupsGetDest@ function to find a particular destination.
  *
- * @since CUPS 1.1.21/Mac OS X 10.4@
+ * @since CUPS 1.1.21/OS X 10.4@
  */
 
 int                                    /* O - Number of destinations */
 cupsGetDests2(http_t      *http,       /* I - Connection to server or @code CUPS_HTTP_DEFAULT@ */
               cups_dest_t **dests)     /* O - Destinations */
 {
-  int          i;                      /* Looping var */
   int          num_dests;              /* Number of destinations */
   cups_dest_t  *dest;                  /* Destination pointer */
   const char   *home;                  /* HOME environment variable */
@@ -824,7 +1680,7 @@ cupsGetDests2(http_t      *http,   /* I - Connection to server or @code CUPS_HTTP_
 
   if (!dests)
   {
-    _cupsSetError(IPP_INTERNAL_ERROR, _("Bad NULL dests pointer"), 1);
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Bad NULL dests pointer"), 1);
     return (0);
   }
 
@@ -833,9 +1689,9 @@ cupsGetDests2(http_t      *http,   /* I - Connection to server or @code CUPS_HTTP_
   */
 
   *dests    = (cups_dest_t *)0;
-  num_dests = _cupsGetDests(http, CUPS_GET_PRINTERS, NULL, dests);
+  num_dests = _cupsGetDests(http, IPP_OP_CUPS_GET_PRINTERS, NULL, dests, 0, 0);
 
-  if (cupsLastError() >= IPP_REDIRECTION_OTHER_SITE)
+  if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
   {
     cupsFreeDests(num_dests, *dests);
     *dests = (cups_dest_t *)0;
@@ -927,21 +1783,16 @@ cupsGetDests2(http_t      *http, /* I - Connection to server or @code CUPS_HTTP_
       * Have a default; see if it is real...
       */
 
-      dest = cupsGetDest(dest->name, NULL, num_reals, reals);
-    }
-
-   /*
-    * If dest is NULL, then no default (that exists) is set, so we
-    * need to set a default if one exists...
-    */
-
-    if (dest == NULL && defprinter != NULL)
-    {
-      for (i = 0; i < num_dests; i ++)
-        (*dests)[i].is_default = 0;
+      if (!cupsGetDest(dest->name, NULL, num_reals, reals))
+      {
+       /*
+        * Remove the non-real printer from the list, since we don't want jobs
+        * going to an unexpected printer... (<rdar://problem/14216472>)
+        */
 
-      if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL)
-       dest->is_default = 1;
+        num_dests = cupsRemoveDest(dest->name, dest->instance, num_dests,
+                                   dests);
+      }
     }
 
    /*
@@ -956,7 +1807,7 @@ cupsGetDests2(http_t      *http,   /* I - Connection to server or @code CUPS_HTTP_
   */
 
   if (num_dests > 0)
-    _cupsSetError(IPP_OK, NULL, 0);
+    _cupsSetError(IPP_STATUS_OK, NULL, 0);
 
   return (num_dests);
 }
@@ -980,7 +1831,7 @@ cupsGetDests2(http_t      *http,   /* I - Connection to server or @code CUPS_HTTP_
  * The returned destination must be freed using @link cupsFreeDests@ with a
  * "num_dests" value of 1.
  *
- * @since CUPS 1.4/Mac OS X 10.6@
+ * @since CUPS 1.4/OS X 10.6@
  */
 
 cups_dest_t *                          /* O - Destination or @code NULL@ */
@@ -993,7 +1844,7 @@ cupsGetNamedDest(http_t     *http, /* I - Connection to server or @code CUPS_HTT
                defname[256];           /* Default printer name */
   const char   *home = getenv("HOME"); /* Home directory */
   int          set_as_default = 0;     /* Set returned destination as default */
-  ipp_op_t     op = IPP_GET_PRINTER_ATTRIBUTES;
+  ipp_op_t     op = IPP_OP_GET_PRINTER_ATTRIBUTES;
                                        /* IPP operation to get server ops */
   _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
 
@@ -1047,7 +1898,7 @@ cupsGetNamedDest(http_t     *http,        /* I - Connection to server or @code CUPS_HTT
       * No locally-set default destination, ask the server...
       */
 
-      op = CUPS_GET_DEFAULT;
+      op = IPP_OP_CUPS_GET_DEFAULT;
     }
   }
 
@@ -1055,19 +1906,8 @@ cupsGetNamedDest(http_t     *http,       /* I - Connection to server or @code CUPS_HTT
   * Get the printer's attributes...
   */
 
-  if (!_cupsGetDests(http, op, name, &dest))
-  {
-    if (op == CUPS_GET_DEFAULT || (name && !set_as_default))
-      return (NULL);
-
-   /*
-    * The default printer from environment variables or from a
-    * configuration file does not exist.  Find out the real default.
-    */
-
-    if (!_cupsGetDests(http, CUPS_GET_DEFAULT, NULL, &dest))
-      return (NULL);
-  }
+  if (!_cupsGetDests(http, op, name, &dest, 0, 0))
+    return (NULL);
 
   if (instance)
     dest->instance = _cupsStrAlloc(instance);
@@ -1105,7 +1945,7 @@ cupsGetNamedDest(http_t     *http,        /* I - Connection to server or @code CUPS_HTT
  * @link cupsSetDests@ or @link cupsSetDests2@ functions to save the new
  * options for the user.
  *
- * @since CUPS 1.3/Mac OS X 10.5@
+ * @since CUPS 1.3/OS X 10.5@
  */
 
 int                                    /* O  - New number of destinations */
@@ -1151,7 +1991,7 @@ cupsRemoveDest(const char  *name, /* I  - Destination name */
 /*
  * 'cupsSetDefaultDest()' - Set the default destination.
  *
- * @since CUPS 1.3/Mac OS X 10.5@
+ * @since CUPS 1.3/OS X 10.5@
  */
 
 void
@@ -1178,10 +2018,10 @@ cupsSetDefaultDest(
   */
 
   for (i = num_dests, dest = dests; i > 0; i --, dest ++)
-    dest->is_default = !strcasecmp(name, dest->name) &&
+    dest->is_default = !_cups_strcasecmp(name, dest->name) &&
                        ((!instance && !dest->instance) ||
                        (instance && dest->instance &&
-                        !strcasecmp(instance, dest->instance)));
+                        !_cups_strcasecmp(instance, dest->instance)));
 }
 
 
@@ -1206,7 +2046,7 @@ cupsSetDests(int         num_dests,       /* I - Number of destinations */
  * This function saves the destinations to /etc/cups/lpoptions when run
  * as root and ~/.cups/lpoptions when run as a normal user.
  *
- * @since CUPS 1.1.21/Mac OS X 10.4@
+ * @since CUPS 1.1.21/OS X 10.4@
  */
 
 int                                    /* O - 0 on success, -1 on error */
@@ -1225,7 +2065,7 @@ cupsSetDests2(http_t      *http,  /* I - Connection to server or @code CUPS_HTTP_
 #endif /* WIN32 */
   char         filename[1024];         /* lpoptions file */
   int          num_temps;              /* Number of temporary destinations */
-  cups_dest_t  *temps,                 /* Temporary destinations */
+  cups_dest_t  *temps = NULL,          /* Temporary destinations */
                *temp;                  /* Current temporary dest */
   const char   *val;                   /* Value of temporary option */
   _cups_globals_t *cg = _cupsGlobals();        /* Pointer to library globals */
@@ -1242,9 +2082,9 @@ cupsSetDests2(http_t      *http,  /* I - Connection to server or @code CUPS_HTTP_
   * Get the server destinations...
   */
 
-  num_temps = _cupsGetDests(http, CUPS_GET_PRINTERS, NULL, &temps);
+  num_temps = _cupsGetDests(http, IPP_OP_CUPS_GET_PRINTERS, NULL, &temps, 0, 0);
 
-  if (cupsLastError() >= IPP_REDIRECTION_OTHER_SITE)
+  if (cupsLastError() >= IPP_STATUS_REDIRECTION_OTHER_SITE)
   {
     cupsFreeDests(num_temps, temps);
     return (-1);
@@ -1346,7 +2186,7 @@ cupsSetDests2(http_t      *http,  /* I - Connection to server or @code CUPS_HTTP_
         if (temp &&
            (val = cupsGetOption(option->name, temp->num_options,
                                 temp->options)) != NULL &&
-            !strcasecmp(val, option->value))
+            !_cups_strcasecmp(val, option->value))
          continue;
 
        /*
@@ -1360,7 +2200,7 @@ cupsSetDests2(http_t      *http,  /* I - Connection to server or @code CUPS_HTTP_
            fprintf(fp, "/%s", dest->instance);
           wrote = 1;
        }
-        
+
         if (option->value[0])
        {
          if (strchr(option->value, ' ') ||
@@ -1537,7 +2377,7 @@ appleCopyNetwork(void)
   CFStringRef          key;            /* Current network configuration key */
   CFDictionaryRef      ip_dict;        /* Network configuration data */
   CFStringRef          network = NULL; /* Current network ID */
-  
+
 
   if ((dynamicStore = SCDynamicStoreCreate(NULL, CFSTR("libcups"), NULL,
                                            NULL)) != NULL)
@@ -1596,12 +2436,12 @@ appleCopyNetwork(void)
  * 'appleGetPaperSize()' - Get the default paper size.
  */
 
-char *                                 /* O - Default paper size */
+static char *                          /* O - Default paper size */
 appleGetPaperSize(char *name,          /* I - Paper size name buffer */
                   int  namesize)       /* I - Size of buffer */
 {
   CFStringRef  defaultPaperID;         /* Default paper ID */
-  _pwg_media_t *pwgmedia;              /* PWG media size */
+  pwg_media_t  *pwgmedia;              /* PWG media size */
 
 
   defaultPaperID = _cupsAppleCopyDefaultPaperID();
@@ -1610,7 +2450,7 @@ appleGetPaperSize(char *name,             /* I - Paper size name buffer */
       !CFStringGetCString(defaultPaperID, name, namesize,
                          kCFStringEncodingUTF8))
     name[0] = '\0';
-  else if ((pwgmedia = _pwgMediaForLegacy(name)) != NULL)
+  else if ((pwgmedia = pwgMediaForLegacy(name)) != NULL)
     strlcpy(name, pwgmedia->pwg, namesize);
 
   if (defaultPaperID)
@@ -1731,6 +2571,22 @@ cups_add_dest(const char  *name, /* I  - Name of destination */
 }
 
 
+#  ifdef __BLOCKS__
+/*
+ * 'cups_block_cb()' - Enumeration callback for block API.
+ */
+
+static int                             /* O - 1 to continue, 0 to stop */
+cups_block_cb(
+    cups_dest_block_t block,           /* I - Block */
+    unsigned          flags,           /* I - Destination flags */
+    cups_dest_t       *dest)           /* I - Destination */
+{
+  return ((block)(flags, dest));
+}
+#  endif /* __BLOCKS__ */
+
+
 /*
  * 'cups_compare_dests()' - Compare two destinations.
  */
@@ -1742,15 +2598,885 @@ cups_compare_dests(cups_dest_t *a,     /* I - First destination */
   int  diff;                           /* Difference */
 
 
-  if ((diff = strcasecmp(a->name, b->name)) != 0)
+  if ((diff = _cups_strcasecmp(a->name, b->name)) != 0)
     return (diff);
   else if (a->instance && b->instance)
-    return (strcasecmp(a->instance, b->instance));
+    return (_cups_strcasecmp(a->instance, b->instance));
   else
     return ((a->instance && !b->instance) - (!a->instance && b->instance));
 }
 
 
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+#  ifdef HAVE_DNSSD
+/*
+ * 'cups_dnssd_browse_cb()' - Browse for printers.
+ */
+
+static void
+cups_dnssd_browse_cb(
+    DNSServiceRef       sdRef,         /* I - Service reference */
+    DNSServiceFlags     flags,         /* I - Option flags */
+    uint32_t            interfaceIndex,        /* I - Interface number */
+    DNSServiceErrorType errorCode,     /* I - Error, if any */
+    const char          *serviceName,  /* I - Name of service/device */
+    const char          *regtype,      /* I - Type of service */
+    const char          *replyDomain,  /* I - Service domain */
+    void                *context)      /* I - Enumeration data */
+{
+  _cups_dnssd_data_t   *data = (_cups_dnssd_data_t *)context;
+                                       /* Enumeration data */
+
+
+  DEBUG_printf(("5cups_dnssd_browse_cb(sdRef=%p, flags=%x, "
+               "interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", "
+               "regtype=\"%s\", replyDomain=\"%s\", context=%p)",
+               sdRef, flags, interfaceIndex, errorCode, serviceName, regtype,
+               replyDomain, context));
+
+ /*
+  * Don't do anything on error...
+  */
+
+  if (errorCode != kDNSServiceErr_NoError)
+    return;
+
+ /*
+  * Get the device...
+  */
+
+  cups_dnssd_get_device(data, serviceName, regtype, replyDomain);
+}
+
+
+#  else /* HAVE_AVAHI */
+/*
+ * 'cups_dnssd_browse_cb()' - Browse for printers.
+ */
+
+static void
+cups_dnssd_browse_cb(
+    AvahiServiceBrowser    *browser,   /* I - Browser */
+    AvahiIfIndex           interface,  /* I - Interface index (unused) */
+    AvahiProtocol          protocol,   /* I - Network protocol (unused) */
+    AvahiBrowserEvent      event,      /* I - What happened */
+    const char             *name,      /* I - Service name */
+    const char             *type,      /* I - Registration type */
+    const char             *domain,    /* I - Domain */
+    AvahiLookupResultFlags flags,      /* I - Flags */
+    void                   *context)   /* I - Devices array */
+{
+#ifdef DEBUG
+  AvahiClient          *client = avahi_service_browser_get_client(browser);
+                                       /* Client information */
+#endif /* DEBUG */
+  _cups_dnssd_data_t   *data = (_cups_dnssd_data_t *)context;
+                                       /* Enumeration data */
+
+
+  (void)interface;
+  (void)protocol;
+  (void)context;
+
+  switch (event)
+  {
+    case AVAHI_BROWSER_FAILURE:
+       DEBUG_printf(("cups_dnssd_browse_cb: %s",
+                     avahi_strerror(avahi_client_errno(client))));
+       avahi_simple_poll_quit(data->simple_poll);
+       break;
+
+    case AVAHI_BROWSER_NEW:
+       /*
+       * This object is new on the network.
+       */
+
+       if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
+       {
+        /*
+         * This comes from the local machine so ignore it.
+         */
+
+         DEBUG_printf(("cups_dnssd_browse_cb: Ignoring local service \"%s\".",
+                       name));
+       }
+       else
+       {
+        /*
+         * Create a device entry for it if it doesn't yet exist.
+         */
+
+         cups_dnssd_get_device(data, name, type, domain);
+       }
+       break;
+
+    case AVAHI_BROWSER_REMOVE:
+    case AVAHI_BROWSER_ALL_FOR_NOW:
+    case AVAHI_BROWSER_CACHE_EXHAUSTED:
+        break;
+  }
+}
+
+
+/*
+ * 'cups_dnssd_client_cb()' - Avahi client callback function.
+ */
+
+static void
+cups_dnssd_client_cb(
+    AvahiClient      *client,          /* I - Client information (unused) */
+    AvahiClientState state,            /* I - Current state */
+    void             *context)         /* I - User data (unused) */
+{
+  _cups_dnssd_data_t   *data = (_cups_dnssd_data_t *)context;
+                                       /* Enumeration data */
+
+
+  (void)client;
+
+ /*
+  * If the connection drops, quit.
+  */
+
+  if (state == AVAHI_CLIENT_FAILURE)
+  {
+    DEBUG_puts("cups_dnssd_client_cb: Avahi connection failed.");
+    avahi_simple_poll_quit(data->simple_poll);
+  }
+}
+#  endif /* HAVE_DNSSD */
+
+
+/*
+ * 'cups_dnssd_compare_device()' - Compare two devices.
+ */
+
+static int                             /* O - Result of comparison */
+cups_dnssd_compare_devices(
+    _cups_dnssd_device_t *a,           /* I - First device */
+    _cups_dnssd_device_t *b)           /* I - Second device */
+{
+  return (strcmp(a->dest.name, b->dest.name));
+}
+
+
+/*
+ * 'cups_dnssd_free_device()' - Free the memory used by a device.
+ */
+
+static void
+cups_dnssd_free_device(
+    _cups_dnssd_device_t *device,      /* I - Device */
+    _cups_dnssd_data_t   *data)                /* I - Enumeration data */
+{
+  DEBUG_printf(("5cups_dnssd_free_device(device=%p(%s), data=%p)", device,
+                device->dest.name, data));
+
+#  ifdef HAVE_DNSSD
+  if (device->ref)
+    DNSServiceRefDeallocate(device->ref);
+#  else /* HAVE_AVAHI */
+  if (device->ref)
+    avahi_record_browser_free(device->ref);
+#  endif /* HAVE_DNSSD */
+
+  _cupsStrFree(device->domain);
+  _cupsStrFree(device->fullName);
+  _cupsStrFree(device->regtype);
+  _cupsStrFree(device->dest.name);
+
+  cupsFreeOptions(device->dest.num_options, device->dest.options);
+
+  free(device);
+}
+
+
+/*
+ * 'cups_dnssd_get_device()' - Lookup a device and create it as needed.
+ */
+
+static _cups_dnssd_device_t *          /* O - Device */
+cups_dnssd_get_device(
+    _cups_dnssd_data_t *data,          /* I - Enumeration data */
+    const char         *serviceName,   /* I - Service name */
+    const char         *regtype,       /* I - Registration type */
+    const char         *replyDomain)   /* I - Domain name */
+{
+  _cups_dnssd_device_t key,            /* Search key */
+                       *device;        /* Device */
+  char                 fullName[kDNSServiceMaxDomainName];
+                                       /* Full name for query */
+
+
+  DEBUG_printf(("5cups_dnssd_get_device(data=%p, serviceName=\"%s\", "
+                "regtype=\"%s\", replyDomain=\"%s\")", data, serviceName,
+                regtype, replyDomain));
+
+ /*
+  * See if this is an existing device...
+  */
+
+  key.dest.name = (char *)serviceName;
+
+  if ((device = cupsArrayFind(data->devices, &key)) != NULL)
+  {
+   /*
+    * Yes, see if we need to do anything with this...
+    */
+
+    int        update = 0;                     /* Non-zero if we need to update */
+
+    if (!_cups_strcasecmp(replyDomain, "local.") &&
+       _cups_strcasecmp(device->domain, replyDomain))
+    {
+     /*
+      * Update the "global" listing to use the .local domain name instead.
+      */
+
+      _cupsStrFree(device->domain);
+      device->domain = _cupsStrAlloc(replyDomain);
+
+      DEBUG_printf(("6cups_dnssd_get_device: Updating '%s' to use local "
+                    "domain.", device->dest.name));
+
+      update = 1;
+    }
+
+    if (!_cups_strcasecmp(regtype, "_ipps._tcp") &&
+       _cups_strcasecmp(device->regtype, regtype))
+    {
+     /*
+      * Prefer IPPS over IPP.
+      */
+
+      _cupsStrFree(device->regtype);
+      device->regtype = _cupsStrAlloc(regtype);
+
+      DEBUG_printf(("6cups_dnssd_get_device: Updating '%s' to use IPPS.",
+                   device->dest.name));
+
+      update = 1;
+    }
+
+    if (!update)
+    {
+      DEBUG_printf(("6cups_dnssd_get_device: No changes to '%s'.",
+                    device->dest.name));
+      return (device);
+    }
+  }
+  else
+  {
+   /*
+    * No, add the device...
+    */
+
+    DEBUG_printf(("6cups_dnssd_get_device: Adding '%s' for %s with domain "
+                  "'%s'.", serviceName,
+                  !strcmp(regtype, "_ipps._tcp") ? "IPPS" : "IPP",
+                  replyDomain));
+
+    device            = calloc(sizeof(_cups_dnssd_device_t), 1);
+    device->dest.name = _cupsStrAlloc(serviceName);
+    device->domain    = _cupsStrAlloc(replyDomain);
+    device->regtype   = _cupsStrAlloc(regtype);
+
+    cupsArrayAdd(data->devices, device);
+  }
+
+ /*
+  * Set the "full name" of this service, which is used for queries...
+  */
+
+#  ifdef HAVE_DNSSD
+  DNSServiceConstructFullName(fullName, device->dest.name, device->regtype,
+                             device->domain);
+#  else /* HAVE_AVAHI */
+  avahi_service_name_join(fullName, kDNSServiceMaxDomainName, serviceName,
+                          regtype, replyDomain);
+#  endif /* HAVE_DNSSD */
+
+  _cupsStrFree(device->fullName);
+  device->fullName = _cupsStrAlloc(fullName);
+
+  if (device->ref)
+  {
+#  ifdef HAVE_DNSSD
+    DNSServiceRefDeallocate(device->ref);
+#  else /* HAVE_AVAHI */
+    avahi_record_browser_free(device->ref);
+#  endif /* HAVE_DNSSD */
+
+    device->ref = 0;
+  }
+
+  if (device->state == _CUPS_DNSSD_ACTIVE)
+  {
+    (*data->cb)(data->user_data, CUPS_DEST_FLAGS_REMOVED, &device->dest);
+    device->state = _CUPS_DNSSD_NEW;
+  }
+
+  return (device);
+}
+
+
+#  ifdef HAVE_DNSSD
+/*
+ * 'cups_dnssd_local_cb()' - Browse for local printers.
+ */
+
+static void
+cups_dnssd_local_cb(
+    DNSServiceRef       sdRef,         /* I - Service reference */
+    DNSServiceFlags     flags,         /* I - Option flags */
+    uint32_t            interfaceIndex,        /* I - Interface number */
+    DNSServiceErrorType errorCode,     /* I - Error, if any */
+    const char          *serviceName,  /* I - Name of service/device */
+    const char          *regtype,      /* I - Type of service */
+    const char          *replyDomain,  /* I - Service domain */
+    void                *context)      /* I - Devices array */
+{
+  _cups_dnssd_data_t   *data = (_cups_dnssd_data_t *)context;
+                                       /* Enumeration data */
+  _cups_dnssd_device_t *device;        /* Device */
+
+
+  DEBUG_printf(("5cups_dnssd_local_cb(sdRef=%p, flags=%x, "
+               "interfaceIndex=%d, errorCode=%d, serviceName=\"%s\", "
+               "regtype=\"%s\", replyDomain=\"%s\", context=%p)",
+               sdRef, flags, interfaceIndex, errorCode, serviceName,
+               regtype, replyDomain, context));
+
+ /*
+  * Only process "add" data...
+  */
+
+  if (errorCode != kDNSServiceErr_NoError || !(flags & kDNSServiceFlagsAdd))
+    return;
+
+ /*
+  * Get the device...
+  */
+
+  device = cups_dnssd_get_device(data, serviceName, regtype, replyDomain);
+
+ /*
+  * Hide locally-registered devices...
+  */
+
+  DEBUG_printf(("6cups_dnssd_local_cb: Hiding local printer '%s'.",
+                serviceName));
+
+  if (device->ref)
+  {
+    DNSServiceRefDeallocate(device->ref);
+    device->ref = 0;
+  }
+
+  if (device->state == _CUPS_DNSSD_ACTIVE)
+    (*data->cb)(data->user_data, CUPS_DEST_FLAGS_REMOVED, &device->dest);
+
+  device->state = _CUPS_DNSSD_LOCAL;
+}
+#  endif /* HAVE_DNSSD */
+
+
+#  ifdef HAVE_AVAHI
+/*
+ * 'cups_dnssd_poll_cb()' - Wait for input on the specified file descriptors.
+ *
+ * Note: This function is needed because avahi_simple_poll_iterate is broken
+ *       and always uses a timeout of 0 (!) milliseconds.
+ *       (Avahi Ticket #364)
+ */
+
+static int                             /* O - Number of file descriptors matching */
+cups_dnssd_poll_cb(
+    struct pollfd *pollfds,            /* I - File descriptors */
+    unsigned int  num_pollfds,         /* I - Number of file descriptors */
+    int           timeout,             /* I - Timeout in milliseconds (unused) */
+    void          *context)            /* I - User data (unused) */
+{
+  _cups_dnssd_data_t   *data = (_cups_dnssd_data_t *)context;
+                                       /* Enumeration data */
+  int                  val;            /* Return value */
+
+
+  (void)timeout;
+
+  val = poll(pollfds, num_pollfds, 250);
+
+  if (val < 0)
+  {
+    DEBUG_printf(("cups_dnssd_poll_cb: %s", strerror(errno)));
+  }
+  else if (val > 0)
+    data->got_data = 1;
+
+  return (val);
+}
+#  endif /* HAVE_AVAHI */
+
+
+/*
+ * 'cups_dnssd_query_cb()' - Process query data.
+ */
+
+#  ifdef HAVE_DNSSD
+static void
+cups_dnssd_query_cb(
+    DNSServiceRef       sdRef,         /* I - Service reference */
+    DNSServiceFlags     flags,         /* I - Data flags */
+    uint32_t            interfaceIndex,        /* I - Interface */
+    DNSServiceErrorType errorCode,     /* I - Error, if any */
+    const char          *fullName,     /* I - Full service name */
+    uint16_t            rrtype,                /* I - Record type */
+    uint16_t            rrclass,       /* I - Record class */
+    uint16_t            rdlen,         /* I - Length of record data */
+    const void          *rdata,                /* I - Record data */
+    uint32_t            ttl,           /* I - Time-to-live */
+    void                *context)      /* I - Enumeration data */
+{
+#  else /* HAVE_AVAHI */
+static void
+cups_dnssd_query_cb(
+    AvahiRecordBrowser     *browser,   /* I - Record browser */
+    AvahiIfIndex           interfaceIndex,
+                                       /* I - Interface index (unused) */
+    AvahiProtocol          protocol,   /* I - Network protocol (unused) */
+    AvahiBrowserEvent      event,      /* I - What happened? */
+    const char             *fullName,  /* I - Service name */
+    uint16_t               rrclass,    /* I - Record class */
+    uint16_t               rrtype,     /* I - Record type */
+    const void             *rdata,     /* I - TXT record */
+    size_t                 rdlen,      /* I - Length of TXT record */
+    AvahiLookupResultFlags flags,      /* I - Flags */
+    void                   *context)   /* I - Enumeration data */
+{
+#    ifdef DEBUG
+  AvahiClient          *client = avahi_record_browser_get_client(browser);
+                                       /* Client information */
+#    endif /* DEBUG */
+#  endif /* HAVE_DNSSD */
+  _cups_dnssd_data_t   *data = (_cups_dnssd_data_t *)context;
+                                       /* Enumeration data */
+  char                 name[1024],     /* Service name */
+                       *ptr;           /* Pointer into string */
+  _cups_dnssd_device_t dkey,           /* Search key */
+                       *device;        /* Device */
+
+
+#  ifdef HAVE_DNSSD
+  DEBUG_printf(("5cups_dnssd_query_cb(sdRef=%p, flags=%x, "
+               "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
+               "rrtype=%u, rrclass=%u, rdlen=%u, rdata=%p, ttl=%u, "
+               "context=%p)", sdRef, flags, interfaceIndex, errorCode,
+               fullName, rrtype, rrclass, rdlen, rdata, ttl, context));
+
+ /*
+  * Only process "add" data...
+  */
+
+  if (errorCode != kDNSServiceErr_NoError || !(flags & kDNSServiceFlagsAdd))
+    return;
+
+#  else /* HAVE_AVAHI */
+  DEBUG_printf(("5cups_dnssd_query_cb(browser=%p, interfaceIndex=%d, "
+               "protocol=%d, event=%d, fullName=\"%s\", rrclass=%u, "
+               "rrtype=%u, rdata=%p, rdlen=%u, flags=%x, context=%p)",
+               browser, interfaceIndex, protocol, event, fullName, rrclass,
+               rrtype, rdata, (unsigned)rdlen, flags, context));
+
+ /*
+  * Only process "add" data...
+  */
+
+  if (event != AVAHI_BROWSER_NEW)
+  {
+    if (event == AVAHI_BROWSER_FAILURE)
+      DEBUG_printf(("cups_dnssd_query_cb: %s",
+                   avahi_strerror(avahi_client_errno(client))));
+
+    return;
+  }
+#  endif /* HAVE_DNSSD */
+
+ /*
+  * Lookup the service in the devices array.
+  */
+
+  dkey.dest.name = name;
+
+  cups_dnssd_unquote(name, fullName, sizeof(name));
+
+  if ((ptr = strstr(name, "._")) != NULL)
+    *ptr = '\0';
+
+  if ((device = cupsArrayFind(data->devices, &dkey)) != NULL)
+  {
+   /*
+    * Found it, pull out the make and model from the TXT record and save it...
+    */
+
+    const uint8_t      *txt,           /* Pointer into data */
+                       *txtnext,       /* Next key/value pair */
+                       *txtend;        /* End of entire TXT record */
+    uint8_t            txtlen;         /* Length of current key/value pair */
+    char               key[256],       /* Key string */
+                       value[256],     /* Value string */
+                       make_and_model[512],
+                                       /* Manufacturer and model */
+                       model[256],     /* Model */
+                       uriname[1024],  /* Name for URI */
+                       uri[1024];      /* Printer URI */
+    cups_ptype_t       type = CUPS_PRINTER_REMOTE | CUPS_PRINTER_BW;
+                                       /* Printer type */
+    int                        saw_printer_type = 0;
+                                       /* Did we see a printer-type key? */
+
+    device->state     = _CUPS_DNSSD_PENDING;
+    make_and_model[0] = '\0';
+
+    strlcpy(model, "Unknown", sizeof(model));
+
+    for (txt = rdata, txtend = txt + rdlen;
+        txt < txtend;
+        txt = txtnext)
+    {
+     /*
+      * Read a key/value pair starting with an 8-bit length.  Since the
+      * length is 8 bits and the size of the key/value buffers is 256, we
+      * don't need to check for overflow...
+      */
+
+      txtlen = *txt++;
+
+      if (!txtlen || (txt + txtlen) > txtend)
+       break;
+
+      txtnext = txt + txtlen;
+
+      for (ptr = key; txt < txtnext && *txt != '='; txt ++)
+       *ptr++ = *txt;
+      *ptr = '\0';
+
+      if (txt < txtnext && *txt == '=')
+      {
+       txt ++;
+
+       if (txt < txtnext)
+         memcpy(value, txt, txtnext - txt);
+       value[txtnext - txt] = '\0';
+
+       DEBUG_printf(("6cups_dnssd_query_cb: %s=%s", key, value));
+      }
+      else
+      {
+       DEBUG_printf(("6cups_dnssd_query_cb: '%s' with no value.", key));
+       continue;
+      }
+
+      if (!_cups_strcasecmp(key, "usb_MFG") ||
+          !_cups_strcasecmp(key, "usb_MANU") ||
+         !_cups_strcasecmp(key, "usb_MANUFACTURER"))
+       strlcpy(make_and_model, value, sizeof(make_and_model));
+      else if (!_cups_strcasecmp(key, "usb_MDL") ||
+               !_cups_strcasecmp(key, "usb_MODEL"))
+       strlcpy(model, value, sizeof(model));
+      else if (!_cups_strcasecmp(key, "product") && !strstr(value, "Ghostscript"))
+      {
+       if (value[0] == '(')
+       {
+        /*
+         * Strip parenthesis...
+         */
+
+         if ((ptr = value + strlen(value) - 1) > value && *ptr == ')')
+           *ptr = '\0';
+
+         strlcpy(model, value + 1, sizeof(model));
+       }
+       else
+         strlcpy(model, value, sizeof(model));
+      }
+      else if (!_cups_strcasecmp(key, "ty"))
+      {
+       strlcpy(model, value, sizeof(model));
+
+       if ((ptr = strchr(model, ',')) != NULL)
+         *ptr = '\0';
+      }
+      else if (!_cups_strcasecmp(key, "note"))
+        device->dest.num_options = cupsAddOption("printer-location", value,
+                                                device->dest.num_options,
+                                                &device->dest.options);
+      else if (!_cups_strcasecmp(key, "pdl"))
+      {
+       /*
+        * Look for PDF-capable printers; only PDF-capable printers are shown.
+        */
+
+        const char     *start, *next;  /* Pointer into value */
+        int            have_pdf = 0;   /* Have PDF? */
+
+        for (start = value; start && *start; start = next)
+        {
+          if (!_cups_strncasecmp(start, "application/pdf", 15) &&
+              (!start[15] || start[15] == ','))
+          {
+            have_pdf = 1;
+            break;
+          }
+
+          if ((next = strchr(start, ',')) != NULL)
+            next ++;
+        }
+
+        if (!have_pdf)
+          device->state = _CUPS_DNSSD_INCOMPATIBLE;
+      }
+      else if (!_cups_strcasecmp(key, "printer-type"))
+      {
+       /*
+        * Value is either NNNN or 0xXXXX
+        */
+
+       saw_printer_type = 1;
+        type             = strtol(value, NULL, 0);
+      }
+      else if (!saw_printer_type)
+      {
+       if (!_cups_strcasecmp(key, "air") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_AUTHENTICATED;
+       else if (!_cups_strcasecmp(key, "bind") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_BIND;
+       else if (!_cups_strcasecmp(key, "collate") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_COLLATE;
+       else if (!_cups_strcasecmp(key, "color") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_COLOR;
+       else if (!_cups_strcasecmp(key, "copies") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_COPIES;
+       else if (!_cups_strcasecmp(key, "duplex") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_DUPLEX;
+       else if (!_cups_strcasecmp(key, "fax") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_MFP;
+       else if (!_cups_strcasecmp(key, "papercustom") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_VARIABLE;
+       else if (!_cups_strcasecmp(key, "papermax"))
+       {
+         if (!_cups_strcasecmp(value, "legal-a4"))
+           type |= CUPS_PRINTER_SMALL;
+         else if (!_cups_strcasecmp(value, "isoc-a2"))
+           type |= CUPS_PRINTER_MEDIUM;
+         else if (!_cups_strcasecmp(value, ">isoc-a2"))
+           type |= CUPS_PRINTER_LARGE;
+       }
+       else if (!_cups_strcasecmp(key, "punch") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_PUNCH;
+       else if (!_cups_strcasecmp(key, "scan") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_MFP;
+       else if (!_cups_strcasecmp(key, "sort") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_SORT;
+       else if (!_cups_strcasecmp(key, "staple") &&
+                !_cups_strcasecmp(value, "t"))
+         type |= CUPS_PRINTER_STAPLE;
+      }
+    }
+
+   /*
+    * Save the printer-xxx values...
+    */
+
+    device->dest.num_options = cupsAddOption("printer-info", name,
+                                            device->dest.num_options,
+                                            &device->dest.options);
+
+    if (make_and_model[0])
+    {
+      strlcat(make_and_model, " ", sizeof(make_and_model));
+      strlcat(make_and_model, model, sizeof(make_and_model));
+
+      device->dest.num_options = cupsAddOption("printer-make-and-model",
+                                              make_and_model,
+                                              device->dest.num_options,
+                                              &device->dest.options);
+    }
+    else
+      device->dest.num_options = cupsAddOption("printer-make-and-model",
+                                              model,
+                                              device->dest.num_options,
+                                              &device->dest.options);
+
+    device->type = type;
+    snprintf(value, sizeof(value), "%u", type);
+    device->dest.num_options = cupsAddOption("printer-type", value,
+                                            device->dest.num_options,
+                                            &device->dest.options);
+
+   /*
+    * Save the URI...
+    */
+
+    cups_dnssd_unquote(uriname, device->fullName, sizeof(uriname));
+    httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri),
+                    !strcmp(device->regtype, "_ipps._tcp") ? "ipps" : "ipp",
+                    NULL, uriname, 0, saw_printer_type ? "/cups" : "/");
+
+    DEBUG_printf(("6cups_dnssd_query: printer-uri-supported=\"%s\"", uri));
+
+    device->dest.num_options = cupsAddOption("printer-uri-supported", uri,
+                                            device->dest.num_options,
+                                            &device->dest.options);
+  }
+  else
+    DEBUG_printf(("6cups_dnssd_query: Ignoring TXT record for '%s'.",
+                  fullName));
+}
+
+
+/*
+ * 'cups_dnssd_resolve()' - Resolve a Bonjour printer URI.
+ */
+
+static const char *                    /* O - Resolved URI or NULL */
+cups_dnssd_resolve(
+    cups_dest_t    *dest,              /* I - Destination */
+    const char     *uri,               /* I - Current printer URI */
+    int            msec,               /* I - Time in milliseconds */
+    int            *cancel,            /* I - Pointer to "cancel" variable */
+    cups_dest_cb_t cb,                 /* I - Callback */
+    void           *user_data)         /* I - User data for callback */
+{
+  char                 tempuri[1024];  /* Temporary URI buffer */
+  _cups_dnssd_resolve_t        resolve;        /* Resolve data */
+
+
+ /*
+  * Resolve the URI...
+  */
+
+  resolve.cancel = cancel;
+  gettimeofday(&resolve.end_time, NULL);
+  if (msec > 0)
+  {
+    resolve.end_time.tv_sec  += msec / 1000;
+    resolve.end_time.tv_usec += (msec % 1000) * 1000;
+
+    while (resolve.end_time.tv_usec >= 1000000)
+    {
+      resolve.end_time.tv_sec ++;
+      resolve.end_time.tv_usec -= 1000000;
+    }
+  }
+  else
+    resolve.end_time.tv_sec += 75;
+
+  if (cb)
+    (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_RESOLVING,
+         dest);
+
+  if ((uri = _httpResolveURI(uri, tempuri, sizeof(tempuri),
+                            _HTTP_RESOLVE_FQDN, cups_dnssd_resolve_cb,
+                            &resolve)) == NULL)
+  {
+    _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to resolve printer URI."), 1);
+
+    if (cb)
+      (*cb)(user_data, CUPS_DEST_FLAGS_UNCONNECTED | CUPS_DEST_FLAGS_ERROR,
+           dest);
+
+    return (NULL);
+  }
+
+ /*
+  * Save the resolved URI...
+  */
+
+  dest->num_options = cupsAddOption("printer-uri-supported", uri,
+                                   dest->num_options, &dest->options);
+
+  return (cupsGetOption("printer-uri-supported", dest->num_options,
+                        dest->options));
+}
+
+
+/*
+ * 'cups_dnssd_resolve_cb()' - See if we should continue resolving.
+ */
+
+static int                             /* O - 1 to continue, 0 to stop */
+cups_dnssd_resolve_cb(void *context)   /* I - Resolve data */
+{
+  _cups_dnssd_resolve_t        *resolve = (_cups_dnssd_resolve_t *)context;
+                                       /* Resolve data */
+  struct timeval       curtime;        /* Current time */
+
+
+ /*
+  * If the cancel variable is set, return immediately.
+  */
+
+  if (*resolve->cancel)
+    return (0);
+
+ /*
+  * Otherwise check the end time...
+  */
+
+  gettimeofday(&curtime, NULL);
+
+  return (curtime.tv_sec > resolve->end_time.tv_sec ||
+          (curtime.tv_sec == resolve->end_time.tv_sec &&
+           curtime.tv_usec > resolve->end_time.tv_usec));
+}
+
+
+/*
+ * 'cups_dnssd_unquote()' - Unquote a name string.
+ */
+
+static void
+cups_dnssd_unquote(char       *dst,    /* I - Destination buffer */
+                   const char *src,    /* I - Source string */
+                  size_t     dstsize)  /* I - Size of destination buffer */
+{
+  char *dstend = dst + dstsize - 1;    /* End of destination buffer */
+
+
+  while (*src && dst < dstend)
+  {
+    if (*src == '\\')
+    {
+      src ++;
+      if (isdigit(src[0] & 255) && isdigit(src[1] & 255) &&
+          isdigit(src[2] & 255))
+      {
+        *dst++ = ((((src[0] - '0') * 10) + src[1] - '0') * 10) + src[2] - '0';
+       src += 3;
+      }
+      else
+        *dst++ = *src++;
+    }
+    else
+      *dst++ = *src ++;
+  }
+
+  *dst = '\0';
+}
+#endif /* HAVE_DNSSD */
+
+
 /*
  * 'cups_find_dest()' - Find a destination using a binary search.
  */
@@ -1868,7 +3594,7 @@ cups_get_default(const char *filename,    /* I - File to read */
   char         line[8192],             /* Line from file */
                *value,                 /* Value for line */
                *nameptr;               /* Pointer into name */
-  int          linenum;                /* Current line */  
+  int          linenum;                /* Current line */
 
 
   *namebuf = '\0';
@@ -1879,7 +3605,7 @@ cups_get_default(const char *filename,    /* I - File to read */
 
     while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum))
     {
-      if (!strcasecmp(line, "default") && value)
+      if (!_cups_strcasecmp(line, "default") && value)
       {
         strlcpy(namebuf, value, namesize);
 
@@ -1956,7 +3682,7 @@ cups_get_dests(
     DEBUG_printf(("9cups_get_dests: linenum=%d line=\"%s\" lineptr=\"%s\"",
                   linenum, line, lineptr));
 
-    if ((strcasecmp(line, "dest") && strcasecmp(line, "default")) || !lineptr)
+    if ((_cups_strcasecmp(line, "dest") && _cups_strcasecmp(line, "default")) || !lineptr)
     {
       DEBUG_puts("9cups_get_dests: Not a dest or default line...");
       continue;
@@ -2003,10 +3729,10 @@ cups_get_dests(
 
     if (match_name)
     {
-      if (strcasecmp(name, match_name) ||
+      if (_cups_strcasecmp(name, match_name) ||
           (!instance && match_inst) ||
          (instance && !match_inst) ||
-         (instance && strcasecmp(instance, match_inst)))
+         (instance && _cups_strcasecmp(instance, match_inst)))
        continue;
 
       dest = *dests;
@@ -2053,7 +3779,7 @@ cups_get_dests(
     * Set this as default if needed...
     */
 
-    if (!user_default_set && !strcasecmp(line, "default"))
+    if (!user_default_set && !_cups_strcasecmp(line, "default"))
     {
       DEBUG_puts("9cups_get_dests: Setting as default...");
 
@@ -2068,7 +3794,7 @@ cups_get_dests(
   * Close the file and return...
   */
 
-  cupsFileClose(fp);      
+  cupsFileClose(fp);
 
   return (num_dests);
 }
@@ -2165,5 +3891,5 @@ cups_make_string(
 
 
 /*
- * End of "$Id: dest.c 9568 2011-02-25 06:13:56Z mike $".
+ * End of "$Id: dest.c 11141 2013-07-16 14:58:25Z msweet $".
  */