/*
- * "$Id: ipp.c 7018 2007-10-10 22:14:03Z mike $"
+ * "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $"
*
* IPP backend for the Common UNIX Printing System (CUPS).
*
- * Copyright 2007 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
* compress_files() - Compress print files...
* 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.
*/
#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/i18n.h>
-#include <cups/string.h>
-#include <signal.h>
#include <sys/wait.h>
/*
static char *password = NULL; /* Password for device URI */
static int password_tries = 0; /* Password tries */
+static const char *auth_info_required = "none";
+ /* New auth-info-required value */
#ifdef __APPLE__
static char pstmpname[1024] = ""; /* Temporary PostScript file name */
#endif /* __APPLE__ */
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__
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) */
*name, /* Name of option */
*value, /* Value of option */
sep; /* Separator character */
+ 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 */
*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? */
{ /* Printer attributes we want */
"copies-supported",
"document-format-supported",
+ "marker-colors",
+ "marker-high-levels",
+ "marker-levels",
+ "marker-low-levels",
+ "marker-message",
+ "marker-names",
+ "marker-types",
"printer-is-accepting-jobs",
"printer-state",
"printer-state-message",
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)
* 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)
- {
- _cupsLangPuts(stderr,
- _("ERROR: Missing device URI on command-line and no "
- "DEVICE_URI environment variable!\n"));
- return (CUPS_BACKEND_STOP);
- }
+ if ((device_uri = cupsBackendDeviceURI(argv)) == 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 (!strcmp(method, "https"))
+ if (!port)
+ port = IPP_PORT; /* Default to port 631 */
+
+ if (!strcmp(scheme, "https"))
cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
else
cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
*/
compression = 0;
- version = 1;
+ version = 11;
waitjob = 1;
waitprinter = 1;
contimeout = 7 * 24 * 60 * 60;
else
{
_cupsLangPrintf(stderr,
- _("ERROR: Unknown encryption option value \"%s\"!\n"),
+ _("ERROR: Unknown encryption option value \"%s\"\n"),
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
{
_cupsLangPrintf(stderr,
- _("ERROR: Unknown version option value \"%s\"!\n"),
+ _("ERROR: Unknown version option value \"%s\"\n"),
value);
}
}
*/
_cupsLangPrintf(stderr,
- _("ERROR: Unknown option \"%s\" with value \"%s\"!\n"),
+ _("ERROR: Unknown option \"%s\" with value \"%s\"\n"),
name, value);
}
}
* 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 */
+ int fd; /* File descriptor */
+ http_addrlist_t *addrlist; /* Address list */
+ off_t tbytes; /* Total bytes copied */
+
+
+ fputs("STATE: +connecting-to-device\n", stderr);
+ fprintf(stderr, "DEBUG: Looking up \"%s\"...\n", hostname);
+ if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, "1")) == NULL)
+ {
+ _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
+ hostname);
+ return (CUPS_BACKEND_STOP);
+ }
+
+ snmp_fd = _cupsSNMPOpen(addrlist->addr.addr.sa_family);
if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
{
- perror("ERROR: unable to create temporary file");
+ _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
return (CUPS_BACKEND_FAILED);
}
- if ((fp = cupsFileOpenFd(fd, compression ? "w9" : "w")) == NULL)
+ _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
+
+ tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 0, 0,
+ backendNetworkSideCB);
+
+ if (snmp_fd >= 0)
+ _cupsSNMPClose(snmp_fd);
+
+ httpAddrFreeList(addrlist);
+
+ close(fd);
+
+ /*
+ * Don't try printing files less than 2 bytes...
+ */
+
+ if (tbytes <= 1)
{
- perror("ERROR: unable to open temporary file");
- close(fd);
+ _cupsLangPuts(stderr, _("ERROR: Empty print file\n"));
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...
*/
* Try connecting to the remote server...
*/
- delay = 5;
- recoverable = 0;
- start_time = time(NULL);
+ delay = 5;
+ start_time = time(NULL);
fputs("STATE: +connecting-to-device\n", stderr);
do
{
- _cupsLangPrintf(stderr, _("INFO: Connecting to %s on port %d...\n"),
- hostname, port);
+ fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
+ _cupsLangPuts(stderr, _("INFO: Connecting to printer...\n"));
if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
{
_("INFO: Unable to contact printer, queuing on next "
"printer in class...\n"));
- if (argc == 6 || strcmp(filename, argv[6]))
- unlink(filename);
+ if (tmpfilename[0])
+ unlink(tmpfilename);
/*
* Sleep 5 seconds to keep the job from requeuing too rapidly...
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+ _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
return (CUPS_BACKEND_FAILED);
}
- recoverable = 1;
-
_cupsLangPrintf(stderr,
- _("WARNING: recoverable: Network host \'%s\' is busy; "
+ _("WARNING: Network host \'%s\' is busy; "
"will retry in %d seconds...\n"),
hostname, delay);
}
else if (h_errno)
{
- _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
+ _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
hostname);
return (CUPS_BACKEND_STOP);
}
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"));
+ _("ERROR: Unable to connect to printer; will retry in 30 "
+ "seconds...\n"));
sleep(30);
}
}
while (http == NULL);
- if (job_cancelled)
+ if (job_cancelled || !http)
{
- if (argc == 6 || strcmp(filename, argv[6]))
- unlink(filename);
+ if (tmpfilename[0])
+ unlink(tmpfilename);
return (CUPS_BACKEND_FAILED);
}
fputs("STATE: -connecting-to-device\n", stderr);
- _cupsLangPrintf(stderr, _("INFO: Connected to %s...\n"), hostname);
+ _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
#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)
+ have_supplies = !backendSNMPSupplies(snmp_fd, http->hostaddr, &start_count,
+ NULL);
+ else
+ have_supplies = 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
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);
fputs("DEBUG: Getting supported attributes...\n", stderr);
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
if ((supported = cupsDoRequest(http, request, resource)) == NULL)
ipp_status = cupsLastError();
else
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+ _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
return (CUPS_BACKEND_FAILED);
}
- recoverable = 1;
-
_cupsLangPrintf(stderr,
- _("WARNING: recoverable: Network host \'%s\' is busy; "
- "will retry in %d seconds...\n"),
- hostname, delay);
+ _("WARNING: Network host \'%s\' is busy; will retry in "
+ "%d seconds...\n"), hostname, delay);
report_printer_state(supported, 0);
delay += 5;
}
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...
*/
- _cupsLangPuts(stderr,
- _("INFO: Printer does not support IPP/1.1, trying "
- "IPP/1.0...\n"));
- version = 0;
+ _cupsLangPrintf(stderr,
+ _("INFO: Printer does not support IPP/%d.%d, trying "
+ "IPP/1.0...\n"), version / 10, version % 10);
+ version = 10;
httpReconnect(http);
}
else if (ipp_status == IPP_NOT_FOUND)
{
- _cupsLangPuts(stderr, _("ERROR: Destination printer does not exist!\n"));
+ _cupsLangPuts(stderr, _("ERROR: Destination printer does not exist\n"));
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"),
+ _("ERROR: Unable to get printer status (%s)\n"),
cupsLastErrorString());
sleep(10);
}
ippDelete(supported);
httpClose(http);
- if (argc == 6 || strcmp(filename, argv[6]))
- unlink(filename);
+ 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...
*/
while (copies_remaining > 0)
{
+ /*
+ * Check for side-channel requests...
+ */
+
+ backendCheckSideChannel(snmp_fd, http->hostaddr);
+
/*
* Build the IPP request...
*/
else
request = ippNewRequest(IPP_PRINT_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);
num_options = cupsParseOptions(argv[5], 0, &options);
#ifdef __APPLE__
- if (!strcasecmp(content_type, "application/pictwps") && num_files == 1)
+ if (!strcasecmp(final_content_type, "application/pictwps") &&
+ num_files == 1)
{
if (format_sup != NULL)
{
for (i = 0; i < format_sup->num_values; i ++)
- if (!strcasecmp(content_type, format_sup->values[i].string.text))
+ if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
break;
}
* so convert the document to PostScript...
*/
- if (run_pictwps_filter(argv, filename))
+ if (run_pictwps_filter(argv, files[0]))
+ {
+ if (pstmpname[0])
+ unlink(pstmpname);
+
+ if (tmpfilename[0])
+ unlink(tmpfilename);
+
return (CUPS_BACKEND_FAILED);
+ }
- filename = pstmpname;
+ files[0] = pstmpname;
/*
* Change the MIME type to application/postscript and change the
"document-format", NULL, final_content_type);
}
- if (copies_sup && version > 0 && send_options)
+ if (copies_sup && version > 10 && send_options)
{
/*
* Only send options if the destination printer supports the copies
* Do the request...
*/
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
if (num_files > 1)
response = cupsDoRequest(http, request, resource);
else
sleep(10);
}
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...
*/
- _cupsLangPuts(stderr,
- _("INFO: Printer does not support IPP/1.1, trying "
- "IPP/1.0...\n"));
- version = 0;
+ _cupsLangPrintf(stderr,
+ _("INFO: Printer does not support IPP/%d.%d, trying "
+ "IPP/1.0...\n"), version / 10, version % 10);
+ version = 10;
httpReconnect(http);
}
else
- _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)!\n"),
+ {
+ /*
+ * Update auth-info-required as needed...
+ */
+
+ _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)\n"),
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)
{
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);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
"document-format", NULL, content_type);
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
ippDelete(cupsDoFileRequest(http, request, resource, files[i]));
if (cupsLastError() > IPP_OK_CONFLICT)
}
else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
ipp_status == IPP_PRINTER_BUSY)
- break;
+ continue;
else
copies_remaining --;
for (delay = 1; !job_cancelled;)
{
+ /*
+ * 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);
* Do the request...
*/
- if (!copies_sup)
+ if (!copies_sup || http->version < HTTP_1_1)
httpReconnect(http);
response = cupsDoRequest(http, request, resource);
ippDelete(response);
_cupsLangPrintf(stderr,
- _("ERROR: Unable to get job %d attributes (%s)!\n"),
+ _("ERROR: Unable to get job %d attributes (%s)\n"),
job_id, cupsLastErrorString());
break;
}
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_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...
*/
* 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.
- */
+ 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)
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
+ {
+ _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
return (CUPS_BACKEND_OK);
+ }
}
_cupsLangPuts(stderr, _("INFO: Canceling print job...\n"));
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);
* Do the request...
*/
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
ippDelete(cupsDoRequest(http, request, resource));
if (cupsLastError() > IPP_OK_CONFLICT)
*response; /* IPP response */
static const char * const attrs[] = /* Attributes we want */
{
+ "marker-colors",
+ "marker-levels",
+ "marker-message",
+ "marker-names",
+ "marker-types",
"printer-state-message",
"printer-state-reasons"
};
*/
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);
* Do the request...
*/
+ if (http->version < HTTP_1_1)
+ httpReconnect(http);
+
if ((response = cupsDoRequest(http, request, resource)) != NULL)
{
report_printer_state(response, job_id);
{
(void)prompt;
- if (password && password_tries < 3)
+ /*
+ * 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);
+ return (NULL);
+ }
+}
-#ifdef __APPLE__
- if (pstmpname[0])
- unlink(pstmpname);
-#endif /* __APPLE__ */
- fputs("ATTR: auth-info-required=username,password\n", stderr);
+/*
+ * 'report_attr()' - Report an IPP attribute value.
+ */
- exit(CUPS_BACKEND_AUTH_REQUIRED);
+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 */
+
+
+ /*
+ * Convert the attribute values into quoted strings...
+ */
+
+ for (i = 0, valptr = value;
+ i < attr->num_values && valptr < (value + sizeof(value) - 10);
+ i ++)
+ {
+ if (i > 0)
+ *valptr++ = ',';
+
+ switch (attr->value_tag)
+ {
+ case IPP_TAG_INTEGER :
+ case IPP_TAG_ENUM :
+ snprintf(valptr, sizeof(value) - (valptr - value), "%d",
+ attr->values[i].integer);
+ valptr += strlen(valptr);
+ break;
+
+ 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;
- return (NULL); /* Eliminate compiler warning */
+ default :
+ /*
+ * Unsupported value type...
+ */
+
+ return;
+ }
}
+
+ *valptr = '\0';
+
+ /*
+ * Tell the scheduler about the new values...
+ */
+
+ fprintf(stderr, "ATTR: %s=%s\n", attr->name, value);
}
{
int i; /* Looping var */
int count; /* Count of reasons shown... */
- ipp_attribute_t *psm, /* pritner-state-message */
- *reasons; /* printer-state-reasons */
+ ipp_attribute_t *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 */
if ((psm = ippFindAttribute(ipp, "printer-state-message",
state[0] = '\0';
prefix = "STATE: ";
- language = cupsLangDefault();
for (i = 0, count = 0; i < reasons->num_values; i ++)
{
reason = reasons->values[i].string.text;
- if (job_id == 0 || strcmp(reason, "paused"))
+ if (strcmp(reason, "paused") &&
+ strcmp(reason, "com.apple.print.recoverable-warning"))
{
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, "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;
-
- snprintf(unknown, sizeof(unknown), _("Unknown printer error (%s)!"),
- reason);
- }
+ if (state[0])
+ fprintf(stderr, "%s\n", state);
- 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));
- else
- fprintf(stderr, "INFO: %s\n", _cupsLangString(language, message));
- }
- }
+ /*
+ * Relay the current marker-* attribute values...
+ */
- fprintf(stderr, "%s\n", state);
+ 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 (count);
}
if (!printer)
{
_cupsLangPuts(stderr,
- _("ERROR: PRINTER environment variable not defined!\n"));
+ _("ERROR: PRINTER environment variable not defined\n"));
return (-1);
}
if ((fd = cupsTempFd(pstmpname, sizeof(pstmpname))) < 0)
{
- _cupsLangPrintf(stderr, _("ERROR: Unable to create temporary file - %s.\n"),
- strerror(errno));
+ _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
if (ppdfile)
unlink(ppdfile);
return (-1);
* file...
*/
- close(1);
- dup(fd);
+ dup2(fd, 1);
close(fd);
if (!getuid())
* Change to an unpriviledged user...
*/
- setgid(fileinfo.st_gid);
- setuid(fileinfo.st_uid);
+ if (setgid(fileinfo.st_gid))
+ return (errno);
+
+ if (setuid(fileinfo.st_uid))
+ return (errno);
}
execlp("pictwpstops", printer, argv[1], argv[2], argv[3], argv[4], argv[5],
_cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
strerror(errno));
- unlink(filename);
if (ppdfile)
unlink(ppdfile);
return (-1);
_cupsLangPrintf(stderr, _("ERROR: Unable to wait for pictwpstops: %s\n"),
strerror(errno));
close(fd);
- unlink(filename);
if (ppdfile)
unlink(ppdfile);
return (-1);
if (status)
{
if (status >= 256)
- _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited with status %d!\n"),
+ _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited with status %d\n"),
status / 256);
else
- _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited on signal %d!\n"),
+ _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited on signal %d\n"),
status);
- unlink(filename);
return (status);
}
/*
- * End of "$Id: ipp.c 7018 2007-10-10 22:14:03Z mike $".
+ * End of "$Id: ipp.c 7948 2008-09-17 00:04:12Z mike $".
*/
projects / thirdparty / cups.git / blobdiff