]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - backend/ipp.c
Merge changes from CUPS 1.5svn-r9641
[thirdparty/cups.git] / backend / ipp.c
index 4943dbbdb116328fe04b1e7bc69b72010cd93321..95263a85e9ba34fa5ee39980e6bddaddfc027923 100644 (file)
@@ -1,25 +1,16 @@
 /*
- * "$Id$"
+ * "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $"
  *
- *   IPP backend for the Common UNIX Printing System (CUPS).
+ *   IPP backend for CUPS.
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 1997-2007 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
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" 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
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
  *
  *   main()                 - Send a file to the printer or server.
  *   cancel_job()           - Cancel a print job.
- *   check_printer_state()  - Check the printer state...
+ *   check_printer_state()  - Check the printer state.
  *   compress_files()       - Compress print files...
+ *   monitor_printer()      - Monitor the printer state...
+ *   new_request()          - Create a new print creation or validation request.
  *   password_cb()          - Disable the password prompt for
  *                            cupsDoFileRequest().
+ *   report_attr()          - Report an IPP attribute value.
  *   report_printer_state() - Report the printer state.
- *   run_pictwps_filter()   - Convert PICT files to PostScript when printing
- *                            remotely.
  *   sigterm_handler()      - Handle 'terminate' signals that stop the backend.
  */
 
  * Include necessary headers.
  */
 
-#include <cups/http-private.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
+#include "backend-private.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <cups/backend.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/string.h>
-#include <signal.h>
 #include <sys/wait.h>
 
 
+/*
+ * Types...
+ */
+
+typedef struct _cups_monitor_s         /**** Monitoring data ****/
+{
+  const char           *uri,           /* Printer URI */
+                       *hostname,      /* Hostname */
+                       *user,          /* Username */
+                       *resource;      /* Resource path */
+  int                  port,           /* Port number */
+                       version,        /* IPP version */
+                       job_id;         /* Job ID for submitted job */
+  http_encryption_t    encryption;     /* Use encryption? */
+  ipp_jstate_t         job_state;      /* Current job state */
+  ipp_pstate_t         printer_state;  /* Current printer state */
+} _cups_monitor_t;
+
+
 /*
  * Globals...
  */
 
+static const char *auth_info_required = "none";
+                                       /* New auth-info-required value */
+static const char * const jattrs[] =   /* Job attributes we want */
+{
+  "job-media-sheets-completed",
+  "job-state",
+  "job-state-reasons"
+};
+static int     job_canceled = 0;       /* Job cancelled? */
 static char    *password = NULL;       /* Password for device URI */
-#ifdef __APPLE__
-static char    pstmpname[1024] = "";   /* Temporary PostScript file name */
-#endif /* __APPLE__ */
+static int     password_tries = 0;     /* Password tries */
+static const char * const pattrs[] =   /* Printer attributes we want */
+{
+  "copies-supported",
+  "cups-version",
+  "document-format-supported",
+  "marker-colors",
+  "marker-high-levels",
+  "marker-levels",
+  "marker-low-levels",
+  "marker-message",
+  "marker-names",
+  "marker-types",
+  "media-col-supported",
+  "multiple-document-handling-supported",
+  "operations-supported",
+  "printer-alert",
+  "printer-alert-description",
+  "printer-is-accepting-jobs",
+  "printer-state",
+  "printer-state-message",
+  "printer-state-reasons",
+};
 static char    tmpfilename[1024] = ""; /* Temporary spool file name */
-static int     job_cancelled = 0;      /* Job cancelled? */
 
 
 /*
  * Local functions...
  */
 
-static void    cancel_job(http_t *http, const char *uri, int id,
-                          const char *resource, const char *user, int version);
-static void    check_printer_state(http_t *http, const char *uri,
-                                   const char *resource, const char *user,
-                                   int version);
+static void            cancel_job(http_t *http, const char *uri, int id,
+                                  const char *resource, const char *user,
+                                  int version);
+static ipp_pstate_t    check_printer_state(http_t *http, const char *uri,
+                                           const char *resource,
+                                           const char *user, int version,
+                                           int job_id);
 #ifdef HAVE_LIBZ
-static void    compress_files(int num_files, char **files);
+static void            compress_files(int num_files, char **files);
 #endif /* HAVE_LIBZ */
-static const char *password_cb(const char *);
-static int     report_printer_state(ipp_t *ipp);
-
-#ifdef __APPLE__
-static int     run_pictwps_filter(char **argv, const char *filename);
-#endif /* __APPLE__ */
-static void    sigterm_handler(int sig);
+static void            *monitor_printer(_cups_monitor_t *monitor);
+static ipp_t           *new_request(ipp_op_t op, int version, const char *uri,
+                                    const char *user, const char *title,
+                                    int num_options, cups_option_t *options,
+                                    const char *compression, int copies,
+                                    const char *format, _ppd_cache_t *pc,
+                                    ipp_attribute_t *media_col_sup,
+                                    ipp_attribute_t *doc_handling_sup);
+static const char      *password_cb(const char *);
+static void            report_attr(ipp_attribute_t *attr);
+static int             report_printer_state(ipp_t *ipp, int job_id);
+static void            sigterm_handler(int sig);
 
 
 /*
@@ -101,57 +139,72 @@ main(int  argc,                           /* I - Number of command-line args */
      char *argv[])                     /* I - Command-line arguments */
 {
   int          i;                      /* Looping var */
+  int          send_options;           /* Send job options? */
   int          num_options;            /* Number of printer options */
   cups_option_t        *options;               /* Printer options */
-  char         method[255],            /* Method in URI */
+  const char   *device_uri;            /* Device URI */
+  char         scheme[255],            /* Scheme in URI */
                hostname[1024],         /* Hostname */
                username[255],          /* Username info */
                resource[1024],         /* Resource info (printer name) */
+               addrname[256],          /* Address name */
                *optptr,                /* Pointer to URI options */
-               name[255],              /* Name of option */
-               value[255],             /* Value of option */
-               *ptr;                   /* Pointer into name or value */
+               *name,                  /* Name of option */
+               *value,                 /* Value of option */
+               sep;                    /* Separator character */
+  http_addrlist_t *addrlist;           /* Address of printer */
+  int          snmp_fd,                /* SNMP socket */
+               start_count,            /* Page count via SNMP at start */
+               page_count,             /* Page count via SNMP */
+               have_supplies;          /* Printer supports supply levels? */
   int          num_files;              /* Number of files to print */
   char         **files,                /* Files to print */
-               *filename;              /* Pointer to single filename */
+               *compatfile = NULL;     /* Compatibility filename */
+  off_t                compatsize = 0;         /* Size of compatibility file */
   int          port;                   /* Port number (not used) */
+  char         portname[255];          /* Port name */
   char         uri[HTTP_MAX_URI];      /* Updated URI without user/pass */
+  http_status_t        http_status;            /* Status of HTTP request */
   ipp_status_t ipp_status;             /* Status of IPP request */
   http_t       *http;                  /* HTTP connection */
   ipp_t                *request,               /* IPP request */
                *response,              /* IPP response */
                *supported;             /* get-printer-attributes response */
-  int          compression,            /* Do compression of the job data? */
-               waitjob,                /* Wait for job complete? */
+  time_t       start_time;             /* Time of first connect */
+  int          contimeout;             /* Connection timeout */
+  int          delay,                  /* Delay for retries */
+               prev_delay;             /* Previous delay */
+  const char   *compression;           /* Compression mode */
+  int          waitjob,                /* Wait for job complete? */
                waitprinter;            /* Wait for printer ready? */
+  _cups_monitor_t monitor;             /* Monitoring data */
   ipp_attribute_t *job_id_attr;                /* job-id attribute */
   int          job_id;                 /* job-id value */
   ipp_attribute_t *job_sheets;         /* job-media-sheets-completed */
   ipp_attribute_t *job_state;          /* job-state */
   ipp_attribute_t *copies_sup;         /* copies-supported */
+  ipp_attribute_t *cups_version;       /* cups-version */
   ipp_attribute_t *format_sup;         /* document-format-supported */
+  ipp_attribute_t *media_col_sup;      /* media-col-supported */
+  ipp_attribute_t *operations_sup;     /* operations-supported */
+  ipp_attribute_t *doc_handling_sup;   /* multiple-document-handling-supported */
   ipp_attribute_t *printer_state;      /* printer-state attribute */
   ipp_attribute_t *printer_accepting;  /* printer-is-accepting-jobs */
-  int          copies;                 /* Number of copies remaining */
-  const char   *content_type;          /* CONTENT_TYPE environment variable */
+  int          validate_job;           /* Does printer support Validate-Job? */
+  int          copies,                 /* Number of copies for job */
+               copies_remaining;       /* Number of copies remaining */
+  const char   *content_type,          /* CONTENT_TYPE environment variable */
+               *final_content_type,    /* FINAL_CONTENT_TYPE environment var */
+               *document_format;       /* document-format value */
+  int          fd;                     /* File descriptor */
+  off_t                bytes;                  /* Bytes copied */
+  char         buffer[16384];          /* Copy buffer */
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;             /* Actions for POSIX signals */
 #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
   int          version;                /* IPP version */
-  int          reasons;                /* Number of printer-state-reasons */
-  static const char * const pattrs[] =
-               {                       /* Printer attributes we want */
-                 "copies-supported",
-                 "document-format-supported",
-                 "printer-is-accepting-jobs",
-                 "printer-state",
-                 "printer-state-reasons",
-               };
-  static const char * const jattrs[] =
-               {                       /* Job attributes we want */
-                 "job-media-sheets-completed",
-                 "job-state"
-               };
+  ppd_file_t   *ppd;                   /* PPD file */
+  _ppd_cache_t *pc;                    /* PPD cache and mapping data */
 
 
  /*
@@ -194,15 +247,16 @@ main(int  argc,                           /* I - Number of command-line args */
     else
       s = argv[0];
 
-    printf("network %s \"Unknown\" \"Internet Printing Protocol (%s)\"\n",
-           s, s);
+    printf("network %s \"Unknown\" \"%s (%s)\"\n",
+           s, _cupsLangString(cupsLangDefault(),
+                             _("Internet Printing Protocol")), s);
     return (CUPS_BACKEND_OK);
   }
   else if (argc < 6)
   {
-    fprintf(stderr,
-            "Usage: %s job-id user title copies options [file ... fileN]\n",
-            argv[0]);
+    _cupsLangPrintf(stderr,
+                    _("Usage: %s job-id user title copies options [file]"),
+                   argv[0]);
     return (CUPS_BACKEND_STOP);
   }
 
