/*
* "$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 2007-2008 by Apple Inc.
+ * 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
*
* 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 "backend-private.h"
#include <sys/types.h>
#include <sys/stat.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 */
static int password_tries = 0; /* Password tries */
-#ifdef __APPLE__
-static char pstmpname[1024] = ""; /* Temporary PostScript file name */
-#endif /* __APPLE__ */
+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, int job_id);
+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 void report_attr(ipp_attribute_t *attr);
-static int report_printer_state(ipp_t *ipp, int job_id);
-
-#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);
/*
int num_options; /* Number of printer options */
cups_option_t *options; /* Printer options */
const char *device_uri; /* Device URI */
- char method[255], /* Method in URI */
+ char scheme[255], /* Scheme in URI */
hostname[1024], /* Hostname */
username[255], /* Username info */
resource[1024], /* Resource info (printer name) */
*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 */
+ 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 */
time_t start_time; /* Time of first connect */
- int recoverable; /* Recoverable error shown? */
int contimeout; /* Connection timeout */
- int delay; /* Delay for retries... */
- int compression, /* Do compression of the job data? */
- waitjob, /* Wait for job complete? */
+ 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 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 */
+ *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 */
- static const char * const pattrs[] =
- { /* Printer attributes we want */
- "com.apple.print.recoverable-message",
- "copies-supported",
- "document-format-supported",
- "marker-colors",
- "marker-levels",
- "marker-message",
- "marker-names",
- "marker-types",
- "printer-is-accepting-jobs",
- "printer-state",
- "printer-state-message",
- "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 */
/*
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)
{
_cupsLangPrintf(stderr,
- _("Usage: %s job-id user title copies options [file]\n"),
+ _("Usage: %s job-id user title copies options [file]"),
argv[0]);
return (CUPS_BACKEND_STOP);
}
* Extract the hostname and printer name from the URI...
*/
- if ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
- return (CUPS_BACKEND_FAILED);
-
- if (httpSeparateURI(HTTP_URI_CODING_ALL, device_uri,
- method, sizeof(method), username, sizeof(username),
- hostname, sizeof(hostname), &port,
- resource, sizeof(resource)) < HTTP_URI_OK)
+ while ((device_uri = cupsBackendDeviceURI(argv)) == NULL)
{
- _cupsLangPuts(stderr,
- _("ERROR: Missing device URI on command-line and no "
- "DEVICE_URI environment variable!\n"));
- return (CUPS_BACKEND_STOP);
+ _cupsLangPrintFilter(stderr, "INFO", _("Unable to locate printer."));
+ sleep(10);
+
+ if (getenv("CLASS") != NULL)
+ return (CUPS_BACKEND_FAILED);
}
+ 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(method, "https"))
+ 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;
cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
else
{
- _cupsLangPrintf(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
{
- _cupsLangPrintf(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"))
* Unknown option...
*/
- _cupsLangPrintf(stderr,
- _("ERROR: Unknown option \"%s\" with value \"%s\"!\n"),
- name, value);
+ _cupsLangPrintFilter(stderr, "ERROR",
+ _("Unknown option \"%s\" with value \"%s\"."),
+ name, value);
}
}
}
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 */
- off_t tbytes; /* Total bytes copied */
-
-
- if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
- {
- _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
- return (CUPS_BACKEND_FAILED);
- }
-
- if ((fp = cupsFileOpenFd(fd, compression ? "w9" : "w")) == NULL)
- {
- _cupsLangPrintError(_("ERROR: Unable to open temporary file"));
- close(fd);
- unlink(tmpfilename);
- return (CUPS_BACKEND_FAILED);
- }
-
- tbytes = 0;
-
- while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
- if (cupsFileWrite(fp, buffer, bytes) < bytes)
- {
- _cupsLangPrintError(_("ERROR: Unable to write to temporary file"));
- cupsFileClose(fp);
- unlink(tmpfilename);
- return (CUPS_BACKEND_FAILED);
- }
- else
- tbytes += bytes;
-
- cupsFileClose(fp);
-
- /*
- * Don't try printing files less than 2 bytes...
- */
-
- if (tbytes <= 1)
- {
- _cupsLangPuts(stderr, _("ERROR: Empty print file!\n"));
- unlink(tmpfilename);
- return (CUPS_BACKEND_FAILED);
- }
-
- /*
- * 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;
- num_files = 1;
- files = &filename;
- send_options = 0;
+ fputs("DEBUG: Sending stdin for job...\n", stderr);
}
else
{
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...
cupsSetUser(username);
}
- else if (!getuid())
+ else
{
/*
* Try loading authentication information from the environment.
}
/*
- * Try connecting to the remote server...
+ * Try finding the remote server...
*/
- delay = 5;
- recoverable = 0;
- start_time = time(NULL);
+ start_time = time(NULL);
+
+ sprintf(portname, "%d", port);
fputs("STATE: +connecting-to-device\n", stderr);
+ fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+
+ while ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
+ {
+ _cupsLangPrintFilter(stderr, "INFO",
+ _("Unable to locate printer \"%s\"."), hostname);
+ sleep(10);
+
+ if (getenv("CLASS") != NULL)
+ {
+ fputs("STATE: -connecting-to-device\n", stderr);
+ return (CUPS_BACKEND_STOP);
+ }
+ }
+
+ http = _httpCreate(hostname, port, addrlist, cupsEncryption(), AF_UNSPEC);
+
+ /*
+ * 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...
+ */
+
+ delay = _cupsNextDelay(0, &prev_delay);
do
{
- _cupsLangPrintf(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))
{
- if (job_cancelled)
+ 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)
* available printer in the class.
*/
- _cupsLangPuts(stderr,
- _("INFO: Unable to contact printer, queuing on next "
- "printer in class...\n"));
-
- if (tmpfilename[0])
- unlink(tmpfilename);
+ _cupsLangPrintFilter(stderr, "INFO",
+ _("Unable to contact printer, queuing on next "
+ "printer in class."));
/*
* Sleep 5 seconds to keep the job from requeuing too rapidly...
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)
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+ _cupsLangPrintFilter(stderr, "ERROR",
+ _("The printer is not responding."));
+ fputs("STATE: -connecting-to-device\n", stderr);
return (CUPS_BACKEND_FAILED);
}
- recoverable = 1;
-
- _cupsLangPrintf(stderr,
- _("WARNING: recoverable: Network host \'%s\' is busy; "
- "will retry in %d seconds...\n"),
- hostname, delay);
+ 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);
- if (delay < 30)
- delay += 5;
- }
- else if (h_errno)
- {
- _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
- hostname);
- return (CUPS_BACKEND_STOP);
+ delay = _cupsNextDelay(delay, &prev_delay);
}
else
{
- recoverable = 1;
-
- fprintf(stderr, "DEBUG: Connection error: %s\n", strerror(errno));
- _cupsLangPuts(stderr,
- _("ERROR: recoverable: Unable to connect to printer; will "
- "retry in 30 seconds...\n"));
+ _cupsLangPrintFilter(stderr, "ERROR",
+ _("Network printer \"%s\" is not responding."),
+ hostname);
sleep(30);
}
- if (job_cancelled)
+ if (job_canceled)
break;
}
+ else
+ fputs("STATE: -cups-certificate-error\n", stderr);
}
- while (http == NULL);
-
- if (job_cancelled)
- {
- if (tmpfilename[0])
- unlink(tmpfilename);
+ while (http->fd < 0);
+ if (job_canceled || !http)
return (CUPS_BACKEND_FAILED);
- }
fputs("STATE: -connecting-to-device\n", stderr);
- _cupsLangPrintf(stderr, _("INFO: Connected to %s...\n"), hostname);
+ _cupsLangPrintFilter(stderr, "INFO", _("Connected to printer."));
#ifdef AF_INET6
if (http->hostaddr->addr.sa_family == AF_INET6)
httpAddrString(http->hostaddr, addrname, sizeof(addrname)),
ntohs(http->hostaddr->ipv4.sin_port));
- /*
- * See if the printer supports SNMP...
- */
-
- if ((snmp_fd = _cupsSNMPOpen(http->hostaddr->addr.sa_family)) >= 0)
- {
- if (backendSNMPSupplies(snmp_fd, http->hostaddr, &start_count, NULL))
- {
- /*
- * No, close it...
- */
-
- _cupsSNMPClose(snmp_fd);
- snmp_fd = -1;
- }
- }
- else
- start_count = 0;
-
/*
* Build a URI for the printer and fill the standard IPP attributes for
* an IPP_PRINT_FILE request. We can't use the URI in argv[0] because it
* 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
{
*/
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);
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)
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+ _cupsLangPrintFilter(stderr, "ERROR",
+ _("The printer is not responding."));
return (CUPS_BACKEND_FAILED);
}
- recoverable = 1;
-
- _cupsLangPrintf(stderr,
- _("WARNING: recoverable: Network host \'%s\' is busy; "
- "will retry in %d seconds...\n"),
- hostname, delay);
+ _cupsLangPrintFilter(stderr, "WARNING",
+ _("Network host \"%s\" is busy; will retry in %d "
+ "seconds."), hostname, delay);
report_printer_state(supported, 0);
sleep(delay);
- if (delay < 30)
- delay += 5;
+ 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...
*/
- _cupsLangPuts(stderr,
- _("INFO: Printer does not support IPP/1.1, trying "
- "IPP/1.0...\n"));
- 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)
{
- _cupsLangPuts(stderr, _("ERROR: Destination printer does not exist!\n"));
+ _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
{
- _cupsLangPrintf(stderr,
- _("ERROR: Unable to get printer status (%s)!\n"),
- cupsLastErrorString());
+ _cupsLangPrintFilter(stderr, "ERROR",
+ _("Unable to get printer status: %s"),
+ cupsLastErrorString());
sleep(10);
}
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);
format_sup->values[i].string.text);
}
+ 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);
* available printer in the class.
*/
- _cupsLangPuts(stderr,
- _("INFO: Unable to contact printer, queuing on next "
- "printer in class...\n"));
+ _cupsLangPrintFilter(stderr, "INFO",
+ _("Unable to contact printer, queuing on next "
+ "printer in class."));
ippDelete(supported);
httpClose(http);
- if (tmpfilename[0])
- unlink(tmpfilename);
-
/*
* Sleep 5 seconds to keep the job from requeuing too rapidly...
*/
}
}
- if (recoverable)
- {
- /*
- * If we've shown a recoverable error make sure the printer proxies
- * have a chance to see the recovered message. Not pretty but
- * necessary for now...
- */
-
- fputs("INFO: recovered: \n", stderr);
- sleep(5);
- }
-
/*
* See if the printer supports multiple copies...
*/
{
copies_remaining = 1;
- if (argc < 7)
+ if (argc < 7 && !send_options)
copies = 1;
}
else
copies_remaining = copies;
/*
- * Then issue the print-job request...
+ * Prepare remaining printing options...
*/
- job_id = 0;
+ options = NULL;
+ pc = NULL;
- while (copies_remaining > 0)
+ if (send_options)
{
- /*
- * Check for side-channel requests...
- */
+ num_options = cupsParseOptions(argv[5], 0, &options);
- backendCheckSideChannel(snmp_fd, http->hostaddr);
+ if (!cups_version && media_col_sup)
+ {
+ /*
+ * Load the PPD file and generate PWG attribute mapping information...
+ */
- /*
- * Build the IPP request...
- */
+ ppd = ppdOpenFile(getenv("PPD"));
+ pc = _ppdCacheCreateWithPPD(ppd);
- if (job_cancelled)
- break;
+ ppdClose(ppd);
+ }
+ }
+ else
+ num_options = 0;
- if (num_files > 1)
- request = ippNewRequest(IPP_CREATE_JOB);
- else
- request = ippNewRequest(IPP_PRINT_JOB);
+ document_format = NULL;
- request->request.op.version[1] = version;
+ 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;
+ }
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
- NULL, uri);
+ 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!)
+ */
- fprintf(stderr, "DEBUG: printer-uri = \"%s\"\n", uri);
+ 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);
- /*
- * Only add a "job-name" attribute if the remote server supports
- * copy generation - some IPP implementations like HP's don't seem
- * to like UTF-8 job names (STR #1837)...
- */
+ close(fd);
- if (argv[3][0] && copies_sup)
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
- argv[3]);
+ compatfile = tmpfilename;
+ files = &compatfile;
+ num_files = 1;
+ }
+ else if (http->version < HTTP_1_1 && num_files == 1)
+ {
+ struct stat fileinfo; /* File information */
- fprintf(stderr, "DEBUG: job-name = \"%s\"\n", argv[3]);
+ if (!stat(files[0], &fileinfo))
+ compatsize = fileinfo.st_size;
+ }
-#ifdef HAVE_LIBZ
- if (compression)
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
- "compression", NULL, "gzip");
-#endif /* HAVE_LIBZ */
+ /*
+ * Start monitoring the printer in the background...
+ */
- /*
- * Handle options on the command-line...
- */
+ 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;
- options = NULL;
- num_options = cupsParseOptions(argv[5], 0, &options);
+ _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();
-#ifdef __APPLE__
- if (!strcasecmp(final_content_type, "application/pictwps") &&
- num_files == 1)
+ 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(final_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, files[0]))
- {
- if (pstmpname[0])
- unlink(pstmpname);
-
- if (tmpfilename[0])
- unlink(tmpfilename);
+ _cupsLangPrintFilter(stderr, "ERROR", "%s", cupsLastErrorString());
- return (CUPS_BACKEND_FAILED);
- }
+ if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+ {
+ fprintf(stderr, "DEBUG: WWW-Authenticate=\"%s\"\n",
+ httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE));
- files[0] = pstmpname;
+ /*
+ * 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...
+ */
- /*
- * Change the MIME type to application/postscript and change the
- * number of copies to 1...
- */
+ if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+ "Negotiate", 9))
+ auth_info_required = "negotiate";
+ }
- final_content_type = "application/postscript";
- copies = 1;
- copies_remaining = 1;
- send_options = 0;
+ goto cleanup;
}
}
-#endif /* __APPLE__ */
-
- if (format_sup != NULL)
- {
- for (i = 0; i < format_sup->num_values; i ++)
- if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
- break;
-
- if (i < format_sup->num_values)
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
- "document-format", NULL, final_content_type);
- }
+ else
+ break;
+ }
- if (copies_sup && version > 0 && send_options)
- {
- /*
- * Only send options if the destination printer supports the copies
- * attribute and IPP/1.1. This is a hack for the HP and Lexmark
- * implementations of IPP, which do not accept extension attributes
- * and incorrectly report a client-error-bad-request error instead of
- * the successful-ok-unsupported-attributes status. In short, at least
- * some HP and Lexmark implementations of IPP are non-compliant.
- */
+ /*
+ * Then issue the print-job request...
+ */
- cupsEncodeOptions(request, num_options, options);
+ job_id = 0;
- ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies",
- copies);
- }
+ 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...
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();
{
job_id = 0;
- if (job_cancelled)
+ if (job_canceled)
break;
if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
ipp_status == IPP_PRINTER_BUSY)
{
- _cupsLangPuts(stderr,
- _("INFO: Printer busy; will retry in 10 seconds...\n"));
+ _cupsLangPrintFilter(stderr, "INFO",
+ _("Printer busy; will retry in 10 seconds."));
sleep(10);
}
- else if ((ipp_status == IPP_BAD_REQUEST ||
- ipp_status == IPP_VERSION_NOT_SUPPORTED) && version == 1)
+ else
{
/*
- * Switch to IPP/1.0...
+ * Update auth-info-required as needed...
*/
- _cupsLangPuts(stderr,
- _("INFO: Printer does not support IPP/1.1, trying "
- "IPP/1.0...\n"));
- version = 0;
- httpReconnect(http);
+ _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
- _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)!\n"),
- cupsLastErrorString());
}
else if ((job_id_attr = ippFindAttribute(response, "job-id",
IPP_TAG_INTEGER)) == NULL)
{
- _cupsLangPuts(stderr,
- _("NOTICE: Print file accepted - job ID unknown.\n"));
+ _cupsLangPrintFilter(stderr, "INFO",
+ _("Print file accepted - job ID unknown."));
job_id = 0;
}
else
{
- job_id = job_id_attr->values[0].integer;
- _cupsLangPrintf(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)
*/
request = ippNewRequest(IPP_SEND_DOCUMENT);
-
- 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);
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();
- _cupsLangPrintf(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;
}
}
if (!job_id || !waitjob)
continue;
- _cupsLangPuts(stderr, _("INFO: Waiting for job to complete...\n"));
+ _cupsLangPrintFilter(stderr, "INFO", _("Waiting for job to complete."));
- for (delay = 1; !job_cancelled;)
+ for (delay = _cupsNextDelay(0, &prev_delay); !job_canceled;)
{
/*
* Check for side-channel requests...
*/
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);
* Do the request...
*/
- if (!copies_sup)
- httpReconnect(http);
-
+ httpReconnect(http);
response = cupsDoRequest(http, request, resource);
ipp_status = cupsLastError();
{
ippDelete(response);
- _cupsLangPrintf(stderr,
- _("ERROR: Unable to get job %d attributes (%s)!\n"),
- job_id, cupsLastErrorString());
+ _cupsLangPrintFilter(stderr, "ERROR",
+ _("Unable to get job attributes: %s"),
+ cupsLastErrorString());
break;
}
}
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",
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...
- */
-
- check_printer_state(http, uri, resource, argv[2], version, job_id);
-
- /*
- * Wait 1-10 seconds before polling again...
+ * Wait before polling again...
*/
sleep(delay);
- delay ++;
- if (delay > 10)
- delay = 1;
+ delay = _cupsNextDelay(delay, &prev_delay);
}
}
* 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);
/*
* Collect the final page count as needed...
*/
- if (snmp_fd >= 0 &&
+ 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);
}
#endif /* HAVE_LIBZ */
-#ifdef __APPLE__
- if (pstmpname[0])
- unlink(pstmpname);
-#endif /* __APPLE__ */
-
/*
* Return the queue status...
*/
- if (ipp_status == IPP_NOT_AUTHORIZED)
- {
- /*
- * Authorization failures here mean that we need Kerberos. Username +
- * password authentication is handled in the password_cb function.
- */
+ 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);
- fputs("ATTR: auth-info-required=negotiate\n", stderr);
+ 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);
+ }
}
ipp_t *request; /* Cancel-Job request */
- _cupsLangPuts(stderr, _("INFO: Canceling print job...\n"));
+ _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);
ippDelete(cupsDoRequest(http, request, resource));
if (cupsLastError() > IPP_OK_CONFLICT)
- _cupsLangPrintf(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 job_id) /* I - Current job ID */
+ int job_id)
{
- ipp_t *request, /* IPP request */
- *response; /* IPP response */
- static const char * const attrs[] = /* Attributes we want */
- {
- "com.apple.print.recoverable-message",
- "marker-colors",
- "marker-levels",
- "marker-message",
- "marker-names",
- "marker-types",
- "printer-state-message",
- "printer-state-reasons"
- };
+ 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);
ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
- "requested-attributes",
- (int)(sizeof(attrs) / sizeof(attrs[0])), NULL, attrs);
-
- /*
- * Do the request...
- */
+ "requested-attributes",
+ (int)(sizeof(pattrs) / sizeof(pattrs[0])), NULL, pattrs);
if ((response = cupsDoRequest(http, request, resource)) != NULL)
{
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);
}
{
if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
{
- _cupsLangPrintf(stderr,
- _("ERROR: Unable to create temporary compressed print "
- "file: %s\n"), strerror(errno));
+ _cupsLangPrintError("ERROR", _("Unable to create compressed print file"));
exit(CUPS_BACKEND_FAILED);
}
if ((out = cupsFileOpenFd(fd, "w9")) == NULL)
{
- _cupsLangPrintf(stderr,
- _("ERROR: Unable to open temporary compressed print "
- "file: %s\n"), strerror(errno));
+ _cupsLangPrintError("ERROR", _("Unable to open compressed print file"));
exit(CUPS_BACKEND_FAILED);
}
if ((in = cupsFileOpen(files[i], "r")) == NULL)
{
- _cupsLangPrintf(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);
}
while ((bytes = cupsFileRead(in, buffer, sizeof(buffer))) > 0)
if (cupsFileWrite(out, buffer, bytes) < bytes)
{
- _cupsLangPrintf(stderr,
- _("ERROR: Unable to write %d bytes to \"%s\": %s\n"),
- (int)bytes, filename, strerror(errno));
+ _cupsLangPrintError("ERROR",
+ _("Unable to generate compressed print file"));
cupsFileClose(in);
cupsFileClose(out);
exit(CUPS_BACKEND_FAILED);
#endif /* HAVE_LIBZ */
+/*
+ * 'monitor_printer()' - Monitor the printer state...
+ */
+
+static void * /* O - Thread exit code */
+monitor_printer(
+ _cups_monitor_t *monitor) /* I - Monitoring data */
+{
+ 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 */
+
+
+ /*
+ * 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)
+ {
+ /*
+ * Reconnect to the printer...
+ */
+
+ if (!httpReconnect(http))
+ {
+ /*
+ * Connected, so check on the printer state...
+ */
+
+ monitor->printer_state = check_printer_state(http, monitor->uri,
+ monitor->resource,
+ monitor->user,
+ monitor->version,
+ monitor->job_id);
+
+ 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;
+
+ 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);
+
+ 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);
+
+ /*
+ * Do the request...
+ */
+
+ response = cupsDoRequest(http, request, monitor->resource);
+
+ 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;
+
+ ippDelete(response);
+ }
+
+ /*
+ * Disconnect from the printer - we'll reconnect on the next poll...
+ */
+
+ _httpDisconnect(http);
+ }
+
+ /*
+ * Sleep for N seconds...
+ */
+
+ sleep(delay);
+
+ delay = _cupsNextDelay(delay, &prev_delay);
+ }
+
+ /*
+ * Cleanup and return...
+ */
+
+ httpClose(http);
+
+ return (NULL);
+}
+
+
+/*
+ * 'new_request()' - Create a new print creation or validation request.
+ */
+
+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 */
+{
+ 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 */
+
+
+ /*
+ * Create the IPP request...
+ */
+
+ 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)
+ {
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+ "requesting-user-name", NULL, user);
+ fprintf(stderr, "DEBUG: requesting-user-name=\"%s\"\n", user);
+ }
+
+ if (title && *title)
+ {
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
+ title);
+ fprintf(stderr, "DEBUG: job-name=\"%s\"\n", title);
+ }
+
+ 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)
+ {
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+ "compression", NULL, compression);
+ fprintf(stderr, "DEBUG: compression=\"%s\"\n", compression);
+ }
+#endif /* HAVE_LIBZ */
+
+ /*
+ * Handle options on the command-line...
+ */
+
+ if (num_options > 0)
+ {
+ 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().
*/
{
(void)prompt;
+ /*
+ * Remember that we need to authenticate...
+ */
+
+ auth_info_required = "username,password";
+
if (password && *password && password_tries < 3)
{
password_tries ++;
else
{
/*
- * If there is no password set in the device URI, return the
- * "authentication required" exit code...
+ * Give up after 3 tries or if we don't have a password to begin with...
*/
- if (tmpfilename[0])
- unlink(tmpfilename);
-
-#ifdef __APPLE__
- if (pstmpname[0])
- unlink(pstmpname);
-#endif /* __APPLE__ */
-
- fputs("ATTR: auth-info-required=username,password\n", stderr);
-
- exit(CUPS_BACKEND_AUTH_REQUIRED);
-
- return (NULL); /* Eliminate compiler warning */
+ return (NULL);
}
}
{
int i; /* Looping var */
int count; /* Count of reasons shown... */
- ipp_attribute_t *caprm, /* com.apple.print.recoverable-message */
+ 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 *message; /* Message to show */
- char unknown[1024]; /* Unknown message string */
const char *prefix; /* Prefix for STATE: line */
- char state[1024]; /* State string */
- cups_lang_t *language; /* Current localization */
- int saw_caprw; /* Saw com.apple.print.recoverable-warning state */
+ char value[1024], /* State/message string */
+ *valptr; /* Pointer into string */
+ static int ipp_supplies = -1;
+ /* Report supply levels? */
- if ((psm = ippFindAttribute(ipp, "printer-state-message",
- IPP_TAG_TEXT)) != NULL)
- fprintf(stderr, "INFO: %s\n", psm->values[0].string.text);
+ /*
+ * Report alerts and messages...
+ */
- if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
- IPP_TAG_KEYWORD)) == NULL)
- return (0);
+ if ((pa = ippFindAttribute(ipp, "printer-alert", IPP_TAG_TEXT)) != NULL)
+ report_attr(pa);
- saw_caprw = 0;
- state[0] = '\0';
- prefix = "STATE: ";
- language = cupsLangDefault();
+ if ((pam = ippFindAttribute(ipp, "printer-alert-message",
+ IPP_TAG_TEXT)) != NULL)
+ report_attr(pam);
- for (i = 0, count = 0; i < reasons->num_values; i ++)
+ if ((psm = ippFindAttribute(ipp, "printer-state-message",
+ IPP_TAG_TEXT)) != NULL)
{
- reason = reasons->values[i].string.text;
+ char *ptr; /* Pointer into message */
- if (strcmp(reason, "paused"))
- {
- strlcat(state, prefix, sizeof(state));
- strlcat(state, reason, sizeof(state));
- prefix = ",";
- }
-
- message = "";
-
- 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, "offline", 7) ||
- !strncmp(reason, "paused", 6) ||
- !strncmp(reason, "shutdown", 8))
- message = _("Printer offline.");
- 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 (!strcmp(reason, "com.apple.print.recoverable-warning"))
- saw_caprw = 1;
- else if (strstr(reason, "error") != NULL)
+ strlcpy(value, "INFO: ", sizeof(value));
+ for (ptr = psm->values[0].string.text, valptr = value + 6;
+ *ptr && valptr < (value + sizeof(value) - 6);
+ ptr ++)
{
- message = unknown;
-
- snprintf(unknown, sizeof(unknown), _("Unknown printer error (%s)!"),
- reason);
- }
+ 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...
+ */
- if (message[0])
- {
- count ++;
- if (strstr(reasons->values[i].string.text, "error"))
- fprintf(stderr, "ERROR: %s\n", _cupsLangString(language, message));
- else if (strstr(reasons->values[i].string.text, "warning"))
- fprintf(stderr, "WARNING: %s\n", _cupsLangString(language, message));
+ sprintf(valptr, "<%02X>", *ptr);
+ valptr += 4;
+ }
else
- fprintf(stderr, "INFO: %s\n", _cupsLangString(language, message));
+ *valptr++ = *ptr;
}
- }
-
- fprintf(stderr, "%s\n", state);
-
- /*
- * Relay com.apple.print.recoverable-message...
- */
-
- if ((caprm = ippFindAttribute(ipp, "com.apple.print.recoverable-message",
- IPP_TAG_TEXT)) != NULL)
- fprintf(stderr, "WARNING: %s: %s\n",
- saw_caprw ? "recoverable" : "recovered",
- caprm->values[0].string.text);
-
- /*
- * Relay the current marker-* attribute values...
- */
-
- if ((marker = ippFindAttribute(ipp, "marker-colors", IPP_TAG_NAME)) != NULL)
- report_attr(marker);
- if ((marker = ippFindAttribute(ipp, "marker-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 (count);
-}
-
-
-#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...
- */
-
-static int /* O - Exit status of filter */
-run_pictwps_filter(char **argv, /* I - Command-line arguments */
- const char *filename)/* I - Filename */
-{
- 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 */
-
-
- /*
- * First get the PPD file for the printer...
- */
-
- printer = getenv("PRINTER");
- if (!printer)
- {
- _cupsLangPuts(stderr,
- _("ERROR: PRINTER environment variable not defined!\n"));
- return (-1);
- }
-
- if ((ppdfile = cupsGetPPD(printer)) == NULL)
- {
- _cupsLangPrintf(stderr,
- _("ERROR: Unable to get PPD file for printer \"%s\" - "
- "%s.\n"), printer, cupsLastErrorString());
- }
- else
- {
- snprintf(ppdenv, sizeof(ppdenv), "PPD=%s", ppdfile);
- putenv(ppdenv);
- }
- /*
- * Then create a temporary file for printing...
- */
+ *valptr++ = '\n';
+ *valptr = '\0';
- if ((fd = cupsTempFd(pstmpname, sizeof(pstmpname))) < 0)
- {
- _cupsLangPrintf(stderr, _("ERROR: Unable to create temporary file - %s.\n"),
- strerror(errno));
- if (ppdfile)
- unlink(ppdfile);
- return (-1);
+ fputs(value, stderr);
}
/*
- * Get the owner of the spool file - it is owned by the user we want to run
- * as...
+ * Now report printer-state-reasons, filtering out some of the reasons we never
+ * want to set...
*/
- if (argv[6])
- stat(argv[6], &fileinfo);
- else
- {
- /*
- * Use the OSX defaults, as an up-stream filter created the PICT
- * file...
- */
-
- fileinfo.st_uid = 1;
- fileinfo.st_gid = 80;
- }
-
- if (ppdfile)
- chown(ppdfile, fileinfo.st_uid, fileinfo.st_gid);
-
- fchown(fd, fileinfo.st_uid, fileinfo.st_gid);
+ if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
+ IPP_TAG_KEYWORD)) == NULL)
+ return (0);
- /*
- * Finally, run the filter to convert the file...
- */
+ value[0] = '\0';
+ prefix = "STATE: ";
- if ((pid = fork()) == 0)
+ for (i = 0, count = 0, valptr = value; i < reasons->num_values; i ++)
{
- /*
- * Child process for pictwpstops... Redirect output of pictwpstops to a
- * file...
- */
-
- close(1);
- dup(fd);
- close(fd);
+ reason = reasons->values[i].string.text;
- if (!getuid())
+ if (strcmp(reason, "paused") &&
+ strcmp(reason, "com.apple.print.recoverable-warning"))
{
- /*
- * Change to an unpriviledged user...
- */
+ strlcpy(valptr, prefix, sizeof(value) - (valptr - value) - 1);
+ valptr += strlen(valptr);
+ strlcpy(valptr, reason, sizeof(value) - (valptr - value) - 1);
+ valptr += strlen(valptr);
- setgid(fileinfo.st_gid);
- setuid(fileinfo.st_uid);
+ prefix = ",";
}
-
- execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
- filename, NULL);
- _cupsLangPrintf(stderr, _("ERROR: Unable to exec pictwpstops: %s\n"),
- strerror(errno));
- return (errno);
}
- close(fd);
-
- if (pid < 0)
+ if (value[0])
{
- /*
- * Error!
- */
-
- _cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
- strerror(errno));
- if (ppdfile)
- unlink(ppdfile);
- return (-1);
+ *valptr++ = '\n';
+ *valptr = '\0';
+ fputs(value, stderr);
}
/*
- * Now wait for the filter to complete...
+ * Relay the current marker-* attribute values...
*/
- if (wait(&status) < 0)
+ if (ipp_supplies < 0)
{
- _cupsLangPrintf(stderr, _("ERROR: Unable to wait for pictwpstops: %s\n"),
- strerror(errno));
- close(fd);
- if (ppdfile)
- unlink(ppdfile);
- return (-1);
- }
-
- if (ppdfile)
- unlink(ppdfile);
-
- close(fd);
+ ppd_file_t *ppd; /* PPD file */
+ ppd_attr_t *ppdattr; /* Attribute in PPD file */
- if (status)
- {
- if (status >= 256)
- _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited with status %d!\n"),
- status / 256);
+ if ((ppd = ppdOpenFile(getenv("PPD"))) != NULL &&
+ (ppdattr = ppdFindAttr(ppd, "cupsIPPSupplies", NULL)) != NULL &&
+ ppdattr->value && strcasecmp(ppdattr->value, "true"))
+ ipp_supplies = 0;
else
- _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited on signal %d!\n"),
- status);
+ ipp_supplies = 1;
- 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__ */
/*
{
(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;
}
if (tmpfilename[0])
unlink(tmpfilename);
-#ifdef __APPLE__
- if (pstmpname[0])
- unlink(pstmpname);
-#endif /* __APPLE__ */
-
exit(1);
}
projects / thirdparty / cups.git / blobdiff