/*
* "$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-2009 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
* 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>
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 char tmpfilename[1024] = ""; /* Temporary spool file name */
-static int job_cancelled = 0; /* Job cancelled? */
+static const char *auth_info_required = "none";
+ /* New auth-info-required value */
+static int job_canceled = 0; /* Job cancelled? */
/*
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);
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 */
+ char **files; /* Files to print */
int port; /* Port number (not used) */
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? */
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 *printer_state; /* printer-state attribute */
ipp_attribute_t *printer_accepting; /* printer-is-accepting-jobs */
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 */
+ 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-message",
"marker-names",
"marker-types",
+ "media-col-supported",
"printer-is-accepting-jobs",
"printer-state",
"printer-state-message",
*/
compression = 0;
- version = 11;
+ version = 20;
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
{
_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);
}
}
if (argc == 6)
{
- /*
- * Copy stdin to a temporary file...
- */
-
- 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)
- {
- _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
- return (CUPS_BACKEND_FAILED);
- }
-
- _cupsLangPuts(stderr, _("INFO: Copying print data...\n"));
-
- tbytes = backendRunLoop(-1, fd, snmp_fd, &(addrlist->addr), 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)
- {
- _cupsLangPuts(stderr, _("ERROR: Empty print file!\n"));
- unlink(tmpfilename);
- return (CUPS_BACKEND_FAILED);
- }
-
- /*
- * Point to the single file from stdin...
- */
-
- filename = tmpfilename;
- num_files = 1;
- files = &filename;
- send_options = 0;
+ num_files = 0;
+ send_options = !strcasecmp(final_content_type, "application/pdf") ||
+ !strcasecmp(final_content_type, "application/vnd.cups-pdf") ||
+ !strcasecmp(final_content_type, "image/jpeg") ||
+ !strcasecmp(final_content_type, "image/png") ||
+ !strcasecmp(final_content_type, "image/urf");
+
+ 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...
* 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);
if ((http = httpConnectEncrypt(hostname, port, cupsEncryption())) == NULL)
{
- if (job_cancelled)
+ int error = errno; /* Connection error */
+
+ if (job_canceled)
break;
if (getenv("CLASS") != NULL)
_("INFO: Unable to contact printer, queuing on next "
"printer in class...\n"));
- if (tmpfilename[0])
- unlink(tmpfilename);
-
/*
* Sleep 5 seconds to keep the job from requeuing too rapidly...
*/
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"));
+ _cupsLangPuts(stderr, _("ERROR: The printer is 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);
+ switch (error)
+ {
+ case EHOSTDOWN :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' may not exist "
+ "or is unavailable at this time.\n"),
+ hostname);
+ break;
+
+ case EHOSTUNREACH :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' is "
+ "unreachable at this time.\n"),
+ hostname);
+ break;
+
+ case ECONNREFUSED :
+ default :
+ _cupsLangPrintf(stderr,
+ _("WARNING: Network printer \'%s\' is busy.\n"),
+ hostname);
+ break;
+ }
sleep(delay);
}
else if (h_errno)
{
- _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
+ _cupsLangPrintf(stderr,
+ _("ERROR: Unable to locate network 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"));
+ _cupsLangPrintf(stderr, _("ERROR: Network printer \'%s\' is not "
+ "responding.\n"), hostname);
sleep(30);
}
- if (job_cancelled)
+ if (job_canceled)
break;
}
}
while (http == NULL);
- if (job_cancelled || !http)
- {
- if (tmpfilename[0])
- unlink(tmpfilename);
-
+ if (job_canceled || !http)
return (CUPS_BACKEND_FAILED);
- }
fputs("STATE: -connecting-to-device\n", stderr);
_cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
/*
* 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;
do
{
fputs("DEBUG: Getting supported attributes...\n", stderr);
if (http->version < HTTP_1_1)
- httpReconnect(http);
+ {
+ fprintf(stderr, "DEBUG: Printer responded with HTTP version %d.%d.\n",
+ http->version / 100, http->version % 100);
+
+ _cupsLangPuts(stderr,
+ _("ERROR: Unable to print: the printer does not conform to "
+ "the IPP standard.\n"));
+ exit(CUPS_BACKEND_STOP);
+ }
if ((supported = cupsDoRequest(http, request, resource)) == NULL)
ipp_status = cupsLastError();
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
- _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+ _cupsLangPuts(stderr, _("ERROR: The printer is 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);
ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
{
/*
- * Switch to IPP/1.0...
+ * Switch to IPP/1.1 or IPP/1.0...
*/
- _cupsLangPrintf(stderr,
- _("INFO: Printer does not support IPP/%d.%d, trying "
- "IPP/1.0...\n"), version / 10, version % 10);
- version = 10;
+ if (version >= 20)
+ {
+ _cupsLangPrintf(stderr,
+ _("INFO: Printer does not support IPP/%d.%d, trying "
+ "IPP/%s...\n"), version / 10, version % 10, "1.1");
+ version = 11;
+ }
+ else
+ {
+ _cupsLangPrintf(stderr,
+ _("INFO: Printer does not support IPP/%d.%d, trying "
+ "IPP/%s...\n"), 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"));
+ _cupsLangPuts(stderr, _("ERROR: The printer URI is incorrect or no longer exists.\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);
}
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);
+ }
+
report_printer_state(supported, 0);
}
while (ipp_status > IPP_OK_CONFLICT);
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...
*/
* Build the IPP request...
*/
- if (job_cancelled)
+ if (job_canceled)
break;
if (num_files > 1)
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]);
+
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, uri);
-
- fprintf(stderr, "DEBUG: printer-uri = \"%s\"\n", uri);
+ fprintf(stderr, "DEBUG: printer-uri=\"%s\"\n", uri);
if (argv[2][0])
+ {
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, argv[2]);
+ fprintf(stderr, "DEBUG: requesting-user-name=\"%s\"\n", argv[2]);
+ }
- fprintf(stderr, "DEBUG: requesting-user-name = \"%s\"\n", argv[2]);
-
- /*
- * 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)...
- */
-
- if (argv[3][0] && copies_sup)
+ if (argv[3][0])
+ {
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL,
argv[3]);
-
- fprintf(stderr, "DEBUG: job-name = \"%s\"\n", argv[3]);
+ fprintf(stderr, "DEBUG: job-name=\"%s\"\n", argv[3]);
+ }
#ifdef HAVE_LIBZ
if (compression)
options = NULL;
num_options = cupsParseOptions(argv[5], 0, &options);
-#ifdef __APPLE__
- if (!strcasecmp(final_content_type, "application/pictwps") &&
- num_files == 1)
+ if (format_sup != NULL)
{
- 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);
+ }
+
+ if (send_options)
+ {
+ if (cups_version || !media_col_sup)
{
- for (i = 0; i < format_sup->num_values; i ++)
- if (!strcasecmp(final_content_type, format_sup->values[i].string.text))
- break;
- }
+ /*
+ * When talking to another CUPS server, send all options...
+ */
- if (format_sup == NULL || i >= format_sup->num_values)
+ cupsEncodeOptions(request, num_options, options);
+ }
+ else
{
/*
- * Remote doesn't support "application/pictwps" (i.e. it's not MacOS X)
- * so convert the document to PostScript...
+ * Otherwise send standard IPP attributes...
*/
- if (run_pictwps_filter(argv, files[0]))
- {
- if (pstmpname[0])
- unlink(pstmpname);
+ char cachefile[1024];/* Printer PWG cache file */
+ const char *cups_cachedir; /* Location of cache file */
+ _pwg_t *pwg; /* PWG mapping data */
+ const char *keyword; /* PWG keyword */
+ _pwg_size_t *size; /* PWG media size */
- if (tmpfilename[0])
- unlink(tmpfilename);
- return (CUPS_BACKEND_FAILED);
- }
+ if ((cups_cachedir = getenv("CUPS_CACHEDIR")) == NULL)
+ cups_cachedir = CUPS_CACHEDIR;
- files[0] = pstmpname;
+ snprintf(cachefile, sizeof(cachefile), "%s/%s.pwg", cups_cachedir,
+ getenv("PRINTER"));
- /*
- * Change the MIME type to application/postscript and change the
- * number of copies to 1...
- */
+ if ((keyword = cupsGetOption("PageSize", num_options, options)) == NULL)
+ keyword = cupsGetOption("media", num_options, options);
- final_content_type = "application/postscript";
- copies = 1;
- copies_remaining = 1;
- send_options = 0;
- }
- }
-#endif /* __APPLE__ */
+ pwg = _pwgCreateWithFile(cachefile);
+ size = _pwgGetSize(pwg, keyword);
- 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 (media_col_sup && 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 */
+
+ 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 = _pwgGetSource(pwg, cupsGetOption("InputSlot",
+ num_options,
+ options));
+ media_type = _pwgGetType(pwg, 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);
+ }
+ else if (size)
+ ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "media",
+ NULL, size->map.pwg);
+ else if (keyword)
+ {
+ _pwg_media_t *found; /* PWG media */
- if (i < format_sup->num_values)
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
- "document-format", NULL, final_content_type);
- }
- if (copies_sup && version > 10 && 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.
- */
+ if ((found = _pwgMediaForPPD(keyword)) == NULL)
+ keyword = found->pwg;
+ else if ((found = _pwgMediaForLegacy(keyword)) == NULL)
+ keyword = found->pwg;
+
+ ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "media",
+ NULL, keyword);
+ }
- cupsEncodeOptions(request, num_options, options);
+ if ((keyword = cupsGetOption("output-bin", num_options,
+ options)) == NULL)
+ keyword = _pwgGetBin(pwg, 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);
+
+ if ((keyword = cupsGetOption("sides", num_options, options)) != NULL)
+ ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, "sides",
+ NULL, keyword);
+
+ _pwgDestroy(pwg);
+ }
- ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies",
- copies);
+ if (copies_sup && copies > 1)
+ ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", copies);
}
cupsFreeOptions(num_options, options);
- /*
- * 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...
- */
-
- if (!copies_sup)
- httpReconnect(http);
-
/*
* Do the request...
*/
- if (http->version < HTTP_1_1)
- httpReconnect(http);
-
if (num_files > 1)
response = cupsDoRequest(http, request, resource);
else
- response = cupsDoFileRequest(http, request, resource, files[0]);
+ {
+ fputs("DEBUG: Sending file using chunking...\n", stderr);
+ http_status = cupsSendRequest(http, request, resource, 0);
+ 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 ||
_("INFO: Printer busy; will retry in 10 seconds...\n"));
sleep(10);
}
- else if ((ipp_status == IPP_BAD_REQUEST ||
- ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
- {
- /*
- * Switch to IPP/1.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
{
/*
* Update auth-info-required as needed...
*/
- _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)!\n"),
+ _cupsLangPrintf(stderr, _("ERROR: Print file was not accepted (%s)\n"),
cupsLastErrorString());
- if (ipp_status == IPP_NOT_AUTHORIZED)
+ 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))
- fputs("ATTR: auth-info-required=negotiate\n", stderr);
- else
- fputs("ATTR: auth-info-required=username,password\n", stderr);
+ auth_info_required = "negotiate";
}
}
}
ippDelete(response);
- if (job_cancelled)
+ if (job_canceled)
break;
if (job_id && num_files > 1)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
"document-format", NULL, content_type);
- if (http->version < HTTP_1_1)
- httpReconnect(http);
+ 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);
+ }
+ }
- ippDelete(cupsDoFileRequest(http, request, resource, files[i]));
+ close(fd);
+ }
+
+ ippDelete(cupsGetResponse(http, resource));
+ ippDelete(request);
if (cupsLastError() > IPP_OK_CONFLICT)
{
_cupsLangPuts(stderr, _("INFO: Waiting for job to complete...\n"));
- for (delay = 1; !job_cancelled;)
+ for (delay = 1; !job_canceled;)
{
/*
* Check for side-channel requests...
* Do the request...
*/
- if (!copies_sup || http->version < HTTP_1_1)
- httpReconnect(http);
-
response = cupsDoRequest(http, request, resource);
ipp_status = cupsLastError();
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;
}
* 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);
/*
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...
*/
* Remove the temporary file(s) if necessary...
*/
- if (tmpfilename[0])
- unlink(tmpfilename);
-
#ifdef HAVE_LIBZ
if (compression)
{
}
#endif /* HAVE_LIBZ */
-#ifdef __APPLE__
- if (pstmpname[0])
- unlink(pstmpname);
-#endif /* __APPLE__ */
-
/*
* Return the queue status...
*/
- if (ipp_status == IPP_NOT_AUTHORIZED)
+ fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+
+ 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);
+ }
}
* 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 */
{
- "com.apple.print.recoverable-message",
"marker-colors",
"marker-levels",
"marker-message",
* 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;
+ /*
+ * 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 */
- *psm, /* printer-state-message */
+ ipp_attribute_t *psm, /* printer-state-message */
*reasons, /* printer-state-reasons */
*marker; /* marker-* attributes */
const char *reason; /* Current reason */
const char *prefix; /* Prefix for STATE: line */
char state[1024]; /* State string */
- int saw_caprw; /* Saw com.apple.print.recoverable-warning state */
if ((psm = ippFindAttribute(ipp, "printer-state-message",
IPP_TAG_KEYWORD)) == NULL)
return (0);
- saw_caprw = 0;
- state[0] = '\0';
- prefix = "STATE: ";
+ state[0] = '\0';
+ prefix = "STATE: ";
for (i = 0, count = 0; i < reasons->num_values; i ++)
{
reason = reasons->values[i].string.text;
- if (!strcmp(reason, "com.apple.print.recoverable-warning"))
- saw_caprw = 1;
- else if (strcmp(reason, "paused"))
+ if (strcmp(reason, "paused") &&
+ strcmp(reason, "com.apple.print.recoverable-warning"))
{
strlcat(state, prefix, sizeof(state));
strlcat(state, reason, sizeof(state));
if (state[0])
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...
*/
}
-#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...
- */
-
- if ((fd = cupsTempFd(pstmpname, sizeof(pstmpname))) < 0)
- {
- _cupsLangPrintError(_("ERROR: Unable to create temporary file"));
- if (ppdfile)
- unlink(ppdfile);
- return (-1);
- }
-
- /*
- * Get the owner of the spool file - it is owned by the user we want to run
- * as...
- */
-
- 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);
-
- /*
- * Finally, run the filter to convert the file...
- */
-
- if ((pid = fork()) == 0)
- {
- /*
- * Child process for pictwpstops... Redirect output of pictwpstops to a
- * file...
- */
-
- dup2(fd, 1);
- close(fd);
-
- if (!getuid())
- {
- /*
- * Change to an unpriviledged user...
- */
-
- setgid(fileinfo.st_gid);
- setuid(fileinfo.st_uid);
- }
-
- 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)
- {
- /*
- * Error!
- */
-
- _cupsLangPrintf(stderr, _("ERROR: Unable to fork pictwpstops: %s\n"),
- strerror(errno));
- if (ppdfile)
- unlink(ppdfile);
- return (-1);
- }
-
- /*
- * Now wait for the filter to complete...
- */
-
- if (wait(&status) < 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);
-
- if (status)
- {
- if (status >= 256)
- _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited with status %d!\n"),
- status / 256);
- else
- _cupsLangPrintf(stderr, _("ERROR: pictwpstops exited on signal %d!\n"),
- status);
-
- return (status);
- }
-
- /*
- * Return with no errors..
- */
-
- return (0);
-}
-#endif /* __APPLE__ */
-
-
/*
* 'sigterm_handler()' - Handle 'terminate' signals that stop the backend.
*/
{
(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;
}
- /*
- * The scheduler already tried to cancel us once, now just terminate
- * after removing our temp files!
- */
-
- if (tmpfilename[0])
- unlink(tmpfilename);
-
-#ifdef __APPLE__
- if (pstmpname[0])
- unlink(pstmpname);
-#endif /* __APPLE__ */
-
exit(1);
}
projects / thirdparty / cups.git / blobdiff