@@ -210,35 +264,51 @@ main(int  argc,                           /* I - Number of command-line args */
   * Get the (final) content type...
   */
 
-  if ((content_type = getenv("FINAL_CONTENT_TYPE")) == NULL)
-    if ((content_type = getenv("CONTENT_TYPE")) == NULL)
-      content_type = "application/octet-stream";
+  if ((content_type = getenv("CONTENT_TYPE")) == NULL)
+    content_type = "application/octet-stream";
+
+  if ((final_content_type = getenv("FINAL_CONTENT_TYPE")) == NULL)
+  {
+    final_content_type = content_type;
+
+    if (!strncmp(final_content_type, "printer/", 8))
+      final_content_type = "application/vnd.cups-raw";
+  }
 
  /*
   * Extract the hostname and printer name from the URI...
   */
 
-  if (httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                      method, sizeof(method), username, sizeof(username),
-                     hostname, sizeof(hostname), &port,
-                     resource, sizeof(resource)) < HTTP_URI_OK)
+  while ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
   {
-    fputs("ERROR: Missing device URI on command-line and no DEVICE_URI "
-          "environment variable!\n", stderr);
-    return (CUPS_BACKEND_STOP);
+    _cupsLangPrintFilter(stderr, "INFO", _("Unable to locate printer."));
+    sleep(10);
+
+    if (getenv("CLASS") != NULL)
+      return (CUPS_BACKEND_FAILED);
   }
 
-  if (!strcmp(method, "https"))
+  httpSeparateURI(HTTP_URI_CODING_ALL, device_uri, scheme, sizeof(scheme),
+                  username, sizeof(username), hostname, sizeof(hostname), &port,
+                 resource, sizeof(resource));
+
+  if (!port)
+    port = IPP_PORT;                   /* Default to port 631 */
+
+  if (!strcmp(scheme, "https"))
     cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
+  else
+    cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
 
  /*
   * See if there are any options...
   */
 
-  compression = 0;
-  version     = 1;
+  compression = NULL;
+  version     = 20;
   waitjob     = 1;
   waitprinter = 1;
+  contimeout  = 7 * 24 * 60 * 60;
 
   if ((optptr = strchr(resource, '?')) != NULL)
   {
@@ -259,29 +329,30 @@ main(int  argc,                           /* I - Number of command-line args */
       * Get the name...
       */
 
-      for (ptr = name; *optptr && *optptr != '=';)
-        if (ptr < (name + sizeof(name) - 1))
-          *ptr++ = *optptr++;
-      *ptr = '\0';
+      name = optptr;
+
+      while (*optptr && *optptr != '=' && *optptr != '+' && *optptr != '&')
+        optptr ++;
+
+      if ((sep = *optptr) != '\0')
+        *optptr++ = '\0';
 
-      if (*optptr == '=')
+      if (sep == '=')
       {
        /*
         * Get the value...
        */
 
-        optptr ++;
-
-       for (ptr = value; *optptr && *optptr != '+' && *optptr != '&';)
-          if (ptr < (value + sizeof(value) - 1))
-            *ptr++ = *optptr++;
-       *ptr = '\0';
+        value = optptr;
 
-       if (*optptr == '+' || *optptr == '&')
+       while (*optptr && *optptr != '+' && *optptr != '&')
          optptr ++;
+
+        if (*optptr)
+         *optptr++ = '\0';
       }
       else
-        value[0] = '\0';
+        value = (char *)"";
 
      /*
       * Process the option...
@@ -323,39 +394,56 @@ main(int  argc,                           /* I - Number of command-line args */
          cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
        else
        {
-         fprintf(stderr, "ERROR: Unknown encryption option value \"%s\"!\n",
-                 value);
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("Unknown encryption option value: \"%s\"."),
+                              value);
         }
       }
       else if (!strcasecmp(name, "version"))
       {
         if (!strcmp(value, "1.0"))
-         version = 0;
+         version = 10;
        else if (!strcmp(value, "1.1"))
-         version = 1;
+         version = 11;
+       else if (!strcmp(value, "2.0"))
+         version = 20;
+       else if (!strcmp(value, "2.1"))
+         version = 21;
+       else if (!strcmp(value, "2.2"))
+         version = 22;
        else
        {
-         fprintf(stderr, "ERROR: Unknown version option value \"%s\"!\n",
-                 value);
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("Unknown version option value: \"%s\"."),
+                              value);
        }
       }
 #ifdef HAVE_LIBZ
       else if (!strcasecmp(name, "compression"))
       {
-        compression = !strcasecmp(value, "true") ||
-                     !strcasecmp(value, "yes") ||
-                     !strcasecmp(value, "on") ||
-                     !strcasecmp(value, "gzip");
+        if (!strcasecmp(value, "true") || !strcasecmp(value, "yes") ||
+           !strcasecmp(value, "on") || !strcasecmp(value, "gzip"))
+         compression = "gzip";
       }
 #endif /* HAVE_LIBZ */
+      else if (!strcasecmp(name, "contimeout"))
+      {
+       /*
+        * Set the connection timeout...
+       */
+
+       if (atoi(value) > 0)
+         contimeout = atoi(value);
+      }
       else
       {
        /*
         * Unknown option...
        */
 
-       fprintf(stderr, "ERROR: Unknown option \"%s\" with value \"%s\"!\n",
-               name, value);
+       _cupsLangPrintFilter(stderr, "ERROR",
+                            _("Unknown option \"%s\" with value \"%s\"."),
+                            name, value);
       }
     }
   }
@@ -368,48 +456,12 @@ main(int  argc,                           /* I - Number of command-line args */
 
   if (argc == 6)
   {
-   /*
-    * Copy stdin to a temporary file...
-    */
-
-    int                fd;                     /* File descriptor */
-    cups_file_t        *fp;                    /* Temporary file */
-    char       buffer[8192];           /* Buffer for copying */
-    int                bytes;                  /* Number of bytes read */
-
-
-    if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
-    {
-      perror("ERROR: unable to create temporary file");
-      return (CUPS_BACKEND_FAILED);
-    }
-
-    if ((fp = cupsFileOpenFd(fd, compression ? "w9" : "w")) == NULL)
-    {
-      perror("ERROR: unable to open temporary file");
-      close(fd);
-      unlink(tmpfilename);
-      return (CUPS_BACKEND_FAILED);
-    }
-
-    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
-      if (cupsFileWrite(fp, buffer, bytes) < bytes)
-      {
-        perror("ERROR: unable to write to temporary file");
-       cupsFileClose(fp);
-       unlink(tmpfilename);
-       return (CUPS_BACKEND_FAILED);
-      }
-
-    cupsFileClose(fp);
-
-   /*
-    * Point to the single file from stdin...
-    */
+    num_files    = 0;
+    send_options = !strcasecmp(final_content_type, "application/pdf") ||
+                   !strcasecmp(final_content_type, "application/vnd.cups-pdf") ||
+                   !strncasecmp(final_content_type, "image/", 6);
 
-    filename  = tmpfilename;
-    files     = &filename;
-    num_files = 1;
+    fputs("DEBUG: Sending stdin for job...\n", stderr);
   }
   else
   {
@@ -417,16 +469,17 @@ main(int  argc,                           /* I - Number of command-line args */
     * Point to the files on the command-line...
     */
 
-    num_files = argc - 6;
-    files     = argv + 6;
+    num_files    = argc - 6;
+    files        = argv + 6;
+    send_options = 1;
 
 #ifdef HAVE_LIBZ
     if (compression)
       compress_files(num_files, files);
 #endif /* HAVE_LIBZ */
-  }
 
-  fprintf(stderr, "DEBUG: %d files to send in job...\n", num_files);
+    fprintf(stderr, "DEBUG: %d files to send in job...\n", num_files);
+  }
 
  /*
   * Set the authentication info, if any...
@@ -445,77 +498,87 @@ main(int  argc,                           /* I - Number of command-line args */
 
     cupsSetUser(username);
   }
-  else if (!getuid())
+  else
   {
    /*
-    * Try loading authentication information from the a##### file.
+    * Try loading authentication information from the environment.
     */
 
-    const char *request_root;          /* CUPS_REQUESTROOT env var */
-    char       afilename[1024],        /* a##### filename */
-               aline[1024];            /* Line from file */
-    FILE       *fp;                    /* File pointer */
+    const char *ptr = getenv("AUTH_USERNAME");
 
+    if (ptr)
+      cupsSetUser(ptr);
 
-    if ((request_root = getenv("CUPS_REQUESTROOT")) != NULL)
-    {
-     /*
-      * Try opening authentication cache file...
-      */
+    password = getenv("AUTH_PASSWORD");
+  }
 
-      snprintf(afilename, sizeof(afilename), "%s/a%05d", request_root,
-               atoi(argv[1]));
-      if ((fp = fopen(afilename, "r")) != NULL)
-      {
-       /*
-        * Read username...
-       */
+ /*
+  * Try finding the remote server...
+  */
 
-        if (fgets(aline, sizeof(aline), fp))
-       {
-        /*
-         * Decode username...
-         */
+  start_time = time(NULL);
 
-          i = sizeof(username);
-         httpDecode64_2(username, &i, aline);
+  sprintf(portname, "%d", port);
 
-         /*
-         * Read password...
-         */
+  fputs("STATE: +connecting-to-device\n", stderr);
+  fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
 
-         if (fgets(aline, sizeof(aline), fp))
-         {
-          /*
-           * Decode password...
-           */
+  while ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
+  {
+    _cupsLangPrintFilter(stderr, "INFO",
+                         _("Unable to locate printer \"%s\"."), hostname);
+    sleep(10);
 
-           i = sizeof(password);
-           httpDecode64_2(password, &i, aline);
-         }
-       }
+    if (getenv("CLASS") != NULL)
+    {
+      fputs("STATE: -connecting-to-device\n", stderr);
+      return (CUPS_BACKEND_STOP);
+    }
+  }
 
-       /*
-        * Close the file...
-       */
+  http = _httpCreate(hostname, port, addrlist, cupsEncryption(), AF_UNSPEC);
 
-        fclose(fp);
-      }
-    }
+ /*
+  * See if the printer supports SNMP...
+  */
+
+  if ((snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family)) >= 0)
+  {
+    have_supplies = !backendSNMPSupplies(snmp_fd, &(addrlist->addr),
+                                         &start_count, NULL);
   }
+  else
+    have_supplies = start_count = 0;
+
+ /*
+  * Wait for data from the filter...
+  */
+
+  if (num_files == 0)
+    if (!backendWaitLoop(snmp_fd, &(addrlist->addr), 0, backendNetworkSideCB))
+      return (CUPS_BACKEND_OK);
 
  /*
   * Try connecting to the remote server...
   */
 
