/*
* IPP backend for CUPS.
*
- * Copyright © 2007-2018 by Apple Inc.
+ * Copyright © 2007-2019 by Apple Inc.
* Copyright © 1997-2007 by Easy Software Products, all rights reserved.
*
* Licensed under Apache License v2.0. See the file "LICENSE" for more
# define kPMPrintUIToolAgent "com.apple.printuitool.agent"
# define kPMStartJob 100
# define kPMWaitForJob 101
-# ifdef HAVE_XPC_PRIVATE_H
-# include <xpc/private.h>
-# else
extern void xpc_connection_set_target_uid(xpc_connection_t connection,
uid_t uid);
-# endif /* HAVE_XPC_PRIVATE_H */
#endif /* HAVE_GSSAPI && HAVE_XPC */
#define _CUPS_JSR_ACCOUNT_LIMIT_REACHED 0x08
#define _CUPS_JSR_JOB_PASSWORD_WAIT 0x10
#define _CUPS_JSR_JOB_RELEASE_WAIT 0x20
+#define _CUPS_JSR_DOCUMENT_FORMAT_ERROR 0x40
+#define _CUPS_JSR_DOCUMENT_UNPRINTABLE 0x80
/*
http_encryption_t encryption; /* Use encryption? */
ipp_jstate_t job_state; /* Current job state */
ipp_pstate_t printer_state; /* Current printer state */
+ int retryable; /* Is this a job that should be retried? */
} _cups_monitor_t;
int waitjob, /* Wait for job complete? */
waitjob_tries = 0, /* Number of times we've waited */
waitprinter; /* Wait for printer ready? */
- time_t waittime; /* Wait time for held jobs */
_cups_monitor_t monitor; /* Monitoring data */
ipp_attribute_t *job_id_attr; /* job-id attribute */
int job_id; /* job-id value */
* that way.
*/
- if (!getuid() && (value = getenv("AUTH_UID")) != NULL &&
- !getenv("AUTH_PASSWORD"))
+ if (!getuid() && (value = getenv("AUTH_UID")) != NULL)
{
uid_t uid = (uid_t)atoi(value);
/* User ID */
# else /* No XPC, just try to run as the user ID */
if (uid > 0)
- seteuid(uid);
+ setuid(uid);
# endif /* HAVE_XPC */
}
#endif /* HAVE_GSSAPI */
port = IPP_PORT; /* Default to port 631 */
if (!strcmp(scheme, "https") || !strcmp(scheme, "ipps"))
- cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
+ cupsSetEncryption(HTTP_ENCRYPTION_ALWAYS);
else
- cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
+ cupsSetEncryption(HTTP_ENCRYPTION_IF_REQUESTED);
/*
* See if there are any options...
*/
if (!_cups_strcasecmp(value, "always"))
- cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
+ cupsSetEncryption(HTTP_ENCRYPTION_ALWAYS);
else if (!_cups_strcasecmp(value, "required"))
- cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
+ cupsSetEncryption(HTTP_ENCRYPTION_REQUIRED);
else if (!_cups_strcasecmp(value, "never"))
- cupsSetEncryption(HTTP_ENCRYPT_NEVER);
+ cupsSetEncryption(HTTP_ENCRYPTION_NEVER);
else if (!_cups_strcasecmp(value, "ifrequested"))
- cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
+ cupsSetEncryption(HTTP_ENCRYPTION_IF_REQUESTED);
else
{
_cupsLangPrintFilter(stderr, "ERROR",
fprintf(stderr, "DEBUG: Connecting to %s:%d\n", hostname, port);
_cupsLangPrintFilter(stderr, "INFO", _("Connecting to printer."));
- if (httpReconnect(http))
+ if (httpReconnect2(http, 30000, NULL))
{
int error = errno; /* Connection error */
- if (http->status == HTTP_PKI_ERROR)
+ if (http->status == HTTP_STATUS_CUPS_PKI_ERROR)
update_reasons(NULL, "+cups-certificate-error");
if (job_canceled)
* Build the IPP request...
*/
- request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
ippSetVersion(request, version / 10, 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)
+ if (http->version < HTTP_VERSION_1_1)
{
fprintf(stderr, "DEBUG: Printer responded with HTTP version %d.%d.\n",
http->version / 100, http->version % 100);
fprintf(stderr, "DEBUG: Get-Printer-Attributes: %s (%s)\n",
ippErrorString(ipp_status), cupsLastErrorString());
- if (ipp_status <= IPP_OK_CONFLICT)
+ if (ipp_status <= IPP_STATUS_OK_CONFLICTING)
password_tries = 0;
else
{
fprintf(stderr, "DEBUG: Get-Printer-Attributes returned %s.\n",
ippErrorString(ipp_status));
- if (ipp_status == IPP_PRINTER_BUSY ||
- ipp_status == IPP_SERVICE_UNAVAILABLE)
+ if (ipp_status == IPP_STATUS_ERROR_BUSY ||
+ ipp_status == IPP_STATUS_ERROR_SERVICE_UNAVAILABLE)
{
if (contimeout && (time(NULL) - start_time) > contimeout)
{
delay = _cupsNextDelay(delay, &prev_delay);
}
- else if ((ipp_status == IPP_BAD_REQUEST ||
- ipp_status == IPP_VERSION_NOT_SUPPORTED) && version > 10)
+ else if ((ipp_status == IPP_STATUS_ERROR_BAD_REQUEST ||
+ ipp_status == IPP_STATUS_ERROR_VERSION_NOT_SUPPORTED) && version > 10)
{
/*
* Switch to IPP/1.1 or IPP/1.0...
version = 10;
}
- httpReconnect(http);
+ httpReconnect2(http, 30000, NULL);
}
- else if (ipp_status == IPP_NOT_FOUND)
+ else if (ipp_status == IPP_STATUS_ERROR_NOT_FOUND)
{
_cupsLangPrintFilter(stderr, "ERROR",
_("The printer configuration is incorrect or the "
return (CUPS_BACKEND_STOP);
}
- else if (ipp_status == IPP_FORBIDDEN ||
- ipp_status == IPP_AUTHENTICATION_CANCELED)
+ else if (ipp_status == IPP_STATUS_ERROR_FORBIDDEN ||
+ ipp_status == IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED)
{
const char *www_auth = httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE);
/* WWW-Authenticate field value */
fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
return (CUPS_BACKEND_AUTH_REQUIRED);
}
- else if (ipp_status != IPP_NOT_AUTHORIZED)
+ else if (ipp_status != IPP_STATUS_ERROR_NOT_AUTHORIZED)
{
_cupsLangPrintFilter(stderr, "ERROR",
_("Unable to get printer status."));
sleep(10);
- httpReconnect(http);
+ httpReconnect2(http, 30000, NULL);
}
ippDelete(supported);
copies_sup = NULL; /* No */
}
- cups_version = ippFindAttribute(supported, "cups-version", IPP_TAG_TEXT);
+ if ((cups_version = ippFindAttribute(supported, "cups-version", IPP_TAG_TEXT)) != NULL)
+ {
+ const char *val = ippGetString(cups_version, 0, NULL);
+
+ fprintf(stderr, "DEBUG: cups-version = \"%s\"\n", val);
+ if (!strcmp(val, "cups-version"))
+ cups_version = NULL; /* Bogus cups-version value returned by buggy printers! */
+ }
encryption_sup = ippFindAttribute(supported, "job-password-encryption-supported", IPP_TAG_KEYWORD);
ippOpString(operations_sup->values[i].integer));
for (i = 0; i < operations_sup->num_values; i ++)
- if (operations_sup->values[i].integer == IPP_PRINT_JOB)
+ if (operations_sup->values[i].integer == IPP_OP_PRINT_JOB)
break;
if (i >= operations_sup->num_values)
"cups-ipp-missing-print-job");
for (i = 0; i < operations_sup->num_values; i ++)
- if (operations_sup->values[i].integer == IPP_CANCEL_JOB)
+ if (operations_sup->values[i].integer == IPP_OP_CANCEL_JOB)
break;
if (i >= operations_sup->num_values)
"cups-ipp-missing-cancel-job");
for (i = 0; i < operations_sup->num_values; i ++)
- if (operations_sup->values[i].integer == IPP_GET_JOB_ATTRIBUTES)
+ if (operations_sup->values[i].integer == IPP_OP_GET_JOB_ATTRIBUTES)
break;
if (i >= operations_sup->num_values)
"cups-ipp-missing-get-job-attributes");
for (i = 0; i < operations_sup->num_values; i ++)
- if (operations_sup->values[i].integer == IPP_GET_PRINTER_ATTRIBUTES)
+ if (operations_sup->values[i].integer == IPP_OP_GET_PRINTER_ATTRIBUTES)
break;
if (i >= operations_sup->num_values)
for (i = 0; i < operations_sup->num_values; i ++)
{
- if (operations_sup->values[i].integer == IPP_VALIDATE_JOB)
+ if (operations_sup->values[i].integer == IPP_OP_VALIDATE_JOB)
validate_job = 1;
- else if (operations_sup->values[i].integer == IPP_CREATE_JOB)
+ else if (operations_sup->values[i].integer == IPP_OP_CREATE_JOB)
create_job = 1;
- else if (operations_sup->values[i].integer == IPP_SEND_DOCUMENT)
+ else if (operations_sup->values[i].integer == IPP_OP_SEND_DOCUMENT)
send_document = 1;
- else if (operations_sup->values[i].integer == IPP_GET_JOB_ATTRIBUTES)
+ else if (operations_sup->values[i].integer == IPP_OP_GET_JOB_ATTRIBUTES)
get_job_attrs = 1;
}
report_printer_state(supported);
}
- while (!job_canceled && ipp_status > IPP_OK_CONFLICT);
+ while (!job_canceled && ipp_status > IPP_STATUS_OK_CONFLICTING);
if (job_canceled)
return (CUPS_BACKEND_OK);
IPP_TAG_BOOLEAN);
if (printer_state == NULL ||
- (printer_state->values[0].integer > IPP_PRINTER_PROCESSING &&
+ (printer_state->values[0].integer > IPP_PSTATE_PROCESSING &&
waitprinter) ||
printer_accepting == NULL ||
!printer_accepting->values[0].boolean)
* (I hate compatibility hacks!)
*/
- if (http->version < HTTP_1_1 && num_files == 0)
+ if (http->version < HTTP_VERSION_1_1 && num_files == 0)
{
if ((fd = cupsTempFd(tmpfilename, sizeof(tmpfilename))) < 0)
{
files = &compatfile;
num_files = 1;
}
- else if (http->version < HTTP_1_1 && num_files == 1)
+ else if (http->version < HTTP_VERSION_1_1 && num_files == 1)
{
struct stat fileinfo; /* File information */
monitor.create_job = create_job;
monitor.get_job_attrs = get_job_attrs;
monitor.encryption = cupsEncryption();
- monitor.job_state = IPP_JOB_PENDING;
- monitor.printer_state = IPP_PRINTER_IDLE;
+ monitor.job_state = IPP_JSTATE_PENDING;
+ monitor.printer_state = IPP_PSTATE_IDLE;
+ monitor.retryable = argc == 6 && document_format && strcmp(document_format, "image/pwg-raster") && strcmp(document_format, "image/urf");
+
+ fprintf(stderr, "DEBUG: retryable=%d\n", monitor.retryable);
if (create_job)
{
ippGetString(job_auth, 0, NULL), num_options,
&options);
+ if (ipp_status == IPP_STATUS_OK_IGNORED_OR_SUBSTITUTED || ipp_status == IPP_STATUS_OK_CONFLICTING)
+ {
+ /*
+ * One or more options are not supported...
+ */
+
+ ipp_attribute_t *attr; /* Unsupported attribute */
+
+ if ((attr = ippFindAttribute(response, "sides", IPP_TAG_ZERO)) != NULL)
+ {
+ /*
+ * The sides value is not supported, revert to one-sided as needed...
+ */
+
+ const char *sides = cupsGetOption("sides", num_options, options);
+
+ if (!sides || !strncmp(sides, "two-sided-", 10))
+ {
+ fputs("DEBUG: Unable to do two-sided printing, setting sides to 'one-sided'.\n", stderr);
+ num_options = cupsAddOption("sides", "one-sided", num_options, &options);
+ }
+ }
+ }
+
ippDelete(response);
if (job_canceled)
"cups-ipp-missing-validate-job");
break;
}
- else if (ipp_status < IPP_REDIRECTION_OTHER_SITE ||
- ipp_status == IPP_BAD_REQUEST)
+ else if (ipp_status < IPP_STATUS_REDIRECTION_OTHER_SITE ||
+ ipp_status == IPP_STATUS_ERROR_BAD_REQUEST)
break;
- else if (job_auth == NULL && ipp_status > IPP_BAD_REQUEST)
+ else if (job_auth == NULL && ipp_status > IPP_STATUS_ERROR_BAD_REQUEST)
goto cleanup;
}
if (job_canceled)
break;
- request = new_request((num_files > 1 || create_job) ? IPP_CREATE_JOB :
- IPP_PRINT_JOB,
+ request = new_request((num_files > 1 || create_job) ? IPP_OP_CREATE_JOB :
+ IPP_OP_PRINT_JOB,
version, uri, argv[2], monitor.job_name, num_options,
options, compression, copies_sup ? copies : 1,
document_format, pc, ppd, media_col_sup,
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 (http_status == HTTP_STATUS_CONTINUE && request->state == IPP_STATE_DATA)
{
if (compression && strcmp(compression, "none"))
httpSetField(http, HTTP_FIELD_CONTENT_ENCODING, compression);
http_status = cupsWriteRequestData(http, buffer, (size_t)bytes);
}
- while (http_status == HTTP_CONTINUE &&
+ while (http_status == HTTP_STATUS_CONTINUE &&
(!job_canceled || compatsize > 0))
{
/*
fprintf(stderr, "DEBUG: Read %d bytes...\n", (int)bytes);
if ((http_status = cupsWriteRequestData(http, buffer, (size_t)bytes))
- != HTTP_CONTINUE)
+ != HTTP_STATUS_CONTINUE)
break;
}
else if (bytes == 0 || (errno != EINTR && errno != EAGAIN))
}
}
- if (http_status == HTTP_ERROR)
+ if (http_status == HTTP_STATUS_ERROR)
fprintf(stderr, "DEBUG: Error writing document data for "
"Print-Job: %s\n", strerror(httpError(http)));
ippErrorString(ipp_status), cupsLastErrorString());
debug_attributes(response);
- if (ipp_status > IPP_OK_CONFLICT)
+ if (ipp_status > IPP_STATUS_OK_CONFLICTING)
{
job_id = 0;
else if (www_auth[0])
auth_info_required = "username,password";
}
- else if (ipp_status == IPP_REQUEST_VALUE)
+ else if (ipp_status == IPP_STATUS_ERROR_REQUEST_VALUE)
{
/*
* Print file is too large, abort this job...
* Send the next file in the job...
*/
- request = ippNewRequest(IPP_SEND_DOCUMENT);
+ request = ippNewRequest(IPP_OP_SEND_DOCUMENT);
ippSetVersion(request, version / 10, version % 10);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
debug_attributes(request);
http_status = cupsSendRequest(http, request, resource, 0);
- if (http_status == HTTP_CONTINUE && request->state == IPP_DATA)
+ if (http_status == HTTP_STATUS_CONTINUE && request->state == IPP_STATE_DATA)
{
if (compression && strcmp(compression, "none"))
httpSetField(http, HTTP_FIELD_CONTENT_ENCODING, compression);
if (fd >= 0)
{
- while (!job_canceled && http_status == HTTP_CONTINUE &&
+ while (!job_canceled && http_status == HTTP_STATUS_CONTINUE &&
(bytes = read(fd, buffer, sizeof(buffer))) > 0)
{
if ((http_status = cupsWriteRequestData(http, buffer, (size_t)bytes))
- != HTTP_CONTINUE)
+ != HTTP_STATUS_CONTINUE)
break;
else
{
close(fd);
}
- if (http_status == HTTP_ERROR)
+ if (http_status == HTTP_STATUS_ERROR)
fprintf(stderr, "DEBUG: Error writing document data for "
"Send-Document: %s\n", strerror(httpError(http)));
response = cupsGetResponse(http, resource);
ippDelete(request);
- fprintf(stderr, "DEBUG: Send-Document: %s (%s)\n",
- ippErrorString(cupsLastError()), cupsLastErrorString());
+ fprintf(stderr, "DEBUG: Send-Document: %s (%s)\n", ippErrorString(cupsLastError()), cupsLastErrorString());
debug_attributes(response);
- ippDelete(response);
- if (cupsLastError() > IPP_OK_CONFLICT && !job_canceled)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING && !job_canceled)
{
+ ipp_attribute_t *reasons = ippFindAttribute(response, "job-state-reasons", IPP_TAG_KEYWORD);
+ /* job-state-reasons values */
+
ipp_status = cupsLastError();
- _cupsLangPrintFilter(stderr, "ERROR",
- _("Unable to add document to print job."));
+ if (ippContainsString(reasons, "document-format-error"))
+ ipp_status = IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR;
+ else if (ippContainsString(reasons, "document-unprintable"))
+ ipp_status = IPP_STATUS_ERROR_DOCUMENT_UNPRINTABLE;
+
+ ippDelete(response);
+ _cupsLangPrintFilter(stderr, "ERROR", _("Unable to add document to print job."));
break;
}
else
{
+ ippDelete(response);
+
password_tries = 0;
if (num_files == 0 || fd < 0)
if (job_canceled)
break;
- if (ipp_status <= IPP_OK_CONFLICT && argc > 6)
+ if (ipp_status <= IPP_STATUS_OK_CONFLICTING && argc > 6)
{
fprintf(stderr, "PAGE: 1 %d\n", copies_sup ? atoi(argv[4]) : 1);
copies_remaining --;
}
- else if ((ipp_status == IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR || ipp_status == IPP_STATUS_ERROR_DOCUMENT_UNPRINTABLE) &&
+ else if ((ipp_status == IPP_STATUS_ERROR_DOCUMENT_FORMAT_NOT_SUPPORTED || ipp_status == IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR || ipp_status == IPP_STATUS_ERROR_DOCUMENT_UNPRINTABLE) &&
argc == 6 &&
document_format && strcmp(document_format, "image/pwg-raster") && strcmp(document_format, "image/urf"))
{
goto cleanup;
}
- else if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
- ipp_status == IPP_NOT_POSSIBLE ||
- ipp_status == IPP_PRINTER_BUSY)
+ else if (ipp_status == IPP_STATUS_ERROR_SERVICE_UNAVAILABLE ||
+ ipp_status == IPP_STATUS_ERROR_NOT_POSSIBLE ||
+ ipp_status == IPP_STATUS_ERROR_BUSY)
{
if (argc == 6)
{
}
continue;
}
- else if (ipp_status == IPP_REQUEST_VALUE ||
- ipp_status == IPP_ERROR_JOB_CANCELED ||
- ipp_status == IPP_NOT_AUTHORIZED ||
+ else if (ipp_status == IPP_STATUS_ERROR_REQUEST_VALUE ||
+ ipp_status == IPP_STATUS_ERROR_JOB_CANCELED ||
+ ipp_status == IPP_STATUS_ERROR_NOT_AUTHORIZED ||
ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED ||
ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED ||
ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED ||
ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED ||
- ipp_status == IPP_INTERNAL_ERROR)
+ ipp_status == IPP_STATUS_ERROR_INTERNAL)
{
/*
* Print file is too large, job was canceled, we need new
goto cleanup;
}
- else if (ipp_status == IPP_NOT_FOUND)
+ else if (ipp_status == IPP_STATUS_ERROR_NOT_FOUND)
{
/*
* Printer does not actually implement support for Create-Job/
update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
"cups-ipp-missing-send-document");
- ipp_status = IPP_INTERNAL_ERROR; /* Force queue to stop */
+ ipp_status = IPP_STATUS_ERROR_INTERNAL; /* Force queue to stop */
goto cleanup;
}
_cupsLangPrintFilter(stderr, "INFO", _("Waiting for job to complete."));
- for (delay = _cupsNextDelay(0, &prev_delay), waittime = time(NULL) + 30; !job_canceled;)
+ for (delay = _cupsNextDelay(0, &prev_delay); !job_canceled;)
{
/*
* Check for side-channel requests...
check_printer_state(http, uri, resource, argv[2], version);
- if (cupsLastError() <= IPP_OK_CONFLICT)
+ if (cupsLastError() <= IPP_STATUS_OK_CONFLICTING)
password_tries = 0;
/*
- * Build an IPP_GET_JOB_ATTRIBUTES request...
+ * Build an IPP_OP_GET_JOB_ATTRIBUTES request...
*/
- request = ippNewRequest(IPP_GET_JOB_ATTRIBUTES);
+ request = ippNewRequest(IPP_OP_GET_JOB_ATTRIBUTES);
ippSetVersion(request, version / 10, version % 10);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
* Do the request...
*/
- httpReconnect(http);
+ httpReconnect2(http, 30000, NULL);
response = cupsDoRequest(http, request, resource);
ipp_status = cupsLastError();
- if (ipp_status == IPP_NOT_FOUND || ipp_status == IPP_NOT_POSSIBLE)
+ if (ipp_status == IPP_STATUS_ERROR_NOT_FOUND || ipp_status == IPP_STATUS_ERROR_NOT_POSSIBLE)
{
/*
* Job has gone away and/or the server has no job history...
"cups-ipp-missing-job-history");
ippDelete(response);
- ipp_status = IPP_OK;
+ ipp_status = IPP_STATUS_OK;
break;
}
ippErrorString(ipp_status), cupsLastErrorString());
debug_attributes(response);
- if (ipp_status <= IPP_OK_CONFLICT)
+ if (ipp_status <= IPP_STATUS_OK_CONFLICTING)
password_tries = 0;
else
{
- if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
- ipp_status != IPP_PRINTER_BUSY)
+ if (ipp_status != IPP_STATUS_ERROR_SERVICE_UNAVAILABLE &&
+ ipp_status != IPP_STATUS_ERROR_BUSY)
{
ippDelete(response);
- ipp_status = IPP_OK;
+ ipp_status = IPP_STATUS_OK;
break;
}
- else if (ipp_status == IPP_INTERNAL_ERROR)
+ else if (ipp_status == IPP_STATUS_ERROR_INTERNAL)
{
waitjob_tries ++;
if (waitjob_tries > 4)
{
ippDelete(response);
- ipp_status = IPP_OK;
+ ipp_status = IPP_STATUS_OK;
break;
}
}
*/
if (cups_version &&
- job_state->values[0].integer >= IPP_JOB_PENDING &&
- job_state->values[0].integer <= IPP_JOB_COMPLETED)
+ job_state->values[0].integer >= IPP_JSTATE_PENDING &&
+ job_state->values[0].integer <= IPP_JSTATE_COMPLETED)
update_reasons(NULL,
remote_job_states[job_state->values[0].integer -
- IPP_JOB_PENDING]);
+ IPP_JSTATE_PENDING]);
if ((job_sheets = ippFindAttribute(response, "job-impressions-completed", IPP_TAG_INTEGER)) == NULL)
job_sheets = ippFindAttribute(response, "job-media-sheets-completed", IPP_TAG_INTEGER);
job_sheets->values[0].integer);
/*
- * Stop polling if the job is finished or pending-held for 30 seconds...
+ * Stop polling if the job is finished or pending-held...
*/
- if (job_state->values[0].integer > IPP_JSTATE_STOPPED ||
- (job_state->values[0].integer == IPP_JSTATE_HELD && time(NULL) > waittime))
+ if (job_state->values[0].integer > IPP_JSTATE_STOPPED || job_state->values[0].integer == IPP_JSTATE_HELD)
{
ippDelete(response);
break;
}
}
- else if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
- ipp_status != IPP_NOT_POSSIBLE &&
- ipp_status != IPP_PRINTER_BUSY)
+ else if (ipp_status != IPP_STATUS_ERROR_SERVICE_UNAVAILABLE &&
+ ipp_status != IPP_STATUS_ERROR_NOT_POSSIBLE &&
+ ipp_status != IPP_STATUS_ERROR_BUSY)
{
/*
* If the printer does not return a job-state attribute, it does not
update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
"cups-ipp-missing-job-state");
- ipp_status = IPP_INTERNAL_ERROR;
+ ipp_status = IPP_STATUS_ERROR_INTERNAL;
break;
}
}
{
cancel_job(http, uri, job_id, resource, argv[2], version);
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
_cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel print job."));
}
check_printer_state(http, uri, resource, argv[2], version);
- if (cupsLastError() <= IPP_OK_CONFLICT)
+ if (cupsLastError() <= IPP_STATUS_OK_CONFLICTING)
password_tries = 0;
/*
* Return the queue status...
*/
- if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN ||
- ipp_status == IPP_AUTHENTICATION_CANCELED ||
- ipp_status <= IPP_OK_CONFLICT)
+ if (ipp_status == IPP_STATUS_ERROR_NOT_AUTHORIZED || ipp_status == IPP_STATUS_ERROR_FORBIDDEN ||
+ ipp_status == IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED ||
+ ipp_status <= IPP_STATUS_OK_CONFLICTING)
fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
if (ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED)
else if (ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED)
fputs("JOBSTATE: account-authorization-failed\n", stderr);
- if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN ||
- ipp_status == IPP_AUTHENTICATION_CANCELED)
+ if (job_canceled)
+ return (CUPS_BACKEND_OK);
+ else if (ipp_status == IPP_STATUS_ERROR_NOT_AUTHORIZED || ipp_status == IPP_STATUS_ERROR_FORBIDDEN || ipp_status == IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED)
return (CUPS_BACKEND_AUTH_REQUIRED);
else if (ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED ||
ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED ||
ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED ||
ipp_status == IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED)
return (CUPS_BACKEND_HOLD);
- else if (ipp_status == IPP_INTERNAL_ERROR)
+ else if (ipp_status == IPP_STATUS_ERROR_INTERNAL)
return (CUPS_BACKEND_STOP);
- else if (ipp_status == IPP_CONFLICT || ipp_status == IPP_STATUS_ERROR_REQUEST_ENTITY || ipp_status == IPP_STATUS_ERROR_REQUEST_VALUE)
+ else if (ipp_status == IPP_STATUS_ERROR_CONFLICTING || ipp_status == IPP_STATUS_ERROR_REQUEST_ENTITY || ipp_status == IPP_STATUS_ERROR_REQUEST_VALUE)
return (CUPS_BACKEND_FAILED);
- else if (ipp_status == IPP_REQUEST_VALUE ||
+ else if (ipp_status == IPP_STATUS_ERROR_REQUEST_VALUE ||
ipp_status == IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES ||
- ipp_status == IPP_DOCUMENT_FORMAT || job_canceled < 0)
+ ipp_status == IPP_STATUS_ERROR_DOCUMENT_FORMAT_NOT_SUPPORTED || job_canceled < 0)
{
- if (ipp_status == IPP_REQUEST_VALUE)
+ if (ipp_status == IPP_STATUS_ERROR_REQUEST_VALUE)
_cupsLangPrintFilter(stderr, "ERROR", _("Print job too large."));
- else if (ipp_status == IPP_DOCUMENT_FORMAT)
+ else if (ipp_status == IPP_STATUS_ERROR_DOCUMENT_FORMAT_NOT_SUPPORTED)
_cupsLangPrintFilter(stderr, "ERROR",
_("Printer cannot print supplied content."));
else if (ipp_status == IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES)
return (CUPS_BACKEND_CANCEL);
}
- else if (ipp_status > IPP_OK_CONFLICT && ipp_status != IPP_ERROR_JOB_CANCELED)
+ else if (ipp_status > IPP_STATUS_OK_CONFLICTING && ipp_status != IPP_STATUS_ERROR_JOB_CANCELED)
return (CUPS_BACKEND_RETRY_CURRENT);
else
return (CUPS_BACKEND_OK);
_cupsLangPrintFilter(stderr, "INFO", _("Canceling print job."));
- request = ippNewRequest(IPP_CANCEL_JOB);
+ request = ippNewRequest(IPP_OP_CANCEL_JOB);
ippSetVersion(request, version / 10, version % 10);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
ipp_t *request, /* IPP request */
*response; /* IPP response */
ipp_attribute_t *attr; /* Attribute in response */
- ipp_pstate_t printer_state = IPP_PRINTER_STOPPED;
+ ipp_pstate_t printer_state = IPP_PSTATE_STOPPED;
/* Current printer-state */
* Send a Get-Printer-Attributes request and log the results...
*/
- request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
+ request = ippNewRequest(IPP_OP_GET_PRINTER_ATTRIBUTES);
ippSetVersion(request, version / 10, version % 10);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
monitor->job_reasons = 0;
- while (monitor->job_state < IPP_JOB_CANCELED && !job_canceled)
+ while (monitor->job_state < IPP_JSTATE_CANCELED && !job_canceled)
{
/*
* Reconnect to the printer as needed...
*/
if (httpGetFd(http) < 0)
- httpReconnect(http);
+ httpReconnect2(http, 30000, NULL);
if (httpGetFd(http) >= 0)
{
monitor->resource,
monitor->user,
monitor->version);
- if (cupsLastError() <= IPP_OK_CONFLICT)
+ if (cupsLastError() <= IPP_STATUS_OK_CONFLICTING)
password_tries = 0;
if (monitor->job_id == 0 && monitor->create_job)
*/
job_op = (monitor->job_id > 0 && monitor->get_job_attrs) ?
- IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
+ IPP_OP_GET_JOB_ATTRIBUTES : IPP_OP_GET_JOBS;
request = ippNewRequest(job_op);
ippSetVersion(request, monitor->version / 10, monitor->version % 10);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, monitor->uri);
- if (job_op == IPP_GET_JOB_ATTRIBUTES)
+ if (job_op == IPP_OP_GET_JOB_ATTRIBUTES)
ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
monitor->job_id);
fprintf(stderr, "DEBUG: (monitor) %s: %s (%s)\n", ippOpString(job_op),
ippErrorString(cupsLastError()), cupsLastErrorString());
- if (cupsLastError() <= IPP_OK_CONFLICT)
+ if (cupsLastError() <= IPP_STATUS_OK_CONFLICTING)
password_tries = 0;
- if (job_op == IPP_GET_JOB_ATTRIBUTES)
+ if (job_op == IPP_OP_GET_JOB_ATTRIBUTES)
{
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;
+ monitor->job_state = IPP_JSTATE_COMPLETED;
}
else if (response)
{
{
job_id = 0;
job_name = NULL;
- job_state = IPP_JOB_PENDING;
+ job_state = IPP_JSTATE_PENDING;
job_user = NULL;
while (attr && attr->group_tag != IPP_TAG_JOB)
}
}
- fprintf(stderr, "DEBUG: (monitor) job-state = %s\n",
- ippEnumString("job-state", monitor->job_state));
+ fprintf(stderr, "DEBUG: (monitor) job-state = %s\n", ippEnumString("job-state", (int)monitor->job_state));
if (!job_canceled &&
- (monitor->job_state == IPP_JOB_CANCELED ||
- monitor->job_state == IPP_JOB_ABORTED))
+ (monitor->job_state == IPP_JSTATE_CANCELED ||
+ monitor->job_state == IPP_JSTATE_ABORTED))
{
job_canceled = -1;
fprintf(stderr, "DEBUG: (monitor) job_canceled = -1\n");
for (i = 0; i < attr->num_values; i ++)
{
- if (!strcmp(attr->values[i].string.text,
- "account-authorization-failed"))
+ if (!strcmp(attr->values[i].string.text, "account-authorization-failed"))
new_reasons |= _CUPS_JSR_ACCOUNT_AUTHORIZATION_FAILED;
else if (!strcmp(attr->values[i].string.text, "account-closed"))
new_reasons |= _CUPS_JSR_ACCOUNT_CLOSED;
else if (!strcmp(attr->values[i].string.text, "account-info-needed"))
new_reasons |= _CUPS_JSR_ACCOUNT_INFO_NEEDED;
- else if (!strcmp(attr->values[i].string.text,
- "account-limit-reached"))
+ else if (!strcmp(attr->values[i].string.text, "account-limit-reached"))
new_reasons |= _CUPS_JSR_ACCOUNT_LIMIT_REACHED;
else if (!strcmp(attr->values[i].string.text, "job-password-wait"))
new_reasons |= _CUPS_JSR_JOB_PASSWORD_WAIT;
else if (!strcmp(attr->values[i].string.text, "job-release-wait"))
new_reasons |= _CUPS_JSR_JOB_RELEASE_WAIT;
- if (!job_canceled &&
- (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system")))
+ else if (!strcmp(attr->values[i].string.text, "document-format-error"))
+ new_reasons |= _CUPS_JSR_DOCUMENT_FORMAT_ERROR;
+ else if (!strcmp(attr->values[i].string.text, "document-unprintable"))
+ new_reasons |= _CUPS_JSR_DOCUMENT_UNPRINTABLE;
+
+ if (!job_canceled && (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system")))
job_canceled = 1;
}
fputs("JOBSTATE: job-password-wait\n", stderr);
else if (new_reasons & _CUPS_JSR_JOB_RELEASE_WAIT)
fputs("JOBSTATE: job-release-wait\n", stderr);
+ else if (new_reasons & (_CUPS_JSR_DOCUMENT_FORMAT_ERROR | _CUPS_JSR_DOCUMENT_UNPRINTABLE))
+ {
+ if (monitor->retryable)
+ {
+ /*
+ * Can't print this, so retry as raster...
+ */
+
+ job_canceled = 1;
+ fputs("JOBSTATE: cups-retry-as-raster\n", stderr);
+ }
+ else if (new_reasons & _CUPS_JSR_DOCUMENT_FORMAT_ERROR)
+ {
+ fputs("JOBSTATE: document-format-error\n", stderr);
+ }
+ else
+ {
+ fputs("JOBSTATE: document-unprintable\n", stderr);
+ }
+ }
else
fputs("JOBSTATE: job-printing\n", stderr);
ippDelete(response);
- fprintf(stderr, "DEBUG: (monitor) job-state = %s\n",
- ippEnumString("job-state", monitor->job_state));
+ fprintf(stderr, "DEBUG: (monitor) job-state = %s\n", ippEnumString("job-state", (int)monitor->job_state));
if (!job_canceled &&
- (monitor->job_state == IPP_JOB_CANCELED ||
- monitor->job_state == IPP_JOB_ABORTED))
+ (monitor->job_state == IPP_JSTATE_CANCELED ||
+ monitor->job_state == IPP_JSTATE_ABORTED))
job_canceled = -1;
}
if (job_canceled > 0 && monitor->job_id > 0)
{
if (httpGetFd(http) < 0)
- httpReconnect(http);
+ httpReconnect2(http, 30000, NULL);
if (httpGetFd(http) >= 0)
{
cancel_job(http, monitor->uri, monitor->job_id, monitor->resource,
monitor->user, monitor->version);
- if (cupsLastError() > IPP_OK_CONFLICT)
+ if (cupsLastError() > IPP_STATUS_OK_CONFLICTING)
{
fprintf(stderr, "DEBUG: (monitor) cancel_job() = %s\n", cupsLastErrorString());
_cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel print job."));
fprintf(stderr, "DEBUG: job-name=\"%s\"\n", title);
}
- if (format && op != IPP_CREATE_JOB)
+ if (format && op != IPP_OP_CREATE_JOB)
{
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format", NULL, format);
fprintf(stderr, "DEBUG: document-format=\"%s\"\n", format);
char phone[1024], /* Phone number string */
*ptr, /* Pointer into string */
tel_uri[1024]; /* tel: URI */
- static const char * const allowed = "0123456789#*-+.()";
+ static const char * const allowed = "0123456789#*-+.()pw";
/* Allowed characters */
destination = ippNew();
_httpDecodeURI(phone, keyword, sizeof(phone));
for (ptr = phone; *ptr;)
{
- if (!strchr(allowed, *ptr))
+ if (*ptr == ',')
+ *ptr = 'p';
+ else if (!strchr(allowed, *ptr))
_cups_strcpy(ptr, ptr + 1);
else
ptr ++;
}
}
+ cupsArrayDelete(new_reasons);
+
_cupsMutexUnlock(&report_mutex);
/*
projects / thirdparty / cups.git / blobdiff