/*
- * "$Id: ipp.c 4906 2006-01-10 20:53:28Z mike $"
+ * "$Id: ipp.c 5046 2006-02-01 22:11:58Z mike $"
*
* IPP routines for the Common UNIX Printing System (CUPS) scheduler.
*
* copy_file() - Copy a PPD file or interface script...
* copy_model() - Copy a PPD model file, substituting default
* values as needed...
+ * copy_job_attrs() - Copy job attributes.
+ * copy_printer_attrs() - Copy printer attributes.
* copy_subscription_attrs() - Copy subscription attributes.
* create_job() - Print a file to a printer or class.
* create_requested_array() - Create an array for the requested-attributes.
* get_default() - Get the default destination.
* get_devices() - Get the list of available devices on the
* local system.
- * get_jobs() - Get a list of jobs for the specified printer.
* get_job_attrs() - Get job attributes.
+ * get_jobs() - Get a list of jobs for the specified printer.
* get_notifications() - Get events for a subscription.
* get_ppds() - Get the list of PPD files on the local
* system.
* get_printers() - Get a list of printers.
* get_subscription_attrs() - Get subscription attributes.
* get_subscriptions() - Get subscriptions.
+ * get_username() - Get the username associated with a request.
* hold_job() - Hold a print job.
* move_job() - Move a job to a new destination.
* ppd_add_default() - Add a PPD default choice.
static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr,
int quickcopy);
-static void copy_attrs(ipp_t *to, ipp_t *from, ipp_attribute_t *req,
+static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra,
ipp_tag_t group, int quickcopy);
static int copy_banner(cupsd_client_t *con, cupsd_job_t *job, const char *name);
static int copy_file(const char *from, const char *to);
static int copy_model(cupsd_client_t *con, const char *from, const char *to);
+static void copy_job_attrs(cupsd_client_t *con,
+ cupsd_job_t *job,
+ cups_array_t *ra);
+static void copy_printer_attrs(cupsd_client_t *con,
+ cupsd_printer_t *printer,
+ cups_array_t *ra);
static void copy_subscription_attrs(cupsd_client_t *con,
cupsd_subscription_t *sub,
cups_array_t *ra);
static void get_printer_attrs(cupsd_client_t *con, ipp_attribute_t *uri);
static void get_subscription_attrs(cupsd_client_t *con, int sub_id);
static void get_subscriptions(cupsd_client_t *con, ipp_attribute_t *uri);
+static const char *get_username(cupsd_client_t *con);
static void hold_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void move_job(cupsd_client_t *con, ipp_attribute_t *uri);
static int ppd_add_default(const char *option, const char *choice,
con->request->request.any.version[0],
con->request->request.any.version[1]);
}
- else if (con->request->attrs == NULL)
+ else if (!con->request->attrs)
{
cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
"%04X %s No attributes in request",
*/
for (attr = con->request->attrs, group = attr->group_tag;
- attr != NULL;
+ attr;
attr = attr->next)
if (attr->group_tag < group && attr->group_tag != IPP_TAG_ZERO)
{
else
group = attr->group_tag;
- if (attr == NULL)
+ if (!attr)
{
/*
* Then make sure that the first three attributes are:
attr = con->request->attrs;
if (attr && !strcmp(attr->name, "attributes-charset") &&
- attr->value_tag == IPP_TAG_CHARSET)
+ (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_CHARSET)
charset = attr;
else
charset = NULL;
attr = attr->next;
if (attr && !strcmp(attr->name, "attributes-natural-language") &&
- attr->value_tag == IPP_TAG_LANGUAGE)
+ (attr->value_tag & IPP_TAG_MASK) == IPP_TAG_LANGUAGE)
language = attr;
else
language = NULL;
- if ((attr = ippFindAttribute(con->request, "printer-uri", IPP_TAG_URI)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-uri",
+ IPP_TAG_URI)) != NULL)
uri = attr;
- else if ((attr = ippFindAttribute(con->request, "job-uri", IPP_TAG_URI)) != NULL)
+ else if ((attr = ippFindAttribute(con->request, "job-uri",
+ IPP_TAG_URI)) != NULL)
uri = attr;
else
uri = NULL;
ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
"attributes-natural-language", NULL, DefaultLanguage);
- if (charset == NULL || language == NULL ||
- (uri == NULL &&
+ if (!charset || !language ||
+ (!uri &&
con->request->request.op.operation_id != CUPS_GET_DEFAULT &&
con->request->request.op.operation_id != CUPS_GET_PRINTERS &&
con->request->request.op.operation_id != CUPS_GET_CLASSES &&
cupsdLogMessage(CUPSD_LOG_DEBUG, "Request attributes follow...");
- for (attr = con->request->attrs; attr != NULL; attr = attr->next)
+ for (attr = con->request->attrs; attr; attr = attr->next)
cupsdLogMessage(CUPSD_LOG_DEBUG,
"attr \"%s\": group_tag = %x, value_tag = %x",
attr->name ? attr->name : "(null)", attr->group_tag,
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
cupsdSaveAllPrinters();
cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" now accepting jobs (\"%s\").", name,
- con->username);
+ get_username(con));
/*
* Everything was ok, so return OK status...
const char *dest; /* Printer or class name */
ipp_attribute_t *attr; /* Printer attribute */
int modify; /* Non-zero if we just modified */
+ int need_restart_job; /* Need to restart job? */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_class(%p[%d], %s)", con,
* Do we have a valid URI?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strncmp(resource, "/classes/", 9) != 0 || strlen(resource) == 9)
+ if (strncmp(resource, "/classes/", 9) || strlen(resource) == 9)
{
/*
* No, return an error...
* Look for attributes and copy them over as needed...
*/
- if ((attr = ippFindAttribute(con->request, "printer-location", IPP_TAG_TEXT)) != NULL)
+ need_restart_job = 0;
+
+ if ((attr = ippFindAttribute(con->request, "printer-location",
+ IPP_TAG_TEXT)) != NULL)
cupsdSetString(&pclass->location, attr->values[0].string.text);
- if ((attr = ippFindAttribute(con->request, "printer-info", IPP_TAG_TEXT)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-info",
+ IPP_TAG_TEXT)) != NULL)
cupsdSetString(&pclass->info, attr->values[0].string.text);
- if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs",
+ IPP_TAG_BOOLEAN)) != NULL)
{
cupsdLogMessage(CUPSD_LOG_INFO, "Setting %s printer-is-accepting-jobs to %d (was %d.)",
pclass->name, attr->values[0].boolean, pclass->accepting);
cupsdAddPrinterHistory(pclass);
}
- if ((attr = ippFindAttribute(con->request, "printer-is-shared", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-is-shared",
+ IPP_TAG_BOOLEAN)) != NULL)
{
if (pclass->shared && !attr->values[0].boolean)
cupsdSendBrowseDelete(pclass);
pclass->shared = attr->values[0].boolean;
}
- if ((attr = ippFindAttribute(con->request, "printer-state", IPP_TAG_ENUM)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state",
+ IPP_TAG_ENUM)) != NULL)
{
if (attr->values[0].integer != IPP_PRINTER_IDLE &&
attr->values[0].integer != IPP_PRINTER_STOPPED)
if (attr->values[0].integer == IPP_PRINTER_STOPPED)
cupsdStopPrinter(pclass, 0);
else
+ {
cupsdSetPrinterState(pclass, (ipp_pstate_t)(attr->values[0].integer), 0);
+ need_restart_job = 1;
+ }
}
- if ((attr = ippFindAttribute(con->request, "printer-state-message", IPP_TAG_TEXT)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state-message",
+ IPP_TAG_TEXT)) != NULL)
{
strlcpy(pclass->state_message, attr->values[0].string.text,
sizeof(pclass->state_message));
cupsdAddPrinterHistory(pclass);
}
- if ((attr = ippFindAttribute(con->request, "job-sheets-default", IPP_TAG_ZERO)) != NULL &&
+ if ((attr = ippFindAttribute(con->request, "job-sheets-default",
+ IPP_TAG_ZERO)) != NULL &&
!Classification)
{
cupsdSetString(&pclass->job_sheets[0], attr->values[0].string.text);
pclass->deny_users = 0;
if (attr->value_tag == IPP_TAG_NAME &&
(attr->num_values > 1 ||
- strcmp(attr->values[0].string.text, "all") != 0))
+ strcmp(attr->values[0].string.text, "all")))
for (i = 0; i < attr->num_values; i ++)
cupsdAddPrinterUser(pclass, attr->values[i].string.text);
}
pclass->deny_users = 1;
if (attr->value_tag == IPP_TAG_NAME &&
(attr->num_values > 1 ||
- strcmp(attr->values[0].string.text, "none") != 0))
+ strcmp(attr->values[0].string.text, "none")))
for (i = 0; i < attr->num_values; i ++)
cupsdAddPrinterUser(pclass, attr->values[i].string.text);
}
attr->values[0].string.text);
cupsdSetString(&pclass->error_policy, attr->values[0].string.text);
}
- if ((attr = ippFindAttribute(con->request, "member-uris", IPP_TAG_URI)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "member-uris",
+ IPP_TAG_URI)) != NULL)
{
/*
* Clear the printer array as needed...
*/
+ need_restart_job = 1;
+
if (pclass->num_printers > 0)
{
free(pclass->printers);
* Search for the printer or class URI...
*/
- httpSeparateURI(attr->values[i].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[i].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((dest = cupsdValidateDest(host, resource, &dtype, &member)) == NULL)
{
cupsdSetPrinterAttrs(pclass);
cupsdSaveAllClasses();
- cupsdCheckJobs();
+
+ if (need_restart_job && pclass->job)
+ {
+ cupsd_job_t *job;
+
+ /*
+ * Stop the current job and then restart it below...
+ */
+
+ job = (cupsd_job_t *)pclass->job;
+
+ cupsdStopJob(job, 1);
+ job->state->values[0].integer = IPP_JOB_PENDING;
+ }
+
+ if (need_restart_job)
+ cupsdCheckJobs();
cupsdWritePrintcap();
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, pclass, NULL,
"Class \"%s\" modified by \"%s\".", pclass->name,
- con->username);
+ get_username(con));
cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" modified by \"%s\".",
- pclass->name, con->username);
+ pclass->name, get_username(con));
}
else
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, pclass, NULL,
"New class \"%s\" added by \"%s\".", pclass->name,
- con->username);
+ get_username(con));
cupsdLogMessage(CUPSD_LOG_INFO, "New class \"%s\" added by \"%s\".",
- pclass->name, con->username);
+ pclass->name, get_username(con));
}
con->response->request.status.status_code = IPP_OK;
sizeof(mime_type_t *));
}
- if (compressions == NULL || filetypes == NULL)
+ if (!compressions || !filetypes)
{
cupsdCancelJob(job, 1);
else
dest = cupsdFindPrinter(job->dest);
- if (dest != NULL && dest->state == IPP_PRINTER_STOPPED)
+ if (dest && dest->state == IPP_PRINTER_STOPPED)
ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
"job-state-reasons", NULL, "printer-stopped");
else
break;
case IPP_JOB_HELD :
- if (ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD) != NULL ||
- ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME) != NULL)
+ if (ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD) != NULL ||
+ ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_NAME) != NULL)
ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_KEYWORD,
"job-state-reasons", NULL, "job-hold-until-specified");
else
char srcfile[1024], /* Source Script/PPD file */
dstfile[1024]; /* Destination Script/PPD file */
int modify; /* Non-zero if we are modifying */
+ int need_restart_job; /* Need to restart job? */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_printer(%p[%d], %s)", con,
* Do we have a valid URI?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strncmp(resource, "/printers/", 10) != 0 || strlen(resource) == 10)
+ if (strncmp(resource, "/printers/", 10) || strlen(resource) == 10)
{
/*
* No, return an error...
* Look for attributes and copy them over as needed...
*/
- if ((attr = ippFindAttribute(con->request, "printer-location", IPP_TAG_TEXT)) != NULL)
+ need_restart_job = 0;
+
+ if ((attr = ippFindAttribute(con->request, "printer-location",
+ IPP_TAG_TEXT)) != NULL)
cupsdSetString(&printer->location, attr->values[0].string.text);
- if ((attr = ippFindAttribute(con->request, "printer-info", IPP_TAG_TEXT)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-info",
+ IPP_TAG_TEXT)) != NULL)
cupsdSetString(&printer->info, attr->values[0].string.text);
- if ((attr = ippFindAttribute(con->request, "device-uri", IPP_TAG_URI)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "device-uri",
+ IPP_TAG_URI)) != NULL)
{
/*
* Do we have a valid device URI?
*/
- httpSeparateURI(attr->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ need_restart_job = 1;
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (!strcmp(method, "file"))
{
cupsdSetString(&printer->device_uri, attr->values[0].string.text);
}
- if ((attr = ippFindAttribute(con->request, "port-monitor", IPP_TAG_KEYWORD)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "port-monitor",
+ IPP_TAG_KEYWORD)) != NULL)
{
ipp_attribute_t *supported; /* port-monitor-supported attribute */
+ need_restart_job = 1;
+
supported = ippFindAttribute(printer->attrs, "port-monitor-supported",
IPP_TAG_KEYWORD);
for (i = 0; i < supported->num_values; i ++)
cupsdClearString(&printer->port_monitor);
}
- if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs",
+ IPP_TAG_BOOLEAN)) != NULL)
{
cupsdLogMessage(CUPSD_LOG_INFO,
"Setting %s printer-is-accepting-jobs to %d (was %d.)",
cupsdAddPrinterHistory(printer);
}
- if ((attr = ippFindAttribute(con->request, "printer-is-shared", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-is-shared",
+ IPP_TAG_BOOLEAN)) != NULL)
{
if (printer->shared && !attr->values[0].boolean)
cupsdSendBrowseDelete(printer);
printer->shared = attr->values[0].boolean;
}
- if ((attr = ippFindAttribute(con->request, "printer-state", IPP_TAG_ENUM)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state",
+ IPP_TAG_ENUM)) != NULL)
{
if (attr->values[0].integer != IPP_PRINTER_IDLE &&
attr->values[0].integer != IPP_PRINTER_STOPPED)
if (attr->values[0].integer == IPP_PRINTER_STOPPED)
cupsdStopPrinter(printer, 0);
else
+ {
+ need_restart_job = 1;
cupsdSetPrinterState(printer, (ipp_pstate_t)(attr->values[0].integer), 0);
+ }
}
- if ((attr = ippFindAttribute(con->request, "printer-state-message", IPP_TAG_TEXT)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "printer-state-message",
+ IPP_TAG_TEXT)) != NULL)
{
strlcpy(printer->state_message, attr->values[0].string.text,
sizeof(printer->state_message));
cupsdAddPrinterHistory(printer);
}
- if ((attr = ippFindAttribute(con->request, "job-sheets-default", IPP_TAG_ZERO)) != NULL &&
+ if ((attr = ippFindAttribute(con->request, "job-sheets-default",
+ IPP_TAG_ZERO)) != NULL &&
!Classification)
{
cupsdSetString(&printer->job_sheets[0], attr->values[0].string.text);
printer->deny_users = 0;
if (attr->value_tag == IPP_TAG_NAME &&
(attr->num_values > 1 ||
- strcmp(attr->values[0].string.text, "all") != 0))
+ strcmp(attr->values[0].string.text, "all")))
for (i = 0; i < attr->num_values; i ++)
cupsdAddPrinterUser(printer, attr->values[i].string.text);
}
printer->deny_users = 1;
if (attr->value_tag == IPP_TAG_NAME &&
(attr->num_values > 1 ||
- strcmp(attr->values[0].string.text, "none") != 0))
+ strcmp(attr->values[0].string.text, "none")))
for (i = 0; i < attr->num_values; i ++)
cupsdAddPrinterUser(printer, attr->values[i].string.text);
}
*/
if (!printer->device_uri)
- cupsdSetString(&printer->device_uri, "file:/dev/null");
+ cupsdSetString(&printer->device_uri, "file:///dev/null");
/*
* See if we have an interface script or PPD file attached to the request...
if (con->filename)
{
+ need_restart_job = 1;
+
strlcpy(srcfile, con->filename, sizeof(srcfile));
- if ((fp = cupsFileOpen(srcfile, "rb")) != NULL)
+ if ((fp = cupsFileOpen(srcfile, "rb")))
{
/*
* Yes; get the first line from it...
}
}
}
- else if ((attr = ippFindAttribute(con->request, "ppd-name", IPP_TAG_NAME)) != NULL)
+ else if ((attr = ippFindAttribute(con->request, "ppd-name",
+ IPP_TAG_NAME)) != NULL)
{
+ need_restart_job = 1;
+
if (!strcmp(attr->values[0].string.text, "raw"))
{
/*
}
}
- /*
- * Make this printer the default if there is none...
- */
-
- if (DefaultPrinter == NULL)
- DefaultPrinter = printer;
-
/*
* Update the printer attributes and return...
*/
cupsdSetPrinterAttrs(printer);
cupsdSaveAllPrinters();
- if (printer->job != NULL)
+ if (need_restart_job && printer->job)
{
cupsd_job_t *job;
job->state->values[0].integer = IPP_JOB_PENDING;
}
- cupsdCheckJobs();
+ if (need_restart_job)
+ cupsdCheckJobs();
cupsdWritePrintcap();
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_MODIFIED, printer, NULL,
"Printer \"%s\" modified by \"%s\".", printer->name,
- con->username);
+ get_username(con));
cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" modified by \"%s\".",
- printer->name, con->username);
+ printer->name, get_username(con));
}
else
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_ADDED, printer, NULL,
"New printer \"%s\" added by \"%s\".", printer->name,
- con->username);
+ get_username(con));
cupsdLogMessage(CUPSD_LOG_INFO, "New printer \"%s\" added by \"%s\".",
- printer->name, con->username);
+ printer->name, get_username(con));
}
con->response->request.status.status_code = IPP_OK;
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (strncmp(resource, "/jobs/", 6))
{
* Reset the job-hold-until value to "no-hold"...
*/
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr != NULL)
+ if (attr)
{
attr->value_tag = IPP_TAG_KEYWORD;
cupsdSetString(&(attr->values[0].string.text), "no-hold");
* "my-jobs" is specified...
*/
- if ((attr = ippFindAttribute(con->request, "my-jobs", IPP_TAG_BOOLEAN)) != NULL &&
+ if ((attr = ippFindAttribute(con->request, "my-jobs",
+ IPP_TAG_BOOLEAN)) != NULL &&
attr->values[0].boolean)
{
- if ((attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "requesting-user-name",
+ IPP_TAG_NAME)) != NULL)
username = attr->values[0].string.text;
else
{
* Look for the "purge-jobs" attribute...
*/
- if ((attr = ippFindAttribute(con->request, "purge-jobs", IPP_TAG_BOOLEAN)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "purge-jobs",
+ IPP_TAG_BOOLEAN)) != NULL)
purge = attr->values[0].boolean;
else
purge = 1;
* And if the destination is valid...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- userpass, sizeof(userpass), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), userpass, sizeof(userpass), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
cupsdCancelJobs(NULL, username, purge);
cupsdLogMessage(CUPSD_LOG_INFO, "All jobs were %s by \"%s\".",
- purge ? "purged" : "cancelled", con->username);
+ purge ? "purged" : "cancelled", get_username(con));
}
else
{
cupsdCancelJobs(dest, username, purge);
cupsdLogMessage(CUPSD_LOG_INFO, "All jobs on \"%s\" were %s by \"%s\".",
- dest, purge ? "purged" : "cancelled", con->username);
+ dest, purge ? "purged" : "cancelled", get_username(con));
}
con->response->request.status.status_code = IPP_OK;
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Find the current job on the specified printer...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
!strcasecmp(job->dest, dest))
break;
- if (job != NULL)
+ if (job)
jobid = job->id;
else
{
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (strncmp(resource, "/jobs/", 6))
{
cupsd_printer_t *p) /* I - Printer or class */
{
int i; /* Looping var */
- ipp_attribute_t *attr; /* Current attribute */
char username[33]; /* Username */
cupsd_quota_t *q; /* Quota data */
struct passwd *pw; /* User password data */
* Check input...
*/
- if (con == NULL || p == NULL)
+ if (!con || !p)
return (0);
/*
* Figure out who is printing...
*/
- attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME);
-
- if (con->username[0])
- strlcpy(username, con->username, sizeof(username));
- else if (attr != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "check_quotas: requesting-user-name = \"%s\"",
- attr->values[0].string.text);
-
- strlcpy(username, attr->values[0].string.text, sizeof(username));
- }
- else
- strcpy(username, "anonymous");
+ strlcpy(username, get_username(con), sizeof(username));
/*
* Check global active job limits for printers and users...
if (toattr->values[i].unknown.length > 0)
{
- if ((toattr->values[i].unknown.data = malloc(toattr->values[i].unknown.length)) == NULL)
+ if ((toattr->values[i].unknown.data =
+ malloc(toattr->values[i].unknown.length)) == NULL)
toattr->values[i].unknown.length = 0;
else
memcpy(toattr->values[i].unknown.data,
*/
static void
-copy_attrs(ipp_t *to, /* I - Destination request */
- ipp_t *from, /* I - Source request */
- ipp_attribute_t *req, /* I - Requested attributes */
- ipp_tag_t group, /* I - Group to copy */
- int quickcopy) /* I - Do a quick copy? */
+copy_attrs(ipp_t *to, /* I - Destination request */
+ ipp_t *from, /* I - Source request */
+ cups_array_t *ra, /* I - Requested attributes */
+ ipp_tag_t group, /* I - Group to copy */
+ int quickcopy) /* I - Do a quick copy? */
{
- int i; /* Looping var */
ipp_attribute_t *fromattr; /* Source attribute */
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_attrs(%p, %p, %p, %x)", to, from,
- req, group);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "copy_attrs(to=%p, from=%p, ra=%p, group=%x, quickcopy=%d)",
+ to, from, ra, group, quickcopy);
- if (to == NULL || from == NULL)
+ if (!to || !from)
return;
- if (req != NULL && strcmp(req->values[0].string.text, "all") == 0)
- req = NULL; /* "all" means no filter... */
-
- for (fromattr = from->attrs; fromattr != NULL; fromattr = fromattr->next)
+ for (fromattr = from->attrs; fromattr; fromattr = fromattr->next)
{
/*
* Filter attributes as needed...
*/
if (group != IPP_TAG_ZERO && fromattr->group_tag != group &&
- fromattr->group_tag != IPP_TAG_ZERO)
+ fromattr->group_tag != IPP_TAG_ZERO && !fromattr->name)
continue;
- if (req != NULL && fromattr->name != NULL)
- {
- for (i = 0; i < req->num_values; i ++)
- if (strcmp(fromattr->name, req->values[i].string.text) == 0)
- break;
-
- if (i == req->num_values)
- continue;
- }
-
- copy_attribute(to, fromattr, quickcopy);
+ if (!ra || cupsArrayFind(ra, fromattr->name))
+ copy_attribute(to, fromattr, quickcopy);
}
}
* Find the banner; return if not found or "none"...
*/
- if (name == NULL ||
- strcmp(name, "none") == 0 ||
+ if (!name || !strcmp(name, "none") ||
(banner = cupsdFindBanner(name)) == NULL)
return (0);
else
s = attrname;
- if (strcmp(s, "printer-name") == 0)
+ if (!strcmp(s, "printer-name"))
{
cupsFilePuts(out, job->dest);
continue;
{
case IPP_TAG_INTEGER :
case IPP_TAG_ENUM :
- if (strncmp(s, "time-at-", 8) == 0)
+ if (!strncmp(s, "time-at-", 8))
cupsFilePuts(out, cupsdGetDateTime(attr->values[i].integer));
else
cupsFilePrintf(out, "%d", attr->values[i].integer);
case IPP_TAG_KEYWORD :
case IPP_TAG_CHARSET :
case IPP_TAG_LANGUAGE :
- if (strcasecmp(banner->filetype->type, "postscript") == 0)
+ if (!strcasecmp(banner->filetype->type, "postscript"))
{
/*
* Need to quote strings for PS banners...
kbytes = (cupsFileTell(out) + 1023) / 1024;
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
attr->values[0].integer += kbytes;
cupsFileClose(out);
int temppid; /* Process ID of cups-driverd */
int temppipe[2]; /* Temporary pipes */
char *argv[4], /* Command-line arguments */
- *envp[100]; /* Environment */
+ *envp[MAX_ENV]; /* Environment */
cups_file_t *src, /* Source file */
*dst; /* Destination file */
int bytes, /* Bytes from pipe */
if (!cupsdStartProcess(buffer, argv, envp, -1, temppipe[1], CGIPipes[1],
-1, 0, &temppid))
{
+ free(input);
close(tempfd);
unlink(tempfile);
return (-1);
close(temppipe[0]);
close(tempfd);
+ free(input);
+
if (!total)
{
/*
have_letter = 0;
have_a4 = 0;
- while (cupsFileGets(src, buffer, sizeof(buffer)) != NULL)
+ while (cupsFileGets(src, buffer, sizeof(buffer)))
if (!strncmp(buffer, "*PageSize ", 10))
{
/*
* Read all of the default lines from the old PPD...
*/
- while (cupsFileGets(dst, buffer, sizeof(buffer)) != NULL)
+ while (cupsFileGets(dst, buffer, sizeof(buffer)))
if (!strncmp(buffer, "*Default", 8))
{
/*
* Copy the source file to the destination...
*/
- while (cupsFileGets(src, buffer, sizeof(buffer)) != NULL)
+ while (cupsFileGets(src, buffer, sizeof(buffer)))
{
if (!strncmp(buffer, "*Default", 8))
{
}
+/*
+ * 'copy_job_attrs()' - Copy job attributes.
+ */
+
+static void
+copy_job_attrs(cupsd_client_t *con, /* I - Client connection */
+ cupsd_job_t *job, /* I - Job */
+ cups_array_t *ra) /* I - Requested attributes array */
+{
+ char job_uri[HTTP_MAX_URI]; /* Job URI */
+
+
+ /*
+ * Send the requested attributes for each job...
+ */
+
+ httpAssembleURIf(HTTP_URI_CODING_ALL, job_uri, sizeof(job_uri), "ipp", NULL,
+ con->servername, con->serverport, "/jobs/%d",
+ job->id);
+
+ if (!ra || cupsArrayFind(ra, "job-more-info"))
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
+ "job-more-info", NULL, job_uri);
+
+ if (job->state->values[0].integer > IPP_JOB_PROCESSING &&
+ (!ra || cupsArrayFind(ra, "job-preserved")))
+ {
+ char filename[1024]; /* Job data file */
+
+
+ snprintf(filename, sizeof(filename), "%s/d%05d-001", RequestRoot,
+ job->id);
+ ippAddBoolean(con->response, IPP_TAG_JOB, "job-preserved",
+ !access(filename, 0));
+ }
+
+ if (!ra || cupsArrayFind(ra, "job-printer-up-time"))
+ ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
+ "job-printer-up-time", time(NULL));
+
+ if (!ra || cupsArrayFind(ra, "job-state-reasons"))
+ add_job_state_reasons(con, job);
+
+ if (!ra || cupsArrayFind(ra, "job-uri"))
+ ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
+ "job-uri", NULL, job_uri);
+
+ copy_attrs(con->response, job->attrs, ra, IPP_TAG_JOB, 0);
+}
+
+
+/*
+ * 'copy_printer_attrs()' - Copy printer attributes.
+ */
+
+static void
+copy_printer_attrs(
+ cupsd_client_t *con, /* I - Client connection */
+ cupsd_printer_t *printer, /* I - Printer */
+ cups_array_t *ra) /* I - Requested attributes array */
+{
+ char printer_uri[HTTP_MAX_URI];
+ /* Printer URI */
+ time_t curtime; /* Current time */
+ int i; /* Looping var */
+ ipp_attribute_t *history; /* History collection */
+
+
+ /*
+ * Copy the printer attributes to the response using requested-attributes
+ * and document-format attributes that may be provided by the client.
+ */
+
+ curtime = time(NULL);
+
+#ifdef __APPLE__
+ if ((!ra || cupsArrayFind(ra, "com.apple.print.recoverable-message")) &&
+ printer->recoverable)
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+ "com.apple.print.recoverable-message", NULL,
+ printer->recoverable);
+#endif /* __APPLE__ */
+
+ if (!ra || cupsArrayFind(ra, "printer-current-time"))
+ ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
+ ippTimeToDate(curtime));
+
+ if (!ra || cupsArrayFind(ra, "printer-error-policy"))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
+ "printer-error-policy", NULL, printer->error_policy);
+
+ if (!ra || cupsArrayFind(ra, "printer-is-accepting-jobs"))
+ ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
+ printer->accepting);
+
+ if (!ra || cupsArrayFind(ra, "printer-is-shared"))
+ ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
+ printer->shared);
+
+ if (!ra || cupsArrayFind(ra, "printer-op-policy"))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
+ "printer-op-policy", NULL, printer->op_policy);
+
+ if (!ra || cupsArrayFind(ra, "printer-state"))
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
+ printer->state);
+
+ if (!ra || cupsArrayFind(ra, "printer-state-change-time"))
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
+ "printer-state-change-time", printer->state_time);
+
+ if (MaxPrinterHistory > 0 && printer->num_history > 0 &&
+ cupsArrayFind(ra, "printer-state-history"))
+ {
+ /*
+ * Printer history is only sent if specifically requested, so that
+ * older CUPS/IPP clients won't barf on the collection attributes.
+ */
+
+ history = ippAddCollections(con->response, IPP_TAG_PRINTER,
+ "printer-state-history",
+ printer->num_history, NULL);
+
+ for (i = 0; i < printer->num_history; i ++)
+ copy_attrs(history->values[i].collection = ippNew(), printer->history[i],
+ NULL, IPP_TAG_ZERO, 0);
+ }
+
+ if (!ra || cupsArrayFind(ra, "printer-state-message"))
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
+ "printer-state-message", NULL, printer->state_message);
+
+ if (!ra || cupsArrayFind(ra, "printer-state-reasons"))
+ add_printer_state_reasons(con, printer);
+
+ if (!ra || cupsArrayFind(ra, "printer-type"))
+ {
+ int type; /* printer-type value */
+
+
+ /*
+ * Add the CUPS-specific printer-type attribute...
+ */
+
+ type = printer->type;
+
+ if (printer == DefaultPrinter)
+ type |= CUPS_PRINTER_DEFAULT;
+
+ if (!printer->accepting)
+ type |= CUPS_PRINTER_REJECTING;
+
+ if (!printer->shared)
+ type |= CUPS_PRINTER_NOT_SHARED;
+
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-type",
+ type);
+ }
+
+ if (!ra || cupsArrayFind(ra, "printer-up-time"))
+ ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
+ "printer-up-time", curtime);
+
+ if ((!ra || cupsArrayFind(ra, "printer-uri-supported")) &&
+ !ippFindAttribute(printer->attrs, "printer-uri-supported",
+ IPP_TAG_URI))
+ {
+ httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri),
+ "ipp", NULL, con->servername, con->serverport,
+ "/printers/%s", printer->name);
+ ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_URI,
+ "printer-uri-supported", NULL, printer_uri);
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "printer-uri-supported=\"%s\"",
+ printer_uri);
+ }
+
+ if (!ra || cupsArrayFind(ra, "queued-job-count"))
+ add_queued_job_count(con, printer);
+
+ copy_attrs(con->response, printer->attrs, ra, IPP_TAG_ZERO, 0);
+ copy_attrs(con->response, CommonData, ra, IPP_TAG_ZERO, IPP_TAG_COPY);
+}
+
+
/*
* 'copy_subscription_attrs()' - Copy subscription attributes.
*/
* requested-attributes attribute that may be provided by the client.
*/
- if (!ra || cupsArrayFind(ra, "notify-subscription-id"))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-subscription-id", sub->id);
-
if (!ra || cupsArrayFind(ra, "notify-events"))
{
if ((name = cupsdEventName((cupsd_eventmask_t)sub->mask)) != NULL)
}
}
- if (!ra || cupsArrayFind(ra, "notify-subscriber-user-name"))
- ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_NAME,
- "notify-subscriber-user-name", NULL, sub->owner);
+ if (sub->job && (!ra || cupsArrayFind(ra, "notify-job-id")))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-job-id", sub->job->id);
+
+ if (!sub->job && (!ra || cupsArrayFind(ra, "notify-lease-duration")))
+ ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
+ "notify-lease-duration", sub->lease);
+
+ if (sub->dest && (!ra || cupsArrayFind(ra, "notify-printer-uri")))
+ {
+ httpAssembleURIf(HTTP_URI_CODING_ALL, printer_uri, sizeof(printer_uri),
+ "ipp", NULL, con->servername, con->serverport,
+ "/printers/%s", sub->dest->name);
+ ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
+ "notify-printer-uri", NULL, printer_uri);
+ }
if (sub->recipient && (!ra || cupsArrayFind(ra, "notify-recipient-uri")))
ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
"notify-pull-method", NULL, "ippget");
- if (sub->user_data_len > 0 && (!ra || cupsArrayFind(ra, "notify-user-data")))
- ippAddOctetString(con->response, IPP_TAG_SUBSCRIPTION, "notify-user-data",
- sub->user_data, sub->user_data_len);
+ if (!ra || cupsArrayFind(ra, "notify-subscriber-user-name"))
+ ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_NAME,
+ "notify-subscriber-user-name", NULL, sub->owner);
- if (!sub->job && (!ra || cupsArrayFind(ra, "notify-lease-duration")))
+ if (!ra || cupsArrayFind(ra, "notify-subscription-id"))
ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-lease-duration", sub->lease);
+ "notify-subscription-id", sub->id);
if (!ra || cupsArrayFind(ra, "notify-time-interval"))
ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
"notify-time-interval", sub->interval);
- if (sub->dest && (!ra || cupsArrayFind(ra, "notify-printer-uri")))
- {
- httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL,
- con->servername, con->serverport, "/printers/%s",
- sub->dest->name);
- ippAddString(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
- "notify-printer-uri", NULL, printer_uri);
- }
-
- if (sub->job && (!ra || cupsArrayFind(ra, "notify-job-id")))
- ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
- "notify-job-id", sub->job->id);
+ if (sub->user_data_len > 0 && (!ra || cupsArrayFind(ra, "notify-user-data")))
+ ippAddOctetString(con->response, IPP_TAG_SUBSCRIPTION, "notify-user-data",
+ sub->user_data, sub->user_data_len);
}
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
* Validate job template attributes; for now just copies and page-ranges...
*/
- if ((attr = ippFindAttribute(con->request, "copies", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "copies",
+ IPP_TAG_INTEGER)) != NULL)
{
if (attr->values[0].integer < 1 || attr->values[0].integer > MaxCopies)
{
}
}
- if ((attr = ippFindAttribute(con->request, "page-ranges", IPP_TAG_RANGE)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "page-ranges",
+ IPP_TAG_RANGE)) != NULL)
{
for (i = 0, lowerpagerange = 1; i < attr->num_values; i ++)
{
* Create the job and set things up...
*/
- if ((attr = ippFindAttribute(con->request, "job-priority", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "job-priority",
+ IPP_TAG_INTEGER)) != NULL)
priority = attr->values[0].integer;
else
ippAddInteger(con->request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-priority",
priority = 50);
- if ((attr = ippFindAttribute(con->request, "job-name", IPP_TAG_NAME)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "job-name",
+ IPP_TAG_NAME)) != NULL)
title = attr->values[0].string.text;
else
ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
save_auth_info(con, job);
}
- else if (attr != NULL)
+ else if (attr)
{
cupsdLogMessage(CUPSD_LOG_DEBUG,
"create_job: requesting-user-name = \"%s\"",
else
cupsdSetString(&job->username, "anonymous");
- if (attr == NULL)
+ if (!attr)
ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
"job-originating-user-name", NULL, job->username);
else
if (attr->value_tag != IPP_TAG_NAME ||
attr->num_values != 1 ||
- strcmp(con->http.hostname, "localhost") != 0)
+ strcmp(con->http.hostname, "localhost"))
{
/*
* Can't override the value if we aren't connected via localhost.
ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
title);
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
attr->values[0].integer = 0;
else
attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
"job-k-octets", 0);
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr == NULL)
+ if (!attr)
attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
"job-hold-until", NULL, "no-hold");
- if (attr != NULL && strcmp(attr->values[0].string.text, "no-hold") != 0 &&
+ if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
!(printer->type & CUPS_PRINTER_REMOTE))
{
/*
* Add job sheets options...
*/
- if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) == NULL)
{
cupsdLogMessage(CUPSD_LOG_DEBUG,
"Adding default job-sheets values \"%s,%s\"...",
job->id, Classification, job->username);
}
else if (attr->num_values == 2 &&
- strcmp(attr->values[0].string.text, attr->values[1].string.text) != 0 &&
- strcmp(attr->values[0].string.text, "none") != 0 &&
- strcmp(attr->values[1].string.text, "none") != 0)
+ strcmp(attr->values[0].string.text,
+ attr->values[1].string.text) &&
+ strcmp(attr->values[0].string.text, "none") &&
+ strcmp(attr->values[1].string.text, "none"))
{
/*
* Can't put two different security markings on the same document!
attr->values[1].string.text, job->username);
}
}
- else if (strcmp(attr->values[0].string.text, Classification) != 0 &&
+ else if (strcmp(attr->values[0].string.text, Classification) &&
(attr->num_values == 1 ||
- strcmp(attr->values[1].string.text, Classification) != 0))
+ strcmp(attr->values[1].string.text, Classification)))
{
/*
* Force the banner to have the classification on it...
cupsdUpdateQuota(printer, job->username, 0, kbytes);
}
}
- else if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) != NULL)
+ else if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) != NULL)
job->sheets = attr;
/*
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- userpass, sizeof(userpass), host, sizeof(host), &port,
- resource, sizeof(resource));
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "cupsdCreateSubscription(con=%p(%d), uri=\"%s\")",
+ con, con->http.fd, uri->values[0].string.text);
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), userpass, sizeof(userpass), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (!strcmp(resource, "/"))
{
* Get the user that is requesting the subscription...
*/
- if (con->username[0])
- username = con->username;
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name",
- IPP_TAG_NAME)) != NULL)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "create_subscription: requesting-user-name = \"%s\"",
- attr->values[0].string.text);
-
- username = attr->values[0].string.text;
- }
- else
- username = "anonymous";
+ username = get_username(con);
/*
* Find the first subscription group attribute; return if we have
* Process the subscription attributes in the request...
*/
+ con->response->request.status.status_code = IPP_BAD_REQUEST;
+
while (attr)
{
recipient = NULL;
attr = attr->next;
}
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "recipient=\"%s\"", recipient);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "pullmethod=\"%s\"", pullmethod);
+
if (!recipient && !pullmethod)
break;
sub = cupsdAddSubscription(mask, printer, job, recipient, 0);
+ if (job)
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for job %d",
+ sub->id, job->id);
+ else if (printer)
+ cupsdLogMessage(CUPSD_LOG_DEBUG,
+ "Added subscription %d for printer \"%s\"",
+ sub->id, printer->name);
+ else
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Added subscription %d for server",
+ sub->id);
+
sub->interval = interval;
sub->lease = lease;
sub->expire = time(NULL) + lease;
ippAddInteger(con->response, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
"notify-subscription-id", sub->id);
+ con->response->request.status.status_code = IPP_OK;
+
if (attr)
attr = attr->next;
}
cupsdSaveAllSubscriptions();
- con->response->request.status.status_code = IPP_OK;
}
* Do we have a valid URI?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
cupsdAddEvent(CUPSD_EVENT_PRINTER_DELETED, printer, NULL,
"%s \"%s\" deleted by \"%s\".",
(dtype & CUPS_PRINTER_CLASS) ? "Class" : "Printer",
- dest, con->username);
+ dest, get_username(con));
cupsdExpireSubscriptions(printer, NULL);
if (dtype & CUPS_PRINTER_CLASS)
{
cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" deleted by \"%s\".", dest,
- con->username);
+ get_username(con));
cupsdDeletePrinter(printer, 0);
cupsdSaveAllClasses();
else
{
cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" deleted by \"%s\".", dest,
- con->username);
+ get_username(con));
cupsdDeletePrinter(printer, 0);
cupsdSaveAllPrinters();
static void
get_default(cupsd_client_t *con) /* I - Client connection */
{
- http_status_t status; /* Policy status */
- int i; /* Looping var */
- ipp_attribute_t *requested, /* requested-attributes */
- *history; /* History collection */
- int need_history; /* Need to send history collection? */
- char printer_uri[HTTP_MAX_URI];
- /* Printer URI */
- time_t curtime; /* Current time */
+ http_status_t status; /* Policy status */
+ cups_array_t *ra; /* Requested attributes array */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_default(%p[%d])", con, con->http.fd);
return;
}
- if (DefaultPrinter != NULL)
+ if (DefaultPrinter)
{
- /*
- * Copy the printer attributes to the response using requested-attributes
- * and document-format attributes that may be provided by the client.
- */
+ ra = create_requested_array(con->request);
- if (!ippFindAttribute(DefaultPrinter->attrs, "printer-uri-supported",
- IPP_TAG_URI))
- {
- httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL,
- con->servername, con->serverport, "/printers/%s",
- DefaultPrinter->name);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_URI,
- "printer-uri-supported", NULL, printer_uri);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "printer-uri-supported=\"%s\"",
- printer_uri);
- }
+ copy_printer_attrs(con, DefaultPrinter, ra);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
- DefaultPrinter->state);
-
- add_printer_state_reasons(con, DefaultPrinter);
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
- "printer-state-message", NULL, DefaultPrinter->state_message);
-
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
- DefaultPrinter->accepting);
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
- DefaultPrinter->shared);
-
- curtime = time(NULL);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-up-time", curtime);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-state-change-time", DefaultPrinter->state_time);
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-error-policy", NULL, DefaultPrinter->error_policy);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-op-policy", NULL, DefaultPrinter->op_policy);
+ cupsArrayDelete(ra);
- add_queued_job_count(con, DefaultPrinter);
-
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
-
- copy_attrs(con->response, DefaultPrinter->attrs, requested, IPP_TAG_ZERO, 0);
- copy_attrs(con->response, CommonData, requested, IPP_TAG_ZERO, IPP_TAG_COPY);
-
- need_history = 0;
-
- if (MaxPrinterHistory > 0 && DefaultPrinter->num_history > 0 && requested)
- {
- for (i = 0; i < requested->num_values; i ++)
- if (!strcmp(requested->values[i].string.text, "all") ||
- !strcmp(requested->values[i].string.text, "printer-state-history"))
- {
- need_history = 1;
- break;
- }
- }
-
- if (need_history)
- {
- history = ippAddCollections(con->response, IPP_TAG_PRINTER,
- "printer-state-history",
- DefaultPrinter->num_history, NULL);
-
- for (i = 0; i < DefaultPrinter->num_history; i ++)
- copy_attrs(history->values[i].collection = ippNew(),
- DefaultPrinter->history[i],
- NULL, IPP_TAG_ZERO, 0);
- }
-
- con->response->request.status.status_code = requested ? IPP_OK_SUBST : IPP_OK;
+ con->response->request.status.status_code = IPP_OK;
}
else
send_ipp_status(con, IPP_NOT_FOUND, _("No default printer"));
snprintf(command, sizeof(command), "%s/daemon/cups-deviced", ServerBin);
snprintf(options, sizeof(options),
- "cups-deviced %d+%d+requested-attributes=%s",
+ "cups-deviced %d+%d+%d+requested-attributes=%s",
con->request->request.op.request_id,
- limit ? limit->values[0].integer : 0,
+ limit ? limit->values[0].integer : 0, User,
attrs);
if (cupsdSendCommand(con, command, options, 1))
}
+/*
+ * 'get_job_attrs()' - Get job attributes.
+ */
+
+static void
+get_job_attrs(cupsd_client_t *con, /* I - Client connection */
+ ipp_attribute_t *uri) /* I - Job URI */
+{
+ http_status_t status; /* Policy status */
+ ipp_attribute_t *attr; /* Current attribute */
+ int jobid; /* Job ID */
+ cupsd_job_t *job; /* Current job */
+ char method[HTTP_MAX_URI], /* Method portion of URI */
+ username[HTTP_MAX_URI], /* Username portion of URI */
+ host[HTTP_MAX_URI], /* Host portion of URI */
+ resource[HTTP_MAX_URI]; /* Resource portion of URI */
+ int port; /* Port portion of URI */
+ cups_array_t *ra; /* Requested attributes array */
+
+
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_job_attrs(%p[%d], %s)", con,
+ con->http.fd, uri->values[0].string.text);
+
+ /*
+ * See if we have a job URI or a printer URI...
+ */
+
+ if (!strcmp(uri->name, "printer-uri"))
+ {
+ /*
+ * Got a printer URI; see if we also have a job-id attribute...
+ */
+
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
+ {
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Got a printer-uri attribute but no job-id!"));
+ return;
+ }
+
+ jobid = attr->values[0].integer;
+ }
+ else
+ {
+ /*
+ * Got a job URI; parse it to get the job ID...
+ */
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
+ if (strncmp(resource, "/jobs/", 6))
+ {
+ /*
+ * Not a valid URI!
+ */
+
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("Bad job-uri attribute \"%s\"!"),
+ uri->values[0].string.text);
+ return;
+ }
+
+ jobid = atoi(resource + 6);
+ }
+
+ /*
+ * See if the job exists...
+ */
+
+ if ((job = cupsdFindJob(jobid)) == NULL)
+ {
+ /*
+ * Nope - return a "not found" error...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
+ return;
+ }
+
+ /*
+ * Check policy...
+ */
+
+ if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return;
+ }
+
+ /*
+ * Copy attributes...
+ */
+
+ ra = create_requested_array(con->request);
+ copy_job_attrs(con, job, ra);
+ cupsArrayDelete(ra);
+
+ con->response->request.status.status_code = IPP_OK;
+}
+
+
/*
* 'get_jobs()' - Get a list of jobs for the specified printer.
*/
ipp_attribute_t *uri) /* I - Printer URI */
{
http_status_t status; /* Policy status */
- ipp_attribute_t *attr, /* Current attribute */
- *requested; /* Requested attributes */
+ ipp_attribute_t *attr; /* Current attribute */
const char *dest; /* Destination */
cups_ptype_t dtype; /* Destination type (printer or class) */
cups_ptype_t dmask; /* Destination type mask */
int limit; /* Maximum number of jobs to return */
int count; /* Number of jobs that match */
cupsd_job_t *job; /* Current job pointer */
- char job_uri[HTTP_MAX_URI]; /* Job URI... */
cupsd_printer_t *printer; /* Printer */
cups_array_t *list; /* Which job list... */
+ cups_array_t *ra; /* Requested attributes array */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs(%p[%d], %s)", con, con->http.fd,
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strcmp(resource, "/") == 0 ||
- (strncmp(resource, "/jobs", 5) == 0 && strlen(resource) <= 6))
+ if (!strcmp(resource, "/") ||
+ (!strncmp(resource, "/jobs", 5) && strlen(resource) <= 6))
{
dest = NULL;
dtype = (cups_ptype_t)0;
dmask = (cups_ptype_t)0;
printer = NULL;
}
- else if (strncmp(resource, "/printers", 9) == 0 && strlen(resource) <= 10)
+ else if (!strncmp(resource, "/printers", 9) && strlen(resource) <= 10)
{
dest = NULL;
dtype = (cups_ptype_t)0;
dmask = CUPS_PRINTER_CLASS;
printer = NULL;
}
- else if (strncmp(resource, "/classes", 8) == 0 && strlen(resource) <= 9)
+ else if (!strncmp(resource, "/classes", 8) && strlen(resource) <= 9)
{
dest = NULL;
dtype = CUPS_PRINTER_CLASS;
* See if the "which-jobs" attribute have been specified...
*/
- if ((attr = ippFindAttribute(con->request, "which-jobs", IPP_TAG_KEYWORD)) != NULL &&
+ if ((attr = ippFindAttribute(con->request, "which-jobs",
+ IPP_TAG_KEYWORD)) != NULL &&
!strcmp(attr->values[0].string.text, "completed"))
{
completed = 1;
* See if they want to limit the number of jobs reported...
*/
- if ((attr = ippFindAttribute(con->request, "limit", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "limit",
+ IPP_TAG_INTEGER)) != NULL)
limit = attr->values[0].integer;
else
limit = 1000000;
* See if we only want to see jobs for a specific user...
*/
- if ((attr = ippFindAttribute(con->request, "my-jobs", IPP_TAG_BOOLEAN)) != NULL &&
+ if ((attr = ippFindAttribute(con->request, "my-jobs",
+ IPP_TAG_BOOLEAN)) != NULL &&
attr->values[0].boolean)
- {
- if (con->username[0])
- strlcpy(username, con->username, sizeof(username));
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME)) != NULL)
- strlcpy(username, attr->values[0].string.text, sizeof(username));
- else
- strcpy(username, "anonymous");
- }
+ strlcpy(username, get_username(con), sizeof(username));
else
username[0] = '\0';
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
+ ra = create_requested_array(con->request);
/*
* OK, build a list of jobs for this printer...
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: job->id = %d", job->id);
- if ((dest != NULL && strcmp(job->dest, dest) != 0) &&
- (job->printer == NULL || dest == NULL ||
- strcmp(job->printer->name, dest) != 0))
+ if ((dest && strcmp(job->dest, dest)) &&
+ (!job->printer || !dest || strcmp(job->printer->name, dest)))
continue;
if ((job->dtype & dmask) != dtype &&
- (job->printer == NULL || (job->printer->type & dmask) != dtype))
+ (!job->printer || (job->printer->type & dmask) != dtype))
continue;
- if (username[0] != '\0' && strcasecmp(username, job->username) != 0)
+ if (username[0] && strcasecmp(username, job->username))
continue;
if (completed && job->state->values[0].integer <= IPP_JOB_STOPPED)
if (job->id < first_job_id)
continue;
+ if (count > 0)
+ ippAddSeparator(con->response);
+
count ++;
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
- /*
- * Send the requested attributes for each job...
- */
-
- snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d", ServerName,
- LocalPort, job->id);
-
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-more-info", NULL, job_uri);
-
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-uri", NULL, job_uri);
-
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-printer-up-time", time(NULL));
-
- /*
- * Copy the job attributes to the response using the requested-attributes
- * attribute that may be provided by the client.
- */
-
- copy_attrs(con->response, job->attrs, requested, IPP_TAG_JOB, 0);
-
- add_job_state_reasons(con, job);
-
- ippAddSeparator(con->response);
- }
-
- if (requested != NULL)
- con->response->request.status.status_code = IPP_OK_SUBST;
- else
- con->response->request.status.status_code = IPP_OK;
-}
-
-
-/*
- * 'get_job_attrs()' - Get job attributes.
- */
-
-static void
-get_job_attrs(cupsd_client_t *con, /* I - Client connection */
- ipp_attribute_t *uri) /* I - Job URI */
-{
- http_status_t status; /* Policy status */
- ipp_attribute_t *attr, /* Current attribute */
- *requested; /* Requested attributes */
- int jobid; /* Job ID */
- cupsd_job_t *job; /* Current job */
- char method[HTTP_MAX_URI], /* Method portion of URI */
- username[HTTP_MAX_URI], /* Username portion of URI */
- host[HTTP_MAX_URI], /* Host portion of URI */
- resource[HTTP_MAX_URI]; /* Resource portion of URI */
- int port; /* Port portion of URI */
- char job_uri[HTTP_MAX_URI]; /* Job URI... */
-
-
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_job_attrs(%p[%d], %s)", con,
- con->http.fd, uri->values[0].string.text);
-
- /*
- * See if we have a job URI or a printer URI...
- */
-
- if (strcmp(uri->name, "printer-uri") == 0)
- {
- /*
- * Got a printer URI; see if we also have a job-id attribute...
- */
-
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
- {
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Got a printer-uri attribute but no job-id!"));
- return;
- }
-
- jobid = attr->values[0].integer;
- }
- else
- {
- /*
- * Got a job URI; parse it to get the job ID...
- */
-
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
- if (strncmp(resource, "/jobs/", 6) != 0)
- {
- /*
- * Not a valid URI!
- */
-
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Bad job-uri attribute \"%s\"!"),
- uri->values[0].string.text);
- return;
- }
-
- jobid = atoi(resource + 6);
- }
-
- /*
- * See if the job exists...
- */
-
- if ((job = cupsdFindJob(jobid)) == NULL)
- {
- /*
- * Nope - return a "not found" error...
- */
-
- send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid);
- return;
- }
-
- /*
- * Check policy...
- */
-
- if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
+ copy_job_attrs(con, job, ra);
}
- /*
- * Put out the standard attributes...
- */
-
- snprintf(job_uri, sizeof(job_uri), "http://%s:%d/jobs/%d",
- ServerName, LocalPort, job->id);
-
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job->id);
-
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-more-info", NULL, job_uri);
-
- ippAddString(con->response, IPP_TAG_JOB, IPP_TAG_URI,
- "job-uri", NULL, job_uri);
-
- ippAddInteger(con->response, IPP_TAG_JOB, IPP_TAG_INTEGER,
- "job-printer-up-time", time(NULL));
-
- /*
- * Copy the job attributes to the response using the requested-attributes
- * attribute that may be provided by the client.
- */
-
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
-
- copy_attrs(con->response, job->attrs, requested, IPP_TAG_JOB, 0);
-
- add_job_state_reasons(con, job);
+ cupsArrayDelete(ra);
- if (requested != NULL)
- con->response->request.status.status_code = IPP_OK_SUBST;
- else
- con->response->request.status.status_code = IPP_OK;
+ con->response->request.status.status_code = IPP_OK;
}
/* Resource portion of URI */
int port; /* Port portion of URI */
cupsd_printer_t *printer; /* Printer/class */
- char printer_uri[HTTP_MAX_URI];
- /* Printer URI */
- time_t curtime; /* Current time */
- int i; /* Looping var */
- ipp_attribute_t *requested, /* requested-attributes */
- *history; /* History collection */
- int need_history; /* Need to send history collection? */
+ cups_array_t *ra; /* Requested attributes array */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_printer_attrs(%p[%d], %s)", con,
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
return;
}
- curtime = time(NULL);
-
/*
- * Copy the printer attributes to the response using requested-attributes
- * and document-format attributes that may be provided by the client.
+ * Send the attributes...
*/
- if (!ippFindAttribute(printer->attrs, "printer-uri-supported",
- IPP_TAG_URI))
- {
- httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL,
- con->servername, con->serverport, "/printers/%s",
- printer->name);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_URI,
- "printer-uri-supported", NULL, printer_uri);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "printer-uri-supported=\"%s\"",
- printer_uri);
- }
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
- printer->state);
-
- add_printer_state_reasons(con, printer);
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
- "printer-state-message", NULL, printer->state_message);
-
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
- printer->accepting);
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
- printer->shared);
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-up-time", curtime);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-state-change-time", printer->state_time);
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-error-policy", NULL, printer->error_policy);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-op-policy", NULL, printer->op_policy);
-
- add_queued_job_count(con, printer);
-
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
-
- copy_attrs(con->response, printer->attrs, requested, IPP_TAG_ZERO, 0);
- copy_attrs(con->response, CommonData, requested, IPP_TAG_ZERO, IPP_TAG_COPY);
-
- need_history = 0;
-
- if (MaxPrinterHistory > 0 && printer->num_history > 0 && requested)
- {
- for (i = 0; i < requested->num_values; i ++)
- if (!strcmp(requested->values[i].string.text, "all") ||
- !strcmp(requested->values[i].string.text, "printer-state-history"))
- {
- need_history = 1;
- break;
- }
- }
+ ra = create_requested_array(con->request);
- if (need_history)
- {
- history = ippAddCollections(con->response, IPP_TAG_PRINTER,
- "printer-state-history",
- printer->num_history, NULL);
+ copy_printer_attrs(con, printer, ra);
- for (i = 0; i < printer->num_history; i ++)
- copy_attrs(history->values[i].collection = ippNew(), printer->history[i],
- NULL, IPP_TAG_ZERO, 0);
- }
+ cupsArrayDelete(ra);
- con->response->request.status.status_code = requested ? IPP_OK_SUBST : IPP_OK;
+ con->response->request.status.status_code = IPP_OK;
}
int type) /* I - 0 or CUPS_PRINTER_CLASS */
{
http_status_t status; /* Policy status */
- int i; /* Looping var */
- ipp_attribute_t *requested, /* requested-attributes */
- *history, /* History collection */
- *attr; /* Current attribute */
- int need_history; /* Need to send history collection? */
+ ipp_attribute_t *attr; /* Current attribute */
int limit; /* Maximum number of printers to return */
int count; /* Number of printers that match */
cupsd_printer_t *printer; /* Current printer pointer */
- time_t curtime; /* Current time */
int printer_type, /* printer-type attribute */
printer_mask; /* printer-type-mask attribute */
char *location; /* Location string */
const char *username; /* Current user */
char *first_printer_name; /* first-printer-name attribute */
- char printer_uri[HTTP_MAX_URI];
- /* Printer URI */
+ cups_array_t *ra; /* Requested attributes array */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_printers(%p[%d], %x)", con,
con->http.fd, type);
- if (!Printers || !cupsArrayCount(Printers))
+ /*
+ * Check policy...
+ */
+
+ if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
{
- send_ipp_status(con, IPP_NOT_FOUND, _("No destinations added."));
+ send_http_error(con, status);
return;
}
/*
- * Check policy...
+ * Check for printers...
*/
- if ((status = cupsdCheckPolicy(DefaultPolicyPtr, con, NULL)) != HTTP_OK)
+ if (!Printers || !cupsArrayCount(Printers))
{
- send_http_error(con, status);
+ send_ipp_status(con, IPP_NOT_FOUND, _("No destinations added."));
return;
}
* See if they want to limit the number of printers reported...
*/
- if ((attr = ippFindAttribute(con->request, "limit", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "limit",
+ IPP_TAG_INTEGER)) != NULL)
limit = attr->values[0].integer;
else
limit = 10000000;
else
username = NULL;
- requested = ippFindAttribute(con->request, "requested-attributes",
- IPP_TAG_KEYWORD);
-
- need_history = 0;
-
- if (MaxPrinterHistory > 0 && requested)
- {
- for (i = 0; i < requested->num_values; i ++)
- if (!strcmp(requested->values[i].string.text, "all") ||
- !strcmp(requested->values[i].string.text, "printer-state-history"))
- {
- need_history = 1;
- break;
- }
- }
+ ra = create_requested_array(con->request);
/*
* OK, build a list of printers for this printer...
*/
- curtime = time(NULL);
-
if (first_printer_name)
{
if ((printer = cupsdFindDest(first_printer_name)) == NULL)
printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
for (count = 0;
- count < limit && printer != NULL;
+ count < limit && printer;
printer = (cupsd_printer_t *)cupsArrayNext(Printers))
+ {
if ((!type || (printer->type & CUPS_PRINTER_CLASS) == type) &&
(printer->type & printer_mask) == printer_type &&
- (location == NULL || printer->location == NULL ||
+ (!location || !printer->location ||
!strcasecmp(printer->location, location)))
{
/*
count ++;
/*
- * Send the following attributes for each printer:
- *
- * printer-state
- * printer-state-message
- * printer-is-accepting-jobs
- * printer-is-shared
- * printer-up-time
- * printer-state-change-time
- * + all printer attributes
+ * Send the attributes...
*/
- if (!ippFindAttribute(printer->attrs, "printer-uri-supported",
- IPP_TAG_URI))
- {
- httpAssembleURIf(printer_uri, sizeof(printer_uri), "ipp", NULL,
- con->servername, con->serverport, "/printers/%s",
- printer->name);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_URI,
- "printer-uri-supported", NULL, printer_uri);
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "printer-uri-supported=\"%s\"", printer_uri);
- }
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_ENUM,
- "printer-state", printer->state);
-
- add_printer_state_reasons(con, printer);
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_TEXT,
- "printer-state-message", NULL, printer->state_message);
-
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
- printer->accepting);
- ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
- printer->shared);
-
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-up-time", curtime);
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_INTEGER,
- "printer-state-change-time", printer->state_time);
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-error-policy", NULL, printer->error_policy);
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
- "printer-op-policy", NULL, printer->op_policy);
-
- add_queued_job_count(con, printer);
-
- copy_attrs(con->response, printer->attrs, requested, IPP_TAG_ZERO, 0);
-
- copy_attrs(con->response, CommonData, requested, IPP_TAG_ZERO,
- IPP_TAG_COPY);
-
- if (need_history && printer->num_history > 0)
- {
- history = ippAddCollections(con->response, IPP_TAG_PRINTER,
- "printer-state-history",
- printer->num_history, NULL);
-
- for (i = 0; i < printer->num_history; i ++)
- copy_attrs(history->values[i].collection = ippNew(),
- printer->history[i], NULL, IPP_TAG_ZERO, 0);
- }
+ copy_printer_attrs(con, printer, ra);
}
+ }
+
+ cupsArrayDelete(ra);
- con->response->request.status.status_code = requested ? IPP_OK_SUBST : IPP_OK;
+ con->response->request.status.status_code = IPP_OK;
}
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (!strcmp(resource, "/") ||
(!strncmp(resource, "/jobs", 5) && strlen(resource) <= 6) ||
ra = create_requested_array(con->request);
- if ((attr = ippFindAttribute(con->request, "limit", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "limit",
+ IPP_TAG_INTEGER)) != NULL)
limit = attr->values[0].integer;
else
limit = 0;
if ((attr = ippFindAttribute(con->request, "my-subscriptions",
IPP_TAG_BOOLEAN)) != NULL &&
attr->values[0].boolean)
- {
- if (con->username[0])
- strlcpy(username, con->username, sizeof(username));
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name", IPP_TAG_NAME)) != NULL)
- strlcpy(username, attr->values[0].string.text, sizeof(username));
- else
- strcpy(username, "anonymous");
- }
+ strlcpy(username, get_username(con), sizeof(username));
else
username[0] = '\0';
}
+/*
+ * 'get_username()' - Get the username associated with a request.
+ */
+
+static const char * /* O - Username */
+get_username(cupsd_client_t *con) /* I - Connection */
+{
+ ipp_attribute_t *attr; /* Attribute */
+
+
+ if (con->username[0])
+ return (con->username);
+ else if ((attr = ippFindAttribute(con->request, "requesting-user-name",
+ IPP_TAG_NAME)) != NULL)
+ return (attr->values[0].string.text);
+ else
+ return ("anonymous");
+}
+
+
/*
* 'hold_job()' - Hold a print job.
*/
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (strncmp(resource, "/jobs/", 6))
{
IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr != NULL)
+ if (attr)
{
/*
* Free the old hold value and copy the new one over...
free(attr->values[0].string.text);
- if (newattr != NULL)
+ if (newattr)
{
attr->value_tag = newattr->value_tag;
attr->values[0].string.text = strdup(newattr->values[0].string.text);
ipp_attribute_t *attr; /* Current attribute */
int jobid; /* Job ID */
cupsd_job_t *job; /* Current job */
- const char *dest; /* Destination */
- cups_ptype_t dtype; /* Destination type (printer or class) */
+ const char *src, /* Source printer/class */
+ *dest; /* Destination */
+ cups_ptype_t stype, /* Source type (printer or class) */
+ dtype; /* Destination type (printer or class) */
char method[HTTP_MAX_URI], /* Method portion of URI */
username[HTTP_MAX_URI], /* Username portion of URI */
host[HTTP_MAX_URI], /* Host portion of URI */
resource[HTTP_MAX_URI]; /* Resource portion of URI */
int port; /* Port portion of URI */
- cupsd_printer_t *printer; /* Printer */
+ cupsd_printer_t *sprinter, /* Source printer */
+ *dprinter; /* Destination printer */
cupsdLogMessage(CUPSD_LOG_DEBUG2, "move_job(%p[%d], %s)", con, con->http.fd,
uri->values[0].string.text);
+ /*
+ * Get the new printer or class...
+ */
+
+ if ((attr = ippFindAttribute(con->request, "job-printer-uri",
+ IPP_TAG_URI)) == NULL)
+ {
+ /*
+ * Need job-printer-uri...
+ */
+
+ send_ipp_status(con, IPP_BAD_REQUEST,
+ _("job-printer-uri attribute missing!"));
+ return;
+ }
+
+ httpSeparateURI(HTTP_URI_CODING_ALL, attr->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
+ if ((dest = cupsdValidateDest(host, resource, &dtype, &dprinter)) == NULL)
+ {
+ /*
+ * Bad URI...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
+ }
+
+ /*
+ * Check policy...
+ */
+
+ if ((status = cupsdCheckPolicy(dprinter->op_policy_ptr, con, NULL)) != HTTP_OK)
+ {
+ send_http_error(con, status);
+ return;
+ }
+
/*
* See if we have a job URI or a printer URI...
*/
- if (strcmp(uri->name, "printer-uri") == 0)
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
+
+ if (!strcmp(uri->name, "printer-uri"))
{
/*
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("Got a printer-uri attribute but no job-id!"));
- return;
+ /*
+ * Move all jobs...
+ */
+
+ if ((src = cupsdValidateDest(host, resource, &stype, &sprinter)) == NULL)
+ {
+ /*
+ * Bad URI...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("The printer or class was not found."));
+ return;
+ }
+
+ job = NULL;
}
+ else
+ {
+ /*
+ * Otherwise, just move a single job...
+ */
- jobid = attr->values[0].integer;
+ if ((job = cupsdFindJob(attr->values[0].integer)) == NULL)
+ {
+ /*
+ * Nope - return a "not found" error...
+ */
+
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("Job #%d does not exist!"), attr->values[0].integer);
+ return;
+ }
+ else
+ {
+ /*
+ * Job found, initialize source pointers...
+ */
+
+ src = NULL;
+ sprinter = NULL;
+ }
+ }
}
else
{
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
-
if (strncmp(resource, "/jobs/", 6))
{
/*
return;
}
+ /*
+ * See if the job exists...
+ */
+
jobid = atoi(resource + 6);
- }
- /*
- * See if the job exists...
- */
+ if ((job = cupsdFindJob(jobid)) == NULL)
+ {
+ /*
+ * Nope - return a "not found" error...
+ */
- if ((job = cupsdFindJob(jobid)) == NULL)
- {
- /*
- * Nope - return a "not found" error...
- */
+ send_ipp_status(con, IPP_NOT_FOUND,
+ _("Job #%d does not exist!"), jobid);
+ return;
+ }
+ else
+ {
+ /*
+ * Job found, initialize source pointers...
+ */
- send_ipp_status(con, IPP_NOT_FOUND,
- _("Job #%d does not exist!"), jobid);
- return;
+ src = NULL;
+ sprinter = NULL;
+ }
}
/*
- * See if the job has been completed...
+ * Now move the job or jobs...
*/
- if (job->state->values[0].integer > IPP_JOB_STOPPED)
+ if (job)
{
/*
- * Return a "not-possible" error...
+ * See if the job has been completed...
*/
- send_ipp_status(con, IPP_NOT_POSSIBLE,
- _("Job #%d is finished and cannot be altered!"),
- jobid);
- return;
- }
-
- /*
- * See if the job is owned by the requesting user...
- */
+ if (job->state->values[0].integer > IPP_JOB_STOPPED)
+ {
+ /*
+ * Return a "not-possible" error...
+ */
- if (!validate_user(job, con, job->username, username, sizeof(username)))
- {
- send_ipp_status(con, IPP_FORBIDDEN,
- _("You are not authorized to move job #%d owned "
- "by \"%s\"!"),
- jobid, job->username);
- return;
- }
+ send_ipp_status(con, IPP_NOT_POSSIBLE,
+ _("Job #%d is finished and cannot be altered!"),
+ job->id);
+ return;
+ }
- if ((attr = ippFindAttribute(con->request, "job-printer-uri", IPP_TAG_URI)) == NULL)
- {
/*
- * Need job-printer-uri...
+ * See if the job is owned by the requesting user...
*/
- send_ipp_status(con, IPP_BAD_REQUEST,
- _("job-printer-uri attribute missing!"));
- return;
- }
-
- /*
- * Get the new printer or class...
- */
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
+ {
+ send_ipp_status(con, IPP_FORBIDDEN,
+ _("You are not authorized to move job #%d owned "
+ "by \"%s\"!"),
+ job->id, job->username);
+ return;
+ }
- httpSeparateURI(attr->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ /*
+ * Move the job to a different printer or class...
+ */
- if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
+ cupsdMoveJob(job, dest);
+ }
+ else
{
/*
- * Bad URI...
+ * Got the source printer, now look through the jobs...
*/
- send_ipp_status(con, IPP_NOT_FOUND,
- _("The printer or class was not found."));
- return;
- }
+ for (job = (cupsd_job_t *)cupsArrayFirst(Jobs);
+ job;
+ job = (cupsd_job_t *)cupsArrayNext(Jobs))
+ {
+ /*
+ * See if the job is pointing at the source printer or has not been
+ * completed...
+ */
- /*
- * Check policy...
- */
+ if (strcasecmp(job->dest, src) ||
+ job->state->values[0].integer > IPP_JOB_STOPPED)
+ continue;
- if ((status = cupsdCheckPolicy(printer->op_policy_ptr, con, NULL)) != HTTP_OK)
- {
- send_http_error(con, status);
- return;
- }
+ /*
+ * See if the job can be moved by the requesting user...
+ */
- /*
- * Move the job to a different printer or class...
- */
+ if (!validate_user(job, con, job->username, username, sizeof(username)))
+ continue;
+
+ /*
+ * Move the job to a different printer or class...
+ */
- cupsdMoveJob(job, dest);
+ cupsdMoveJob(job, dest);
+ }
+ }
/*
* Start jobs if possible...
* Validate job template attributes; for now just copies and page-ranges...
*/
- if ((attr = ippFindAttribute(con->request, "copies", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "copies",
+ IPP_TAG_INTEGER)) != NULL)
{
if (attr->values[0].integer < 1 || attr->values[0].integer > MaxCopies)
{
}
}
- if ((attr = ippFindAttribute(con->request, "page-ranges", IPP_TAG_RANGE)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "page-ranges",
+ IPP_TAG_RANGE)) != NULL)
{
for (i = 0, lowerpagerange = 1; i < attr->num_values; i ++)
{
compression = CUPS_FILE_NONE;
- if ((attr = ippFindAttribute(con->request, "compression", IPP_TAG_KEYWORD)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "compression",
+ IPP_TAG_KEYWORD)) != NULL)
{
if (strcmp(attr->values[0].string.text, "none")
#ifdef HAVE_LIBZ
filetype = mimeFileType(MimeDatabase, con->filename, &compression);
- if (filetype != NULL)
+ if (filetype)
{
/*
* Replace the document-format attribute value with the auto-typed one.
snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
filetype->type);
- if (format != NULL)
+ if (format)
{
free(format->values[0].string.text);
format->values[0].string.text = strdup(mimetype);
else
filetype = mimeType(MimeDatabase, super, type);
- if (filetype == NULL)
+ if (!filetype)
{
send_ipp_status(con, IPP_DOCUMENT_FORMAT,
_("Unsupported format \'%s/%s\'!"), super, type);
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((dest = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
* Create the job and set things up...
*/
- if ((attr = ippFindAttribute(con->request, "job-priority", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "job-priority",
+ IPP_TAG_INTEGER)) != NULL)
priority = attr->values[0].integer;
else
ippAddInteger(con->request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-priority",
priority = 50);
- if ((attr = ippFindAttribute(con->request, "job-name", IPP_TAG_NAME)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "job-name",
+ IPP_TAG_NAME)) != NULL)
title = attr->values[0].string.text;
else
ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
save_auth_info(con, job);
}
- else if (attr != NULL)
+ else if (attr)
{
cupsdLogMessage(CUPSD_LOG_DEBUG, "print_job: requesting-user-name = \"%s\"",
attr->values[0].string.text);
else
cupsdSetString(&job->username, "anonymous");
- if (attr == NULL)
+ if (!attr)
ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME,
"job-originating-user-name", NULL, job->username);
else
if (attr->value_tag != IPP_TAG_NAME ||
attr->num_values != 1 ||
- strcmp(con->http.hostname, "localhost") != 0)
+ strcmp(con->http.hostname, "localhost"))
{
/*
* Can't override the value if we aren't connected via localhost.
ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
title);
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) == NULL)
attr = ippAddInteger(job->attrs, IPP_TAG_JOB, IPP_TAG_INTEGER,
"job-k-octets", 0);
"time-at-completed", 0);
attr->value_tag = IPP_TAG_NOVALUE;
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr == NULL)
+ if (!attr)
attr = ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_KEYWORD,
"job-hold-until", NULL, "no-hold");
- if (attr != NULL && strcmp(attr->values[0].string.text, "no-hold") != 0 &&
+ if (attr && strcmp(attr->values[0].string.text, "no-hold") &&
!(printer->type & CUPS_PRINTER_REMOTE))
{
/*
* Add job sheets options...
*/
- if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) == NULL)
{
cupsdLogMessage(CUPSD_LOG_DEBUG,
"Adding default job-sheets values \"%s,%s\"...",
if (ClassifyOverride)
{
- if (strcmp(attr->values[0].string.text, "none") == 0 &&
+ if (!strcmp(attr->values[0].string.text, "none") &&
(attr->num_values == 1 ||
- strcmp(attr->values[1].string.text, "none") == 0))
+ !strcmp(attr->values[1].string.text, "none")))
{
/*
* Force the leading banner to have the classification on it...
job->id, Classification, job->username);
}
else if (attr->num_values == 2 &&
- strcmp(attr->values[0].string.text, attr->values[1].string.text) != 0 &&
- strcmp(attr->values[0].string.text, "none") != 0 &&
- strcmp(attr->values[1].string.text, "none") != 0)
+ strcmp(attr->values[0].string.text,
+ attr->values[1].string.text) &&
+ strcmp(attr->values[0].string.text, "none") &&
+ strcmp(attr->values[1].string.text, "none"))
{
/*
* Can't put two different security markings on the same document!
attr->values[1].string.text, job->username);
}
}
- else if (strcmp(attr->values[0].string.text, Classification) != 0 &&
+ else if (strcmp(attr->values[0].string.text, Classification) &&
(attr->num_values == 1 ||
- strcmp(attr->values[1].string.text, Classification) != 0))
+ strcmp(attr->values[1].string.text, Classification)))
{
/*
* Force the banner to have the classification on it...
cupsdUpdateQuota(printer, job->username, 0, kbytes);
}
}
- else if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) != NULL)
+ else if ((attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) != NULL)
job->sheets = attr;
/*
return;
}
- if (strncmp(line, "%!PS-Adobe-", 11) != 0)
+ if (strncmp(line, "%!PS-Adobe-", 11))
{
/*
* Not a DSC-compliant file, so no job ticket info will be available...
num_options = 0;
options = NULL;
- while (cupsFileGets(fp, line, sizeof(line)) != NULL)
+ while (cupsFileGets(fp, line, sizeof(line)))
{
/*
* Stop at the first non-ticket line...
*/
- if (strncmp(line, "%cupsJobTicket:", 15) != 0)
+ if (strncmp(line, "%cupsJobTicket:", 15))
break;
/*
* See what the user wants to change.
*/
- for (attr = ticket->attrs; attr != NULL; attr = attr->next)
+ for (attr = ticket->attrs; attr; attr = attr->next)
{
if (attr->group_tag != IPP_TAG_JOB || !attr->name)
continue;
!strncmp(attr->name, "time-at-", 8))
continue; /* Read-only attrs */
- if ((attr2 = ippFindAttribute(con->request, attr->name, IPP_TAG_ZERO)) != NULL)
+ if ((attr2 = ippFindAttribute(con->request, attr->name,
+ IPP_TAG_ZERO)) != NULL)
{
/*
* Some other value; first free the old value...
}
else
{
- for (prev2 = con->request->attrs; prev2 != NULL; prev2 = prev2->next)
+ for (prev2 = con->request->attrs; prev2; prev2 = prev2->next)
if (prev2->next == attr2)
{
prev2->next = attr2->next;
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
cupsdSaveAllClasses();
cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" rejecting jobs (\"%s\").",
- name, con->username);
+ name, get_username(con));
}
else
{
cupsdSaveAllPrinters();
cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" rejecting jobs (\"%s\").",
- name, con->username);
+ name, get_username(con));
}
/*
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (strncmp(resource, "/jobs/", 6))
{
* Reset the job-hold-until value to "no-hold"...
*/
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr != NULL)
+ if (attr)
{
free(attr->values[0].string.text);
attr->value_tag = IPP_TAG_KEYWORD;
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strncmp(resource, "/jobs/", 6) != 0)
+ if (strncmp(resource, "/jobs/", 6))
{
/*
* Not a valid URI!
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (strncmp(resource, "/jobs/", 6))
{
compression = CUPS_FILE_NONE;
- if ((attr = ippFindAttribute(con->request, "compression", IPP_TAG_KEYWORD)) != NULL)
+ if ((attr = ippFindAttribute(con->request, "compression",
+ IPP_TAG_KEYWORD)) != NULL)
{
if (strcmp(attr->values[0].string.text, "none")
#ifdef HAVE_LIBZ
strcpy(type, "octet-stream");
}
- if (strcmp(super, "application") == 0 &&
- strcmp(type, "octet-stream") == 0)
+ if (!strcmp(super, "application") && !strcmp(type, "octet-stream"))
{
/*
* Auto-type the file...
filetype = mimeFileType(MimeDatabase, con->filename, &compression);
- if (filetype != NULL)
+ if (filetype)
{
/*
* Replace the document-format attribute value with the auto-typed one.
snprintf(mimetype, sizeof(mimetype), "%s/%s", filetype->super,
filetype->type);
- if (format != NULL)
+ if (format)
{
free(format->values[0].string.text);
format->values[0].string.text = strdup(mimetype);
else
filetype = mimeType(MimeDatabase, super, type);
- if (filetype == NULL)
+ if (!filetype)
{
send_ipp_status(con, IPP_DOCUMENT_FORMAT,
_("Unsupported format \'%s/%s\'!"), super, type);
cupsdUpdateQuota(printer, job->username, 0, kbytes);
- if ((attr = ippFindAttribute(job->attrs, "job-k-octets", IPP_TAG_INTEGER)) != NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
+ IPP_TAG_INTEGER)) != NULL)
attr->values[0].integer += kbytes;
snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot, job->id,
* Start the job if this is the last document...
*/
- if ((attr = ippFindAttribute(con->request, "last-document", IPP_TAG_BOOLEAN)) != NULL &&
+ if ((attr = ippFindAttribute(con->request, "last-document",
+ IPP_TAG_BOOLEAN)) != NULL &&
attr->values[0].boolean)
{
/*
* See if we need to add the ending sheet...
*/
- if (printer != NULL &&
+ if (printer &&
!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) &&
- (attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_ZERO)) != NULL &&
+ (attr = ippFindAttribute(job->attrs, "job-sheets",
+ IPP_TAG_ZERO)) != NULL &&
attr->num_values > 1)
{
/*
job->state->values[0].integer = IPP_JOB_PENDING;
else if (job->state->values[0].integer == IPP_JOB_HELD)
{
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr == NULL || strcmp(attr->values[0].string.text, "no-hold") == 0)
+ if (!attr || !strcmp(attr->values[0].string.text, "no-hold"))
job->state->values[0].integer = IPP_JOB_PENDING;
}
}
else
{
- if ((attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_KEYWORD)) == NULL)
+ if ((attr = ippFindAttribute(job->attrs, "job-hold-until",
+ IPP_TAG_KEYWORD)) == NULL)
attr = ippFindAttribute(job->attrs, "job-hold-until", IPP_TAG_NAME);
- if (attr == NULL || strcmp(attr->values[0].string.text, "no-hold") == 0)
+ if (!attr || !strcmp(attr->values[0].string.text, "no-hold"))
{
job->state->values[0].integer = IPP_JOB_HELD;
job->hold_until = time(NULL) + 60;
con->response->request.status.status_code = status;
- if (ippFindAttribute(con->response, "attributes-charset", IPP_TAG_ZERO) == NULL)
+ if (ippFindAttribute(con->response, "attributes-charset",
+ IPP_TAG_ZERO) == NULL)
ippAddString(con->response, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
"attributes-charset", NULL, DefaultCharset);
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
cupsdLogMessage(CUPSD_LOG_INFO,
"Default destination set to \"%s\" by \"%s\".", name,
- con->username);
+ get_username(con));
/*
* Everything was ok, so return OK status...
* See if we have a job URI or a printer URI...
*/
- if (strcmp(uri->name, "printer-uri") == 0)
+ if (!strcmp(uri->name, "printer-uri"))
{
/*
* Got a printer URI; see if we also have a job-id attribute...
*/
- if ((attr = ippFindAttribute(con->request, "job-id", IPP_TAG_INTEGER)) == NULL)
+ if ((attr = ippFindAttribute(con->request, "job-id",
+ IPP_TAG_INTEGER)) == NULL)
{
send_ipp_status(con, IPP_BAD_REQUEST,
_("Got a printer-uri attribute but no job-id!"));
* Got a job URI; parse it to get the job ID...
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
- if (strncmp(resource, "/jobs/", 6) != 0)
+ if (strncmp(resource, "/jobs/", 6))
{
/*
* Not a valid URI!
* See what the user wants to change.
*/
- for (attr = con->request->attrs; attr != NULL; attr = attr->next)
+ for (attr = con->request->attrs; attr; attr = attr->next)
{
if (attr->group_tag != IPP_TAG_JOB || !attr->name)
continue;
}
else if (con->response->request.status.status_code != IPP_OK)
continue;
- else if ((attr2 = ippFindAttribute(job->attrs, attr->name, IPP_TAG_ZERO)) != NULL)
+ else if ((attr2 = ippFindAttribute(job->attrs, attr->name,
+ IPP_TAG_ZERO)) != NULL)
{
/*
* Some other value; first free the old value...
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
if (dtype & CUPS_PRINTER_CLASS)
cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" started by \"%s\".", name,
- con->username);
+ get_username(con));
+ else
cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" started by \"%s\".", name,
- con->username);
+ get_username(con));
cupsdCheckJobs();
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if ((name = cupsdValidateDest(host, resource, &dtype, &printer)) == NULL)
{
if (dtype & CUPS_PRINTER_CLASS)
cupsdLogMessage(CUPSD_LOG_INFO, "Class \"%s\" stopped by \"%s\".", name,
- con->username);
+ get_username(con));
else
cupsdLogMessage(CUPSD_LOG_INFO, "Printer \"%s\" stopped by \"%s\".", name,
- con->username);
+ get_username(con));
/*
* Everything was ok, so return OK status...
* doesn't support compression yet...
*/
- if ((attr = ippFindAttribute(con->request, "compression", IPP_TAG_KEYWORD)) != NULL &&
- strcmp(attr->values[0].string.text, "none") == 0)
+ if ((attr = ippFindAttribute(con->request, "compression",
+ IPP_TAG_KEYWORD)) != NULL &&
+ !strcmp(attr->values[0].string.text, "none"))
{
send_ipp_status(con, IPP_ATTRIBUTES,
_("Unsupported compression attribute %s!"),
return;
}
- if ((strcmp(super, "application") != 0 ||
- strcmp(type, "octet-stream") != 0) &&
- mimeType(MimeDatabase, super, type) == NULL)
+ if ((strcmp(super, "application") || strcmp(type, "octet-stream")) &&
+ !mimeType(MimeDatabase, super, type))
{
cupsdLogMessage(CUPSD_LOG_INFO,
"Hint: Do you have the raw file printing rules enabled?");
* Is the destination valid?
*/
- httpSeparateURI(uri->values[0].string.text, method, sizeof(method),
- username, sizeof(username), host, sizeof(host), &port,
- resource, sizeof(resource));
+ httpSeparateURI(HTTP_URI_CODING_ALL, uri->values[0].string.text, method,
+ sizeof(method), username, sizeof(username), host,
+ sizeof(host), &port, resource, sizeof(resource));
if (cupsdValidateDest(host, resource, &dtype, &printer) == NULL)
{
char *username, /* O - Authenticated username */
int userlen) /* I - Length of username */
{
- ipp_attribute_t *attr; /* requesting-user-name attribute */
cupsd_printer_t *printer; /* Printer for job */
* Get the best authenticated username that is available.
*/
- if (con->username[0])
- strlcpy(username, con->username, userlen);
- else if ((attr = ippFindAttribute(con->request, "requesting-user-name",
- IPP_TAG_NAME)) != NULL)
- strlcpy(username, attr->values[0].string.text, userlen);
- else
- strlcpy(username, "anonymous", userlen);
+ strlcpy(username, get_username(con), userlen);
/*
* Check the username against the owner...
/*
- * End of "$Id: ipp.c 4906 2006-01-10 20:53:28Z mike $".
+ * End of "$Id: ipp.c 5046 2006-02-01 22:11:58Z mike $".
*/
projects / thirdparty / cups.git / blobdiff