-  fputs("STATE: +connecting-to-device\n", stderr);
+  delay = _cupsNextDelay(0, &prev_delay);
 
   do
   {
-    fprintf(stderr, "INFO: Connecting to %s on port %d...\n", hostname, port);
+    fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
+    _cupsLangPrintFilter(stderr, "INFO", _("Connecting to printer."));
 
-    if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
+    if (httpReconnect(http))
     {
+      int error = errno;               /* Connection error */
+
+      if (http->status == HTTP_PKI_ERROR)
+       fputs("STATE: +cups-certificate-error\n", stderr);
+
+      if (job_canceled)
+       break;
+
       if (getenv("CLASS") != NULL)
       {
        /*
@@ -525,13 +588,9 @@ main(int  argc,                            /* I - Number of command-line args */
        * available printer in the class.
        */
 
-        fprintf(stderr,
-               "INFO: Unable to connect to %s, queuing on next printer in "
-               "class...\n",
-               hostname);
-
-        if (argc == 6 || strcmp(filename, argv[6]))
-         unlink(filename);
+        _cupsLangPrintFilter(stderr, "INFO",
+                            _("Unable to contact printer, queuing on next "
+                              "printer in class."));
 
        /*
         * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -539,35 +598,84 @@ main(int  argc,                           /* I - Number of command-line args */
 
        sleep(5);
 
+       fputs("STATE: -connecting-to-device\n", stderr);
+
         return (CUPS_BACKEND_FAILED);
       }
 
+      fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
+
       if (errno == ECONNREFUSED || errno == EHOSTDOWN ||
           errno == EHOSTUNREACH)
       {
-       fprintf(stderr,
-               "INFO: Network host \'%s\' is busy; will retry in 30 "
-               "seconds...\n",
-                hostname);
-       sleep(30);
-      }
-      else if (h_errno)
-      {
-        fprintf(stderr, "INFO: Unable to lookup host \'%s\' - %s\n",
-               hostname, hstrerror(h_errno));
-       sleep(30);
+        if (contimeout && (time(NULL) - start_time) > contimeout)
+       {
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("The printer is not responding."));
+         fputs("STATE: -connecting-to-device\n", stderr);
+         return (CUPS_BACKEND_FAILED);
+       }
+
+       switch (error)
+       {
+         case EHOSTDOWN :
+             _cupsLangPrintFilter(stderr, "WARNING",
+                                  _("Network printer \"%s\" may not exist or "
+                                    "is unavailable at this time."),
+                                  hostname);
+             break;
+
+         case EHOSTUNREACH :
+             _cupsLangPrintFilter(stderr, "WARNING",
+                                  _("Network printer \"%s\" is unreachable at "
+                                    "this time."), hostname);
+             break;
+
+         case ECONNREFUSED :
+         default :
+             _cupsLangPrintFilter(stderr, "WARNING",
+                                  _("Network printer \"%s\" is busy."),
+                                  hostname);
+             break;
+        }
+
+       sleep(delay);
+
+        delay = _cupsNextDelay(delay, &prev_delay);
       }
       else
       {
-       perror("ERROR: Unable to connect to IPP host");
+       _cupsLangPrintFilter(stderr, "ERROR",
+                            _("Network printer \"%s\" is not responding."),
+                            hostname);
        sleep(30);
       }
+
+      if (job_canceled)
+       break;
     }
+    else
+      fputs("STATE: -cups-certificate-error\n", stderr);
   }
-  while (http == NULL);
+  while (http->fd < 0);
+
+  if (job_canceled || !http)
+    return (CUPS_BACKEND_FAILED);
 
   fputs("STATE: -connecting-to-device\n", stderr);
-  fprintf(stderr, "INFO: Connected to %s...\n", hostname);
+  _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
+
+#ifdef AF_INET6
+  if (http->hostaddr->addr.sa_family == AF_INET6)
+    fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n",
+           httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
+           ntohs(http->hostaddr->ipv6.sin6_port));
+  else
+#endif /* AF_INET6 */
+    if (http->hostaddr->addr.sa_family == AF_INET)
+      fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
+             httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
+             ntohs(http->hostaddr->ipv4.sin_port));
 
  /*
   * Build a URI for the printer and fill the standard IPP attributes for
@@ -575,26 +683,38 @@ main(int  argc,                           /* I - Number of command-line args */
   * might contain username:password information...
   */
 
-  snprintf(uri, sizeof(uri), "%s://%s:%d%s", method, hostname, port, resource);
+  httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), scheme, NULL, hostname,
+                 port, resource);
 
  /*
   * First validate the destination and see if the device supports multiple
-  * copies.  We have to do this because some IPP servers (e.g. HP JetDirect)
-  * don't support the copies attribute...
+  * copies...
   */
 
-  copies_sup = NULL;
-  format_sup = NULL;
-  supported  = NULL;
+  copies_sup       = NULL;
+  cups_version     = NULL;
+  format_sup       = NULL;
+  media_col_sup    = NULL;
+  supported        = NULL;
+  operations_sup   = NULL;
+  doc_handling_sup = NULL;
+  validate_job     = 0;
 
   do
   {
+   /*
+    * Check for side-channel requests...
+    */
+
+    backendCheckSideChannel(snmp_fd, http->hostaddr);
+
    /*
     * Build the IPP request...
     */
 
     request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-    request->request.op.version[1] = version;
+    request->request.op.version[0] = version / 10;
+    request->request.op.version[1] = version % 10;
 
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                 NULL, uri);
@@ -609,45 +729,94 @@ main(int  argc,                           /* I - Number of command-line args */
 
     fputs("DEBUG: Getting supported attributes...\n", stderr);
 
-    if ((supported = cupsDoRequest(http, request, resource)) == NULL)
-      ipp_status = cupsLastError();
-    else
-      ipp_status = supported->request.status.status_code;
+    if (http->version < HTTP_1_1)
+    {
+      fprintf(stderr, "DEBUG: Printer responded with HTTP version %d.%d.\n",
+              http->version / 100, http->version % 100);
+
+      _cupsLangPrintFilter(stderr, "ERROR",
+                           _("This printer does not conform to the IPP "
+                            "standard. Please contact the manufacturer of "
+                            "your printer for assistance."));
+    }
+
+    supported  = cupsDoRequest(http, request, resource);
+    ipp_status = cupsLastError();
 
     if (ipp_status > IPP_OK_CONFLICT)
     {
+      fprintf(stderr, "DEBUG: Get-Printer-Attributes returned %s.\n",
+              ippErrorString(ipp_status));
+
       if (ipp_status == IPP_PRINTER_BUSY ||
          ipp_status == IPP_SERVICE_UNAVAILABLE)
       {
-       fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
-        report_printer_state(supported);
-       sleep(10);
+        if (contimeout && (time(NULL) - start_time) > contimeout)
+       {
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("The printer is not responding."));
+         return (CUPS_BACKEND_FAILED);
+       }
+
+       _cupsLangPrintFilter(stderr, "WARNING",
+                            _("Network host \"%s\" is busy; will retry in %d "
+                              "seconds."), hostname, delay);
+
+        report_printer_state(supported, 0);
+
+       sleep(delay);
+
+        delay = _cupsNextDelay(delay, &prev_delay);
       }
       else if ((ipp_status == IPP_BAD_REQUEST ||
-               ipp_status == IPP_VERSION_NOT_SUPPORTED) && version == 1)
+               ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
       {
        /*
-       * Switch to IPP/1.0...
+       * Switch to IPP/1.1 or IPP/1.0...
        */
 
-       fputs("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n",
-             stderr);
-       version = 0;
+        if (version >= 20)
+       {
+         _cupsLangPrintFilter(stderr, "INFO",
+                              _("Printer does not support IPP/%d.%d, trying "
+                                "IPP/%s."), version / 10, version % 10, "1.1");
+         version = 11;
+       }
+       else
+       {
+         _cupsLangPrintFilter(stderr, "INFO",
+                              _("Printer does not support IPP/%d.%d, trying "
+                                "IPP/%s."), version / 10, version % 10, "1.0");
+         version = 10;
+        }
+
        httpReconnect(http);
       }
       else if (ipp_status == IPP_NOT_FOUND)
       {
-        fputs("ERROR: Destination printer does not exist!\n", stderr);
+        _cupsLangPrintFilter(stderr, "ERROR",
+                            _("The printer URI is incorrect or no longer "
+                              "exists."));
 
        if (supported)
           ippDelete(supported);
 
        return (CUPS_BACKEND_STOP);
       }
+      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      {
+       if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+                    "Negotiate", 9))
+         auth_info_required = "negotiate";
+
+       fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+       return (CUPS_BACKEND_AUTH_REQUIRED);
+      }
       else
       {
-       fprintf(stderr, "ERROR: Unable to get printer status (%s)!\n",
-               ippErrorString(ipp_status));
+       _cupsLangPrintFilter(stderr, "ERROR",
+                            _("Unable to get printer status: %s"),
+                            cupsLastErrorString());
         sleep(10);
       }
 
@@ -656,22 +825,31 @@ main(int  argc,                           /* I - Number of command-line args */
 
       continue;
     }
-    else if ((copies_sup = ippFindAttribute(supported, "copies-supported",
-                                           IPP_TAG_RANGE)) != NULL)
+
+   /*
+    * Check for supported attributes...
+    */
+
+    if ((copies_sup = ippFindAttribute(supported, "copies-supported",
+                                      IPP_TAG_RANGE)) != NULL)
     {
      /*
       * Has the "copies-supported" attribute - does it have an upper
       * bound > 1?
       */
 
+      fprintf(stderr, "DEBUG: copies-supported=%d-%d\n",
+             copies_sup->values[0].range.lower,
+             copies_sup->values[0].range.upper);
+
       if (copies_sup->values[0].range.upper <= 1)
        copies_sup = NULL; /* No */
     }
 
-    format_sup = ippFindAttribute(supported, "document-format-supported",
-                                 IPP_TAG_MIMETYPE);
+    cups_version = ippFindAttribute(supported, "cups-version", IPP_TAG_TEXT);
 
-    if (format_sup)
+    if ((format_sup = ippFindAttribute(supported, "document-format-supported",
+                                      IPP_TAG_MIMETYPE)) != NULL)
     {
       fprintf(stderr, "DEBUG: document-format-supported (%d values)\n",
              format_sup->num_values);
@@ -680,7 +858,49 @@ main(int  argc,                            /* I - Number of command-line args */
                format_sup->values[i].string.text);
     }
 
-    report_printer_state(supported);
+    if ((media_col_sup = ippFindAttribute(supported, "media-col-supported",
+                                         IPP_TAG_KEYWORD)) != NULL)
+    {
+      fprintf(stderr, "DEBUG: media-col-supported (%d values)\n",
+             media_col_sup->num_values);
+      for (i = 0; i < media_col_sup->num_values; i ++)
+       fprintf(stderr, "DEBUG: [%d] = \"%s\"\n", i,
+               media_col_sup->values[i].string.text);
+    }
+
+    if ((operations_sup = ippFindAttribute(supported, "operations-supported",
+                                          IPP_TAG_ENUM)) != NULL)
+    {
+      for (i = 0; i < operations_sup->num_values; i ++)
+        if (operations_sup->values[i].integer == IPP_VALIDATE_JOB)
+       {
+         validate_job = 1;
+         break;
+       }
+
+      if (!validate_job)
+      {
+        _cupsLangPrintFilter(stderr, "WARNING",
+                            _("This printer does not conform to the IPP "
+                              "standard and may not work."));
+        fputs("DEBUG: operations-supported does not list Validate-Job.\n",
+             stderr);
+      }
+    }
+    else
+    {
+      _cupsLangPrintFilter(stderr, "WARNING",
+                          _("This printer does not conform to the IPP "
+                            "standard and may not work."));
+      fputs("DEBUG: operations-supported not returned in "
+            "Get-Printer-Attributes request.\n", stderr);
+    }
+
+    doc_handling_sup = ippFindAttribute(supported,
+                                       "multiple-document-handling-supported",
+                                       IPP_TAG_KEYWORD);
+
+    report_printer_state(supported, 0);
   }
   while (ipp_status > IPP_OK_CONFLICT);
 
@@ -709,17 +929,13 @@ main(int  argc,                           /* I - Number of command-line args */
       * available printer in the class.
       */
 
-      fprintf(stderr,
-              "INFO: Unable to queue job on %s, queuing on next printer in "
-             "class...\n",
-             hostname);
+      _cupsLangPrintFilter(stderr, "INFO",
+                           _("Unable to contact printer, queuing on next "
+                            "printer in class."));
 
       ippDelete(supported);
       httpClose(http);
 
-      if (argc == 6 || strcmp(filename, argv[6]))
-       unlink(filename);
-
      /*
       * Sleep 5 seconds to keep the job from requeuing too rapidly...
       */
@@ -734,136 +950,203 @@ main(int  argc,                         /* I - Number of command-line args */
   * See if the printer supports multiple copies...
   */
 
+  copies = atoi(argv[4]);
+
   if (copies_sup || argc < 7)
-    copies = 1;
+  {
+    copies_remaining = 1;
+
+    if (argc < 7 && !send_options)
+      copies = 1;
+  }
   else
-    copies = atoi(argv[4]);
+    copies_remaining = copies;
 
  /*
-  * Then issue the print-job request...
+  * Prepare remaining printing options...
   */
 
-  reasons = 0;
-  job_id  = 0;
+  options = NULL;
+  pc      = NULL;
 
-  while (copies > 0)
+  if (send_options)
   {
-   /*
-    * Build the IPP request...
-    */
+    num_options = cupsParseOptions(argv[5], 0, &options);
 
-    if (job_cancelled)
-      break;
+    if (!cups_version && media_col_sup)
+    {
+     /*
+      * Load the PPD file and generate PWG attribute mapping information...
+      */
 
-    if (num_files > 1)
-      request = ippNewRequest(IPP_CREATE_JOB);
-    else
-      request = ippNewRequest(IPP_PRINT_JOB);
+      ppd = ppdOpenFile(getenv("PPD"));
+      pc  = _ppdCacheCreateWithPPD(ppd);
 
-    request->request.op.version[1] = version;
+      ppdClose(ppd);
+    }
+  }
+  else
+    num_options = 0;
 
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-                NULL, uri);
+  document_format = NULL;
 
-    fprintf(stderr, "DEBUG: printer-uri = \"%s\"\n", uri);
+  if (format_sup != NULL)
+  {
+    for (i = 0; i < format_sup->num_values; i ++)
+      if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
+      {
+        document_format = final_content_type;
+       break;
+      }
+
+    if (!document_format)
+    {
+      for (i = 0; i < format_sup->num_values; i ++)
+       if (!strcasecmp("application/octet-stream",
+                       format_sup->values[i].string.text))
+       {
+         document_format = "application/octet-stream";
+         break;
+       }
+    }
+  }
+
+ /*
+  * If the printer does not support HTTP/1.1 (which IPP requires), copy stdin
+  * to a temporary file so that we can do a HTTP/1.0 submission...
+  *
+  * (I hate compatibility hacks!)
+  */
+
+  if (http->version < HTTP_1_1 && num_files == 0)
+  {
+    if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
+    {
+      perror("DEBUG: Unable to create temporary file");
+      return (CUPS_BACKEND_FAILED);
+    }
 
-    if (argv[2][0])
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                   "requesting-user-name", NULL, argv[2]);
+    _cupsLangPrintFilter(stderr, "INFO", _("Copying print data."));
 
-    fprintf(stderr, "DEBUG: requesting-user-name = \"%s\"\n", argv[2]);
+    compatsize = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
+                               backendNetworkSideCB);
 
-    if (argv[3][0])
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
-                  argv[3]);
+    close(fd);
 
-    fprintf(stderr, "DEBUG: job-name = \"%s\"\n", argv[3]);
+    compatfile = tmpfilename;
+    files      = &compatfile;
+    num_files  = 1;
+  }
+  else if (http->version < HTTP_1_1 && num_files == 1)
+  {
+    struct stat        fileinfo;               /* File information */
 
-#ifdef HAVE_LIBZ
-    if (compression)
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                   "compression", NULL, "gzip");
-#endif /* HAVE_LIBZ */
+    if (!stat(files[0], &fileinfo))
+      compatsize = fileinfo.st_size;
+  }
 
  /*
-    * Handle options on the command-line...
-    */
+ /*
+  * Start monitoring the printer in the background...
+  */
 
-    options     = NULL;
-    num_options = cupsParseOptions(argv[5], 0, &options);
+  monitor.uri           = uri;
+  monitor.hostname      = hostname;
+  monitor.user          = argv[2];
+  monitor.resource      = resource;
+  monitor.port          = port;
+  monitor.version       = version;
+  monitor.job_id        = 0;
+  monitor.encryption    = cupsEncryption();
+  monitor.job_state     = IPP_JOB_PENDING;
+  monitor.printer_state = IPP_PRINTER_IDLE;
 
-#ifdef __APPLE__
-    if (content_type != NULL &&
-        !strcasecmp(content_type, "application/pictwps") && num_files == 1)
+  _cupsThreadCreate((_cups_thread_func_t)monitor_printer, &monitor);
+
+ /*
+  * Validate access to the printer...
+  */
+
+  while (!job_canceled)
+  {
+    request = new_request(IPP_VALIDATE_JOB, version, uri, argv[2], argv[3],
+                          num_options, options, compression,
+                         copies_sup ? copies : 1, document_format, pc,
+                         media_col_sup, doc_handling_sup);
+
+    ippDelete(cupsDoRequest(http, request, resource));
+
+    ipp_status = cupsLastError();
+
+    if (ipp_status > IPP_OK_CONFLICT &&
+        ipp_status != IPP_OPERATION_NOT_SUPPORTED)
     {
-      if (format_sup != NULL)
+      if (job_canceled)
+        break;
+
+      if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
+         ipp_status == IPP_PRINTER_BUSY)
       {
-       for (i = 0; i < format_sup->num_values; i ++)
-         if (!strcasecmp(content_type, format_sup->values[i].string.text))
-           break;
+        _cupsLangPrintFilter(stderr, "INFO",
+                            _("Printer busy; will retry in 10 seconds."));
+       sleep(10);
       }
-
-      if (format_sup == NULL || i >= format_sup->num_values)
+      else
       {
        /*
-       * Remote doesn't support "application/pictwps" (i.e. it's not MacOS X)
-       * so convert the document to PostScript...
+       * Update auth-info-required as needed...
        */
 
-       if (run_pictwps_filter(argv, filename))
-         return (CUPS_BACKEND_FAILED);
+        _cupsLangPrintFilter(stderr, "ERROR", "%s", cupsLastErrorString());
 
-        filename = pstmpname;
+       if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+       {
+         fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
+                 httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
 
-       /*
-       * Change the MIME type to application/postscript and change the
-       * number of copies to 1...
-       */
+         /*
+         * Normal authentication goes through the password callback, which sets
+         * auth_info_required to "username,password".  Kerberos goes directly
+         * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
+         * here and set auth_info_required as needed...
+         */
+
+         if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+                      "Negotiate", 9))
+           auth_info_required = "negotiate";
+       }
 
-       content_type = "application/postscript";
-       copies       = 1;
+       goto cleanup;
       }
     }
-#endif /* __APPLE__ */
-
-    if (content_type != NULL && format_sup != NULL)
-    {
-      for (i = 0; i < format_sup->num_values; i ++)
-        if (!strcasecmp(content_type, format_sup->values[i].string.text))
-          break;
+    else
+      break;
+  }
 
-      if (i < format_sup->num_values)
-        num_options = cupsAddOption("document-format", content_type,
-                                   num_options, &options);
-    }
+ /*
+  * Then issue the print-job request...
+  */
 
-    if (copies_sup)
-    {
-     /*
-      * Only send options if the destination printer supports the copies
-      * attribute.  This is a hack for the HP JetDirect implementation of
-      * IPP, which does not accept extension attributes and incorrectly
-      * reports a client-error-bad-request error instead of the
-      * successful-ok-unsupported-attributes status.  In short, at least
-      * some HP implementations of IPP are non-compliant.
-      */
+  job_id = 0;
 
-      cupsEncodeOptions(request, num_options, options);
-      ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies",
-                    atoi(argv[4]));
-    }
+  while (!job_canceled && copies_remaining > 0)
+  {
+   /*
+    * Check for side-channel requests...
+    */
 
-    cupsFreeOptions(num_options, options);
+    backendCheckSideChannel(snmp_fd, http->hostaddr);
 
    /*
-    * If copies aren't supported, then we are likely dealing with an HP
-    * JetDirect.  The HP IPP implementation seems to close the connection
-    * after every request (that is, it does *not* implement HTTP Keep-
-    * Alive, which is REQUIRED by HTTP/1.1...
+    * Build the IPP job creation request...
     */
 
-    if (!copies_sup)
-      httpReconnect(http);
+    if (job_canceled)
+      break;
+
+    request = new_request(num_files > 1 ? IPP_CREATE_JOB : IPP_PRINT_JOB,
+                         version, uri, argv[2], argv[3], num_options, options,
+                         compression, copies_sup ? copies : 1, document_format,
+                         pc, media_col_sup, doc_handling_sup);
 
    /*
     * Do the request...
@@ -872,7 +1155,48 @@ main(int  argc,                           /* I - Number of command-line args */
     if (num_files > 1)
       response = cupsDoRequest(http, request, resource);
     else
-      response = cupsDoFileRequest(http, request, resource, files[0]);
+    {
+      size_t   length = 0;             /* Length of request */
+
+      if (compatsize > 0)
+      {
+        fputs("DEBUG: Sending file using HTTP/1.0 Content-Length...\n", stderr);
+        length = ippLength(request) + (size_t)compatsize;
+      }
+      else
+        fputs("DEBUG: Sending file using HTTP/1.1 chunking...\n", stderr);
+
+      http_status = cupsSendRequest(http, request, resource, length);
+      if (http_status == HTTP_CONTINUE && request->state == IPP_DATA)
+      {
+        if (num_files == 1)
+         fd = open(files[0], O_RDONLY);
+       else
+         fd = 0;
+
+        while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
+       {
+         fprintf(stderr, "DEBUG: Read %d bytes...\n", (int)bytes);
+
+         if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE)
+            break;
+          else
+         {
+          /*
+           * Check for side-channel requests...
+           */
+
+           backendCheckSideChannel(snmp_fd, http->hostaddr);
+         }
+       }
+
+        if (num_files == 1)
+         close(fd);
+      }
+
+      response = cupsGetResponse(http, resource);
+      ippDelete(request);
+    }
 
     ipp_status = cupsLastError();
 
@@ -880,43 +1204,80 @@ main(int  argc,                          /* I - Number of command-line args */
     {
       job_id = 0;
 
-      if (job_cancelled)
+      if (job_canceled)
         break;
 
       if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
          ipp_status == IPP_PRINTER_BUSY)
       {
-       fputs("INFO: Printer is busy; retrying print job...\n", stderr);
+        _cupsLangPrintFilter(stderr, "INFO",
+                            _("Printer busy; will retry in 10 seconds."));
        sleep(10);
       }
       else
-        fprintf(stderr, "ERROR: Print file was not accepted (%s)!\n",
-               cupsLastErrorString());
+      {
+       /*
+       * Update auth-info-required as needed...
+       */
+
+        _cupsLangPrintFilter(stderr, "ERROR",
+                            _("Print file was not accepted: %s"),
+                            cupsLastErrorString());
+
+       if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+       {
+         fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
+                 httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
+
+         /*
+         * Normal authentication goes through the password callback, which sets
+         * auth_info_required to "username,password".  Kerberos goes directly
+         * through GSSAPI, so look for Negotiate in the WWW-Authenticate header
+         * here and set auth_info_required as needed...
+         */
+
+         if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+                      "Negotiate", 9))
+           auth_info_required = "negotiate";
+       }
+      }
     }
     else if ((job_id_attr = ippFindAttribute(response, "job-id",
                                              IPP_TAG_INTEGER)) == NULL)
     {
-      fputs("NOTICE: Print file accepted - job ID unknown.\n", stderr);
+      _cupsLangPrintFilter(stderr, "INFO",
+                          _("Print file accepted - job ID unknown."));
       job_id = 0;
     }
     else
     {
-      job_id = job_id_attr->values[0].integer;
-      fprintf(stderr, "NOTICE: Print file accepted - job ID %d.\n", job_id);
+      monitor.job_id = job_id = job_id_attr->values[0].integer;
+      _cupsLangPrintFilter(stderr, "INFO",
+                           _("Print file accepted - job ID %d."), job_id);
     }
 
     ippDelete(response);
 
-    if (job_cancelled)
+    if (job_canceled)
       break;
 
     if (job_id && num_files > 1)
     {
       for (i = 0; i < num_files; i ++)
       {
-       request = ippNewRequest(IPP_SEND_DOCUMENT);
+       /*
+       * Check for side-channel requests...
+       */
 
-       request->request.op.version[1] = version;
+       backendCheckSideChannel(snmp_fd, http->hostaddr);
+
+       /*
+        * Send the next file in the job...
+       */
+
+       request = ippNewRequest(IPP_SEND_DOCUMENT);
+       request->request.op.version[0] = version / 10;
+       request->request.op.version[1] = version % 10;
 
        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                     NULL, uri);
@@ -934,14 +1295,38 @@ main(int  argc,                          /* I - Number of command-line args */
         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
                     "document-format", NULL, content_type);
 
-        ippDelete(cupsDoFileRequest(http, request, resource, files[i]));
+       fprintf(stderr, "DEBUG: Sending file %d using chunking...\n", i + 1);
+       http_status = cupsSendRequest(http, request, resource, 0);
+       if (http_status == HTTP_CONTINUE && request->state == IPP_DATA &&
+           (fd = open(files[i], O_RDONLY)) >= 0)
+       {
+         while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
+         {
+           if (cupsWriteRequestData(http, buffer, bytes) != HTTP_CONTINUE)
+             break;
+           else
+           {
+            /*
+             * Check for side-channel requests...
+             */
+
+             backendCheckSideChannel(snmp_fd, http->hostaddr);
+           }
+         }
+
+         close(fd);
+       }
+
+       ippDelete(cupsGetResponse(http, resource));
+       ippDelete(request);
 
        if (cupsLastError() > IPP_OK_CONFLICT)
        {
          ipp_status = cupsLastError();
 
-         fprintf(stderr, "ERROR: Unable to add file %d to job: %s\n",
-                 job_id, cupsLastErrorString());
+         _cupsLangPrintFilter(stderr, "ERROR",
+                              _("Unable to add file to job: %s"),
+                              cupsLastErrorString());
          break;
        }
       }
@@ -950,13 +1335,13 @@ main(int  argc,                          /* I - Number of command-line args */
     if (ipp_status <= IPP_OK_CONFLICT && argc > 6)
     {
       fprintf(stderr, "PAGE: 1 %d\n", copies_sup ? atoi(argv[4]) : 1);
-      copies --;
+      copies_remaining --;
     }
     else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
             ipp_status == IPP_PRINTER_BUSY)
-      break;
+      continue;
     else
-      copies --;
+      copies_remaining --;
 
    /*
     * Wait for the job to complete...
@@ -965,16 +1350,23 @@ main(int  argc,                          /* I - Number of command-line args */
     if (!job_id || !waitjob)
       continue;
 
-    fputs("INFO: Waiting for job to complete...\n", stderr);
+    _cupsLangPrintFilter(stderr, "INFO", _("Waiting for job to complete."));
 
-    for (; !job_cancelled;)
+    for (delay = _cupsNextDelay(0, &prev_delay); !job_canceled;)
     {
+     /*
+      * Check for side-channel requests...
+      */
+
+      backendCheckSideChannel(snmp_fd, http->hostaddr);
+
      /*
       * Build an IPP_GET_JOB_ATTRIBUTES request...
       */
 
       request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
-      request->request.op.version[1] = version;
+      request->request.op.version[0] = version / 10;
+      request->request.op.version[1] = version % 10;
 
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                   NULL, uri);
@@ -994,9 +1386,7 @@ main(int  argc,                            /* I - Number of command-line args */
       * Do the request...
       */
 
-      if (!copies_sup)
-       httpReconnect(http);
-
+      httpReconnect(http);
       response   = cupsDoRequest(http, request, resource);
       ipp_status = cupsLastError();
 
@@ -1019,8 +1409,9 @@ main(int  argc,                           /* I - Number of command-line args */
        {
          ippDelete(response);
 
-          fprintf(stderr, "ERROR: Unable to get job %d attributes (%s)!\n",
-                 job_id, ippErrorString(ipp_status));
+          _cupsLangPrintFilter(stderr, "ERROR",
+                              _("Unable to get job attributes: %s"),
+                              cupsLastErrorString());
           break;
        }
       }
@@ -1034,10 +1425,9 @@ main(int  argc,                          /* I - Number of command-line args */
           * Stop polling if the job is finished or pending-held...
          */
 
-          if (job_state->values[0].integer > IPP_JOB_PROCESSING ||
-             job_state->values[0].integer == IPP_JOB_HELD)
+          if (job_state->values[0].integer > IPP_JOB_STOPPED)
          {
-           if ((job_sheets = ippFindAttribute(response, 
+           if ((job_sheets = ippFindAttribute(response,
                                               "job-media-sheets-completed",
                                               IPP_TAG_INTEGER)) != NULL)
              fprintf(stderr, "PAGE: total %d\n",
@@ -1047,21 +1437,30 @@ main(int  argc,                         /* I - Number of command-line args */
            break;
          }
        }
+       else
+       {
+        /*
+         * If the printer does not return a job-state attribute, it does not
+         * conform to the IPP specification - break out immediately and fail
+         * the job...
+         */
+
+          fputs("DEBUG: No job-state available from printer - stopping queue.\n",
+               stderr);
+         ipp_status = IPP_INTERNAL_ERROR;
+         break;
+       }
       }
 
       ippDelete(response);
 
      /*
-      * Check the printer state and report it if necessary...
+      * Wait before polling again...
       */
 
-      check_printer_state(http, uri, resource, argv[2], version);
+      sleep(delay);
 
-     /*
-      * Wait 10 seconds before polling again...
-      */
-
-      sleep(10);
+      delay = _cupsNextDelay(delay, &prev_delay);
     }
   }
 
@@ -1069,19 +1468,42 @@ main(int  argc,                         /* I - Number of command-line args */
   * Cancel the job as needed...
   */
 
-  if (job_cancelled && job_id)
+  if (job_canceled && job_id)
     cancel_job(http, uri, job_id, resource, argv[2], version);
 
  /*
   * Check the printer state and report it if necessary...
   */
 
-  check_printer_state(http, uri, resource, argv[2], version);
+  check_printer_state(http, uri, resource, argv[2], version, job_id);
+
+ /*
+  * Collect the final page count as needed...
+  */
+
+  if (have_supplies &&
+      !backendSNMPSupplies(snmp_fd, http->hostaddr, &page_count, NULL) &&
+      page_count > start_count)
+    fprintf(stderr, "PAGE: total %d\n", page_count - start_count);
+
+#ifdef HAVE_GSSAPI
+ /*
+  * See if we used Kerberos at all...
+  */
+
+  if (http->gssctx)
+    auth_info_required = "negotiate";
+#endif /* HAVE_GSSAPI */
 
  /*
   * Free memory...
   */
 
+  cleanup:
+
+  cupsFreeOptions(num_options, options);
+  _ppdCacheDestroy(pc);
+
   httpClose(http);
 
   ippDelete(supported);
@@ -1101,16 +1523,27 @@ main(int  argc,                         /* I - Number of command-line args */
   }
 #endif /* HAVE_LIBZ */
 
-#ifdef __APPLE__
-  if (pstmpname[0])
-    unlink(pstmpname);
-#endif /* __APPLE__ */
-
  /*
   * Return the queue status...
   */
 
-  return (ipp_status > IPP_OK_CONFLICT ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+  if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN ||
+      ipp_status == IPP_AUTHENTICATION_CANCELED ||
+      ipp_status <= IPP_OK_CONFLICT)
+    fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+
+  if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN ||
+      ipp_status == IPP_AUTHENTICATION_CANCELED)
+    return (CUPS_BACKEND_AUTH_REQUIRED);
+  else if (ipp_status == IPP_INTERNAL_ERROR)
+    return (CUPS_BACKEND_STOP);
+  else if (ipp_status > IPP_OK_CONFLICT)
+    return (CUPS_BACKEND_FAILED);
+  else
+  {
+    _cupsLangPrintFilter(stderr, "INFO", _("Ready to print."));
+    return (CUPS_BACKEND_OK);
+  }
 }
 
 
@@ -1129,10 +1562,11 @@ cancel_job(http_t     *http,            /* I - HTTP connection */
   ipp_t        *request;                       /* Cancel-Job request */
 
 
-  fputs("INFO: Cancelling print job...\n", stderr);
+  _cupsLangPrintFilter(stderr, "INFO", _("Canceling print job."));
 
   request = ippNewRequest(IPP_CANCEL_JOB);
-  request->request.op.version[1] = version;
+  request->request.op.version[0] = version / 10;
+  request->request.op.version[1] = version % 10;
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                NULL, uri);
@@ -1149,53 +1583,66 @@ cancel_job(http_t     *http,            /* I - HTTP connection */
   ippDelete(cupsDoRequest(http, request, resource));
 
   if (cupsLastError() > IPP_OK_CONFLICT)
-    fprintf(stderr, "ERROR: Unable to cancel job %d: %s\n", id,
-            cupsLastErrorString());
+    _cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel job: %s"),
+                        cupsLastErrorString());
 }
 
 
 /*
- * 'check_printer_state()' - Check the printer state...
+ * 'check_printer_state()' - Check the printer state.
  */
 
-static void
+static ipp_pstate_t                    /* O - Current printer-state */
 check_printer_state(
     http_t      *http,                 /* I - HTTP connection */
     const char  *uri,                  /* I - Printer URI */
     const char  *resource,             /* I - Resource path */
     const char  *user,                 /* I - Username, if any */
-    int         version)               /* I - IPP version */
+    int         version,               /* I - IPP version */
+    int         job_id)
 {
-  ipp_t        *request,                       /* IPP request */
-       *response;                      /* IPP response */
+  ipp_t                *request,               /* IPP request */
+               *response;              /* IPP response */
+  ipp_attribute_t *attr;               /* Attribute in response */
+  ipp_pstate_t printer_state = IPP_PRINTER_STOPPED;
+                                       /* Current printer-state */
 
 
  /*
-  * Check on the printer state...
+  * Send a Get-Printer-Attributes request and log the results...
   */
 
   request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-  request->request.op.version[1] = version;
+  request->request.op.version[0] = version / 10;
+  request->request.op.version[1] = version % 10;
 
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-               NULL, uri);
+              NULL, uri);
 
   if (user && user[0])
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                 "requesting-user-name", NULL, user);
+                "requesting-user-name", NULL, user);
 
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-               "requested-attributes", NULL, "printer-state-reasons");
-
- /*
-  * Do the request...
-  */
+  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+               "requested-attributes",
+               (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs);
 
   if ((response = cupsDoRequest(http, request, resource)) != NULL)
   {
-    report_printer_state(response);
+    report_printer_state(response, job_id);
+
+    if ((attr = ippFindAttribute(response, "printer-state",
+                                IPP_TAG_ENUM)) != NULL)
+      printer_state = (ipp_pstate_t)attr->values[0].integer;
+
     ippDelete(response);
   }
+
+ /*
+  * Return the printer-state value...
+  */
+
+  return (printer_state);
 }
 
 
@@ -1224,20 +1671,19 @@ compress_files(int  num_files,          /* I - Number of files */
   {
     if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
     {
-      perror("ERROR: Unable to create temporary compressed print file");
+      _cupsLangPrintError("ERROR", _("Unable to create compressed print file"));
       exit(CUPS_BACKEND_FAILED);
     }
 
     if ((out = cupsFileOpenFd(fd, "w9")) == NULL)
     {
-      perror("ERROR: Unable to open temporary compressed print file");
+      _cupsLangPrintError("ERROR", _("Unable to open compressed print file"));
       exit(CUPS_BACKEND_FAILED);
     }
 
     if ((in = cupsFileOpen(files[i], "r")) == NULL)
     {
-      fprintf(stderr, "ERROR: Unable to open print file \"%s\": %s\n",
-              files[i], strerror(errno));
+      _cupsLangPrintError("ERROR", _("Unable to open print file"));
       cupsFileClose(out);
       exit(CUPS_BACKEND_FAILED);
     }
@@ -1246,8 +1692,8 @@ compress_files(int  num_files,            /* I - Number of files */
     while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
       if (cupsFileWrite(out, buffer, bytes) < bytes)
       {
-        fprintf(stderr, "ERROR: Unable to write " CUPS_LLFMT " bytes to \"%s\": %s\n",
-               CUPS_LLCAST bytes, filename, strerror(errno));
+       _cupsLangPrintError("ERROR",
+                           _("Unable to generate compressed print file"));
         cupsFileClose(in);
         cupsFileClose(out);
        exit(CUPS_BACKEND_FAILED);
@@ -1272,315 +1718,605 @@ compress_files(int  num_files,                /* I - Number of files */
 
 
 /*
- * 'password_cb()' - Disable the password prompt for cupsDoFileRequest().
+ * 'monitor_printer()' - Monitor the printer state...
  */
 
-static const char *                    /* O - Password  */
-password_cb(const char *prompt)                /* I - Prompt (not used) */
+static void *                          /* O - Thread exit code */
+monitor_printer(
+    _cups_monitor_t *monitor)          /* I - Monitoring data */
 {
-  (void)prompt;
+  http_t       *http;                  /* Connection to printer */
+  ipp_t                *request,               /* IPP request */
+               *response;              /* IPP response */
+  ipp_attribute_t *attr;               /* Attribute in response */
+  int          delay,                  /* Current delay */
+               prev_delay;             /* Previous delay */
 
-  if (password)
-    return (password);
-  else
+
+ /*
+  * Make a copy of the printer connection...
+  */
+
+  http = _httpCreate(monitor->hostname, monitor->port, NULL, monitor->encryption,
+                     AF_UNSPEC);
+  cupsSetPasswordCB(password_cb);
+
+ /*
+  * Loop until the job is canceled, aborted, or completed.
+  */
+
+  delay = _cupsNextDelay(0, &prev_delay);
+
+  while (monitor->job_state < IPP_JOB_CANCELED && !job_canceled)
   {
    /*
-    * If there is no password set in the device URI, return the
-    * "authentication required" exit code...
+    * Reconnect to the printer...
     */
 
-    if (tmpfilename[0])
-      unlink(tmpfilename);
+    if (!httpReconnect(http))
+    {
+     /*
+      * Connected, so check on the printer state...
+      */
 
-#ifdef __APPLE__
-    if (pstmpname[0])
-      unlink(pstmpname);
-#endif /* __APPLE__ */
+      monitor->printer_state = check_printer_state(http, monitor->uri,
+                                                   monitor->resource,
+                                                  monitor->user,
+                                                  monitor->version,
+                                                  monitor->job_id);
 
-    exit(CUPS_BACKEND_AUTH_REQUIRED);
-  }
-}
+      if (monitor->job_id > 0)
+      {
+       /*
+        * Check the status of the job itself...
+       */
 
+       request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
+       request->request.op.version[0] = monitor->version / 10;
+       request->request.op.version[1] = monitor->version % 10;
 
-/*
- * 'report_printer_state()' - Report the printer state.
- */
+       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+                    NULL, monitor->uri);
+       ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
+                     monitor->job_id);
 
-static int                             /* O - Number of reasons shown */
-report_printer_state(ipp_t *ipp)       /* I - IPP response */
-{
-  int                  i;              /* Looping var */
-  int                  count;          /* Count of reasons shown... */
-  ipp_attribute_t      *reasons;       /* printer-state-reasons */
-  const char           *reason;        /* Current reason */
-  const char           *message;       /* Message to show */
-  char                 unknown[1024];  /* Unknown message string */
-  const char           *prefix;        /* Prefix for STATE: line */
-  char                 state[1024];    /* State string */
+       if (monitor->user && monitor->user[0])
+         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                      "requesting-user-name", NULL, monitor->user);
 
+       ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                     "requested-attributes",
+                     (int)(sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs);
 
-  if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
-                                  IPP_TAG_KEYWORD)) == NULL)
-    return (0);
+       /*
+       * Do the request...
+       */
 
-  state[0] = '\0';
-  prefix   = "STATE: ";
+       response = cupsDoRequest(http, request, monitor->resource);
 
-  for (i = 0, count = 0; i < reasons->num_values; i ++)
-  {
-    reason = reasons->values[i].string.text;
+       if ((attr = ippFindAttribute(response, "job-state",
+                                    IPP_TAG_ENUM)) != NULL)
+         monitor->job_state = (ipp_jstate_t)attr->values[0].integer;
+       else
+         monitor->job_state = IPP_JOB_COMPLETED;
 
-    strlcat(state, prefix, sizeof(state));
-    strlcat(state, reason, sizeof(state));
-
-    prefix  = ",";
-    message = NULL;
-
-    if (!strncmp(reason, "media-needed", 12))
-      message = "Media tray needs to be filled.";
-    else if (!strncmp(reason, "media-jam", 9))
-      message = "Media jam!";
-    else if (!strncmp(reason, "moving-to-paused", 16) ||
-             !strncmp(reason, "paused", 6) ||
-            !strncmp(reason, "shutdown", 8))
-      message = "Printer off-line.";
-    else if (!strncmp(reason, "toner-low", 9))
-      message = "Toner low.";
-    else if (!strncmp(reason, "toner-empty", 11))
-      message = "Out of toner!";
-    else if (!strncmp(reason, "cover-open", 10))
-      message = "Cover open.";
-    else if (!strncmp(reason, "interlock-open", 14))
-      message = "Interlock open.";
-    else if (!strncmp(reason, "door-open", 9))
-      message = "Door open.";
-    else if (!strncmp(reason, "input-tray-missing", 18))
-      message = "Media tray missing!";
-    else if (!strncmp(reason, "media-low", 9))
-      message = "Media tray almost empty.";
-    else if (!strncmp(reason, "media-empty", 11))
-      message = "Media tray empty!";
-    else if (!strncmp(reason, "output-tray-missing", 19))
-      message = "Output tray missing!";
-    else if (!strncmp(reason, "output-area-almost-full", 23))
-      message = "Output bin almost full.";
-    else if (!strncmp(reason, "output-area-full", 16))
-      message = "Output bin full!";
-    else if (!strncmp(reason, "marker-supply-low", 17))
-      message = "Ink/toner almost empty.";
-    else if (!strncmp(reason, "marker-supply-empty", 19))
-      message = "Ink/toner empty!";
-    else if (!strncmp(reason, "marker-waste-almost-full", 24))
-      message = "Ink/toner waste bin almost full.";
-    else if (!strncmp(reason, "marker-waste-full", 17))
-      message = "Ink/toner waste bin full!";
-    else if (!strncmp(reason, "fuser-over-temp", 15))
-      message = "Fuser temperature high!";
-    else if (!strncmp(reason, "fuser-under-temp", 16))
-      message = "Fuser temperature low!";
-    else if (!strncmp(reason, "opc-near-eol", 12))
-      message = "OPC almost at end-of-life.";
-    else if (!strncmp(reason, "opc-life-over", 13))
-      message = "OPC at end-of-life!";
-    else if (!strncmp(reason, "developer-low", 13))
-      message = "Developer almost empty.";
-    else if (!strncmp(reason, "developer-empty", 15))
-      message = "Developer empty!";
-    else if (strstr(reason, "error") != NULL)
-    {
-      message = unknown;
+       ippDelete(response);
+      }
 
-      snprintf(unknown, sizeof(unknown), "Unknown printer error (%s)!",
-               reason);
-    }
+     /*
+      * Disconnect from the printer - we'll reconnect on the next poll...
+      */
 
-    if (message)
-    {
-      count ++;
-      if (strstr(reasons->values[i].string.text, "error"))
-        fprintf(stderr, "ERROR: %s\n", message);
-      else if (strstr(reasons->values[i].string.text, "warning"))
-        fprintf(stderr, "WARNING: %s\n", message);
-      else
-        fprintf(stderr, "INFO: %s\n", message);
+      _httpDisconnect(http);
     }
+
+   /*
+    * Sleep for N seconds...
+    */
+
+    sleep(delay);
+
+    delay = _cupsNextDelay(delay, &prev_delay);
   }
 
-  fprintf(stderr, "%s\n", state);
+ /*
+  * Cleanup and return...
+  */
 
-  return (count);
+  httpClose(http);
+
+  return (NULL);
 }
 
 
-#ifdef __APPLE__
 /*
- * 'run_pictwps_filter()' - Convert PICT files to PostScript when printing
- *                          remotely.
- *
- * This step is required because the PICT format is not documented and
- * subject to change, so developing a filter for other OS's is infeasible.
- * Also, fonts required by the PICT file need to be embedded on the
- * client side (which has the fonts), so we run the filter to get a
- * PostScript file for printing...
+ * 'new_request()' - Create a new print creation or validation request.
  */
 
-static int                             /* O - Exit status of filter */
-run_pictwps_filter(char       **argv,  /* I - Command-line arguments */
-                   const char *filename)/* I - Filename */
+static ipp_t *                         /* O - Request data */
+new_request(
+    ipp_op_t        op,                        /* I - IPP operation code */
+    int             version,           /* I - IPP version number */
+    const char      *uri,              /* I - printer-uri value */
+    const char      *user,             /* I - requesting-user-name value */
+    const char      *title,            /* I - job-name value */
+    int             num_options,       /* I - Number of options to send */
+    cups_option_t   *options,          /* I - Options to send */
+    const char      *compression,      /* I - compression value or NULL */
+    int             copies,            /* I - copies value or 0 */
+    const char      *format,           /* I - documet-format value or NULL */
+    _ppd_cache_t    *pc,               /* I - PPD cache and mapping data */
+    ipp_attribute_t *media_col_sup,    /* I - media-col-supported values */
+    ipp_attribute_t *doc_handling_sup)  /* I - multiple-document-handling-supported values */
 {
-  struct stat  fileinfo;               /* Print file information */
-  const char   *ppdfile;               /* PPD file for destination printer */
-  int          pid;                    /* Child process ID */
-  int          fd;                     /* Temporary file descriptor */
-  int          status;                 /* Exit status of filter */
-  const char   *printer;               /* PRINTER env var */
-  static char  ppdenv[1024];           /* PPD environment variable */
+  int          i;                      /* Looping var */
+  ipp_t                *request;               /* Request data */
+  const char   *keyword;               /* PWG keyword */
+  _pwg_size_t  *size;                  /* PWG media size */
+  ipp_t                *media_col,             /* media-col value */
+               *media_size;            /* media-size value */
+  const char   *media_source,          /* media-source value */
+               *media_type,            /* media-type value */
+               *collate_str;           /* multiple-document-handling value */
 
 
  /*
-  * First get the PPD file for the printer...
+  * Create the IPP request...
   */
 
-  printer = getenv("PRINTER");
-  if (!printer)
+  request                        = ippNewRequest(op);
+  request->request.op.version[0] = version / 10;
+  request->request.op.version[1] = version % 10;
+
+  fprintf(stderr, "DEBUG: %s IPP/%d.%d\n",
+         ippOpString(request->request.op.operation_id),
+         request->request.op.version[0],
+         request->request.op.version[1]);
+
+ /*
+  * Add standard attributes...
+  */
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+              NULL, uri);
+  fprintf(stderr, "DEBUG: printer-uri=\"%s\"\n", uri);
+
+  if (user && *user)
   {
-    fputs("ERROR: PRINTER environment variable not defined!\n", stderr);
-    return (-1);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+                "requesting-user-name", NULL, user);
+    fprintf(stderr, "DEBUG: requesting-user-name=\"%s\"\n", user);
   }
 
-  if ((ppdfile = cupsGetPPD(printer)) == NULL)
+  if (title && *title)
   {
-    fprintf(stderr, "ERROR: Unable to get PPD file for printer \"%s\" - %s.\n",
-            printer, ippErrorString(cupsLastError()));
-    /*return (-1);*/
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
+                title);
+    fprintf(stderr, "DEBUG: job-name=\"%s\"\n", title);
   }
-  else
+
+  if (format)
+  {
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+                "document-format", NULL, format);
+    fprintf(stderr, "DEBUG: document-format=\"%s\"\n", format);
+  }
+
+#ifdef HAVE_LIBZ
+  if (compression)
   {
-    snprintf(ppdenv, sizeof(ppdenv), "PPD=%s", ppdfile);
-    putenv(ppdenv);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+                "compression", NULL, compression);
+    fprintf(stderr, "DEBUG: compression=\"%s\"\n", compression);
   }
+#endif /* HAVE_LIBZ */
 
  /*
-  * Then create a temporary file for printing...
+  * Handle options on the command-line...
   */
 
-  if ((fd = cupsTempFd(pstmpname, sizeof(pstmpname))) < 0)
+  if (num_options > 0)
   {
-    fprintf(stderr, "ERROR: Unable to create temporary file - %s.\n",
-            strerror(errno));
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
+    if (pc)
+    {
+     /*
+      * Send standard IPP attributes...
+      */
+
+      if ((keyword = cupsGetOption("PageSize", num_options, options)) == NULL)
+       keyword = cupsGetOption("media", num_options, options);
+
+      if ((size = _ppdCacheGetSize(pc, keyword)) != NULL)
+      {
+       /*
+        * Add a media-col value...
+       */
+
+       media_size = ippNew();
+       ippAddInteger(media_size, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                     "x-dimension", size->width);
+       ippAddInteger(media_size, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                     "y-dimension", size->length);
+
+       media_col = ippNew();
+       ippAddCollection(media_col, IPP_TAG_ZERO, "media-size", media_size);
+
+       media_source = _ppdCacheGetSource(pc, cupsGetOption("InputSlot",
+                                                           num_options,
+                                                           options));
+       media_type   = _ppdCacheGetType(pc, cupsGetOption("MediaType",
+                                                         num_options,
+                                                         options));
+
+       for (i = 0; i < media_col_sup->num_values; i ++)
+       {
+         if (!strcmp(media_col_sup->values[i].string.text,
+                     "media-left-margin"))
+           ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                         "media-left-margin", size->left);
+         else if (!strcmp(media_col_sup->values[i].string.text,
+                          "media-bottom-margin"))
+           ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                         "media-bottom-margin", size->left);
+         else if (!strcmp(media_col_sup->values[i].string.text,
+                          "media-right-margin"))
+           ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                         "media-right-margin", size->left);
+         else if (!strcmp(media_col_sup->values[i].string.text,
+                          "media-top-margin"))
+           ippAddInteger(media_col, IPP_TAG_ZERO, IPP_TAG_INTEGER,
+                         "media-top-margin", size->left);
+         else if (!strcmp(media_col_sup->values[i].string.text,
+                          "media-source") && media_source)
+           ippAddString(media_col, IPP_TAG_ZERO, IPP_TAG_KEYWORD,
+                        "media-source", NULL, media_source);
+         else if (!strcmp(media_col_sup->values[i].string.text,
+                          "media-type") && media_type)
+           ippAddString(media_col, IPP_TAG_ZERO, IPP_TAG_KEYWORD,
+                        "media-type", NULL, media_type);
+       }
+
+       ippAddCollection(request, IPP_TAG_JOB, "media-col", media_col);
+      }
+
+      if ((keyword = cupsGetOption("output-bin", num_options,
+                                  options)) == NULL)
+       keyword = _ppdCacheGetBin(pc, cupsGetOption("OutputBin", num_options,
+                                                   options));
+
+      if (keyword)
+       ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-bin",
+                    NULL, keyword);
+
+      if ((keyword = cupsGetOption("output-mode", num_options,
+                                  options)) != NULL)
+       ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-mode",
+                    NULL, keyword);
+      else if ((keyword = cupsGetOption("ColorModel", num_options,
+                                       options)) != NULL)
+      {
+       if (!strcasecmp(keyword, "Gray"))
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-mode",
+                              NULL, "monochrome");
+       else
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "output-mode",
+                          NULL, "color");
+      }
+
+      if ((keyword = cupsGetOption("print-quality", num_options,
+                                  options)) != NULL)
+       ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
+                     atoi(keyword));
+      else if ((keyword = cupsGetOption("cupsPrintQuality", num_options,
+                                       options)) != NULL)
+      {
+       if (!strcasecmp(keyword, "draft"))
+         ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
+                       IPP_QUALITY_DRAFT);
+       else if (!strcasecmp(keyword, "normal"))
+         ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
+                       IPP_QUALITY_NORMAL);
+       else if (!strcasecmp(keyword, "high"))
+         ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_ENUM, "print-quality",
+                       IPP_QUALITY_HIGH);
+      }
+
+      if ((keyword = cupsGetOption("sides", num_options, options)) != NULL)
+       ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
+                    NULL, keyword);
+      else if (pc->sides_option &&
+               (keyword = cupsGetOption(pc->sides_option, num_options,
+                                       options)) != NULL)
+      {
+       if (!strcasecmp(keyword, pc->sides_1sided))
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
+                      NULL, "one-sided");
+       else if (!strcasecmp(keyword, pc->sides_2sided_long))
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
+                      NULL, "two-sided-long-edge");
+       if (!strcasecmp(keyword, pc->sides_2sided_short))
+         ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
+                      NULL, "two-sided-short-edge");
+      }
+
+      if (doc_handling_sup &&
+         (keyword = cupsGetOption("collate", num_options, options)) != NULL)
+      {
+        if (!strcasecmp(keyword, "true"))
+         collate_str = "separate-documents-collated-copies";
+       else
+         collate_str = "separate-documents-uncollated-copies";
+       
+        for (i = 0; i < doc_handling_sup->num_values; i ++)
+         if (!strcmp(doc_handling_sup->values[i].string.text, collate_str))
+         {
+           ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD,
+                        "multiple-document-handling", NULL, collate_str);
+           break;
+          }
+      }
+    }
+    else
+    {
+     /*
+      * When talking to another CUPS server, send all options...
+      */
+
+      cupsEncodeOptions(request, num_options, options);
+    }
+
+    if (copies > 1)
+      ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", copies);
   }
 
+  return (request);
+}
+
+
+/*
+ * 'password_cb()' - Disable the password prompt for cupsDoFileRequest().
+ */
+
+static const char *                    /* O - Password  */
+password_cb(const char *prompt)                /* I - Prompt (not used) */
+{
+  (void)prompt;
+
  /*
-  * Get the owner of the spool file - it is owned by the user we want to run
-  * as...
+  * Remember that we need to authenticate...
   */
 
-  if (argv[6])
-    stat(argv[6], &fileinfo);
+  auth_info_required = "username,password";
+
+  if (password && *password && password_tries < 3)
+  {
+    password_tries ++;
+
+    return (password);
+  }
   else
   {
    /*
-    * Use the OSX defaults, as an up-stream filter created the PICT
-    * file...
+    * Give up after 3 tries or if we don't have a password to begin with...
     */
 
-    fileinfo.st_uid = 1;
-    fileinfo.st_gid = 80;
+    return (NULL);
   }
+}
 
-  if (ppdfile)
-    chown(ppdfile, fileinfo.st_uid, fileinfo.st_gid);
 
-  fchown(fd, fileinfo.st_uid, fileinfo.st_gid);
+/*
+ * 'report_attr()' - Report an IPP attribute value.
+ */
+
+static void
+report_attr(ipp_attribute_t *attr)     /* I - Attribute */
+{
+  int  i;                              /* Looping var */
+  char value[1024],                    /* Value string */
+       *valptr,                        /* Pointer into value string */
+       *attrptr;                       /* Pointer into attribute value */
+
 
  /*
-  * Finally, run the filter to convert the file...
+  * Convert the attribute values into quoted strings...
   */
 
-  if ((pid = fork()) == 0)
+  for (i = 0, valptr = value;
+       i < attr->num_values && valptr < (value + sizeof(value) - 10);
+       i ++)
   {
-   /*
-    * Child process for pictwpstops...  Redirect output of pictwpstops to a
-    * file...
-    */
+    if (i > 0)
+      *valptr++ = ',';
 
-    close(1);
-    dup(fd);
-    close(fd);
-
-    if (!getuid())
+    switch (attr->value_tag)
     {
-     /*
-      * Change to an unpriviledged user...
-      */
+      case IPP_TAG_INTEGER :
+      case IPP_TAG_ENUM :
+          snprintf(valptr, sizeof(value) - (valptr - value), "%d",
+                  attr->values[i].integer);
+         valptr += strlen(valptr);
+         break;
 
-      setgid(fileinfo.st_gid);
-      setuid(fileinfo.st_uid);
-    }
+      case IPP_TAG_TEXT :
+      case IPP_TAG_NAME :
+      case IPP_TAG_KEYWORD :
+          *valptr++ = '\"';
+         for (attrptr = attr->values[i].string.text;
+              *attrptr && valptr < (value + sizeof(value) - 10);
+              attrptr ++)
+         {
+           if (*attrptr == '\\' || *attrptr == '\"')
+             *valptr++ = '\\';
+
+           *valptr++ = *attrptr;
+         }
+          *valptr++ = '\"';
+          break;
+
+      default :
+         /*
+         * Unsupported value type...
+         */
 
-    execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
-           filename, NULL);
-    perror("ERROR: Unable to exec pictwpstops");
-    return (errno);
+          return;
+    }
   }
 
-  close(fd);
+  *valptr = '\0';
+
+ /*
+  * Tell the scheduler about the new values...
+  */
+
+  fprintf(stderr, "ATTR: %s=%s\n", attr->name, value);
+}
+
+
+/*
+ * 'report_printer_state()' - Report the printer state.
+ */
+
+static int                             /* O - Number of reasons shown */
+report_printer_state(ipp_t *ipp,       /* I - IPP response */
+                     int   job_id)     /* I - Current job ID */
+{
+  int                  i;              /* Looping var */
+  int                  count;          /* Count of reasons shown... */
+  ipp_attribute_t      *pa,            /* printer-alert */
+                       *pam,           /* printer-alert-message */
+                       *psm,           /* printer-state-message */
+                       *reasons,       /* printer-state-reasons */
+                       *marker;        /* marker-* attributes */
+  const char           *reason;        /* Current reason */
+  const char           *prefix;        /* Prefix for STATE: line */
+  char                 value[1024],    /* State/message string */
+                       *valptr;        /* Pointer into string */
+  static int           ipp_supplies = -1;
+                                       /* Report supply levels? */
+
 
-  if (pid < 0)
+ /*
+  * Report alerts and messages...
+  */
+
+  if ((pa = ippFindAttribute(ipp, "printer-alert", IPP_TAG_TEXT)) != NULL)
+    report_attr(pa);
+
+  if ((pam = ippFindAttribute(ipp, "printer-alert-message",
+                              IPP_TAG_TEXT)) != NULL)
+    report_attr(pam);
+
+  if ((psm = ippFindAttribute(ipp, "printer-state-message",
+                              IPP_TAG_TEXT)) != NULL)
   {
-   /*
-    * Error!
-    */
+    char       *ptr;                   /* Pointer into message */
+
 
-    perror("ERROR: Unable to fork pictwpstops");
-    unlink(filename);
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
+    strlcpy(value, "INFO: ", sizeof(value));
+    for (ptr = psm->values[0].string.text, valptr = value + 6;
+         *ptr && valptr < (value + sizeof(value) - 6);
+        ptr ++)
+    {
+      if (*ptr < ' ' && *ptr > 0 && *ptr != '\t')
+      {
+       /*
+        * Substitute "<XX>" for the control character; sprintf is safe because
+       * we always leave 6 chars free at the end...
+       */
+
+        sprintf(valptr, "<%02X>", *ptr);
+       valptr += 4;
+      }
+      else
+        *valptr++ = *ptr;
+    }
+
+    *valptr++ = '\n';
+    *valptr   = '\0';
+
+    fputs(value, stderr);
   }
 
  /*
-  * Now wait for the filter to complete...
+  * Now report printer-state-reasons, filtering out some of the reasons we never
+  * want to set...
   */
 
-  if (wait(&status) < 0)
+  if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
+                                  IPP_TAG_KEYWORD)) == NULL)
+    return (0);
+
+  value[0] = '\0';
+  prefix   = "STATE: ";
+
+  for (i = 0, count = 0, valptr = value; i < reasons->num_values; i ++)
   {
-    perror("ERROR: Unable to wait for pictwpstops");
-    close(fd);
-    unlink(filename);
-    if (ppdfile)
-      unlink(ppdfile);
-    return (-1);
+    reason = reasons->values[i].string.text;
+
+    if (strcmp(reason, "paused") &&
+       strcmp(reason, "com.apple.print.recoverable-warning"))
+    {
+      strlcpy(valptr, prefix, sizeof(value) - (valptr - value) - 1);
+      valptr += strlen(valptr);
+      strlcpy(valptr, reason, sizeof(value) - (valptr - value) - 1);
+      valptr += strlen(valptr);
+
+      prefix  = ",";
+    }
   }
 
-  if (ppdfile)
-    unlink(ppdfile);
+  if (value[0])
+  {
+    *valptr++ = '\n';
+    *valptr   = '\0';
+    fputs(value, stderr);
+  }
 
-  close(fd);
+ /*
+  * Relay the current marker-* attribute values...
+  */
 
-  if (status)
+  if (ipp_supplies < 0)
   {
-    if (status >= 256)
-      fprintf(stderr, "ERROR: pictwpstops exited with status %d!\n",
-              status / 256);
+    ppd_file_t *ppd;                   /* PPD file */
+    ppd_attr_t *ppdattr;               /* Attribute in PPD file */
+
+    if ((ppd = ppdOpenFile(getenv("PPD"))) != NULL &&
+        (ppdattr = ppdFindAttr(ppd, "cupsIPPSupplies", NULL)) != NULL &&
+        ppdattr->value && strcasecmp(ppdattr->value, "true"))
+      ipp_supplies = 0;
     else
-      fprintf(stderr, "ERROR: pictwpstops exited on signal %d!\n",
-              status);
+      ipp_supplies = 1;
 
-    unlink(filename);
-    return (status);
+    ppdClose(ppd);
   }
 
- /*
-  * Return with no errors..
-  */
+  if (ipp_supplies > 0)
+  {
+    if ((marker = ippFindAttribute(ipp, "marker-colors", IPP_TAG_NAME)) != NULL)
+      report_attr(marker);
+    if ((marker = ippFindAttribute(ipp, "marker-high-levels",
+                                   IPP_TAG_INTEGER)) != NULL)
+      report_attr(marker);
+    if ((marker = ippFindAttribute(ipp, "marker-levels",
+                                   IPP_TAG_INTEGER)) != NULL)
+      report_attr(marker);
+    if ((marker = ippFindAttribute(ipp, "marker-low-levels",
+                                   IPP_TAG_INTEGER)) != NULL)
+      report_attr(marker);
+    if ((marker = ippFindAttribute(ipp, "marker-message",
+                                   IPP_TAG_TEXT)) != NULL)
+      report_attr(marker);
+    if ((marker = ippFindAttribute(ipp, "marker-names", IPP_TAG_NAME)) != NULL)
+      report_attr(marker);
+    if ((marker = ippFindAttribute(ipp, "marker-types",
+                                   IPP_TAG_KEYWORD)) != NULL)
+      report_attr(marker);
+  }
 
-  return (0);
+  return (count);
 }
-#endif /* __APPLE__ */
 
 
 /*
@@ -1592,13 +2328,13 @@ sigterm_handler(int sig)                /* I - Signal */
 {
   (void)sig;   /* remove compiler warnings... */
 
-  if (!job_cancelled)
+  if (!job_canceled)
   {
    /*
     * Flag that the job should be cancelled...
     */
 
-    job_cancelled = 1;
+    job_canceled = 1;
     return;
   }
 
@@ -1610,15 +2346,10 @@ sigterm_handler(int sig)                /* I - Signal */
   if (tmpfilename[0])
     unlink(tmpfilename);
 
-#ifdef __APPLE__
-  if (pstmpname[0])
-    unlink(pstmpname);
-#endif /* __APPLE__ */
-
   exit(1);
 }
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $".
  */