summaryrefslogtreecommitdiff
path: root/test/ippserver.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/ippserver.c')
-rw-r--r--test/ippserver.c178
1 files changed, 95 insertions, 83 deletions
diff --git a/test/ippserver.c b/test/ippserver.c
index a5c62733..32a7eb1c 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -1,5 +1,5 @@
/*
- * "$Id: ippserver.c 10851 2013-01-31 16:06:14Z mike $"
+ * "$Id: ippserver.c 11097 2013-07-04 15:54:36Z msweet $"
*
* Sample IPP/2.0 server for CUPS.
*
@@ -4200,77 +4200,82 @@ process_ipp(_ipp_client_t *client) /* I - Client */
respond_ipp(client, IPP_STATUS_ERROR_BAD_REQUEST,
"Missing required attributes.");
}
- else if (strcmp(ippGetString(uri, 0, NULL), client->printer->uri) &&
- strncmp(ippGetString(uri, 0, NULL), client->printer->uri,
- client->printer->urilen))
- {
- respond_ipp(client, IPP_STATUS_ERROR_NOT_FOUND, "%s %s not found.",
- ippGetName(uri), ippGetString(uri, 0, NULL));
- }
else
{
- /*
- * Try processing the operation...
- */
-
-#if 0 /* Already doing this in process_http()... */
- if (httpGetExpect(client->http) == HTTP_STATUS_CONTINUE)
+ char scheme[32], /* URI scheme */
+ userpass[32], /* Username/password in URI */
+ host[256], /* Host name in URI */
+ resource[256]; /* Resource path in URI */
+ int port; /* Port number in URI */
+
+ name = ippGetName(uri);
+
+ if (httpSeparateURI(HTTP_URI_CODING_ALL, ippGetString(uri, 0, NULL),
+ scheme, sizeof(scheme),
+ userpass, sizeof(userpass),
+ host, sizeof(host), &port,
+ resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
+ respond_ipp(client, IPP_STATUS_ERROR_ATTRIBUTES_OR_VALUES,
+ "Bad %s value '%s'.", name, ippGetString(uri, 0, NULL));
+ else if ((!strcmp(name, "job-uri") &&
+ strncmp(resource, "/ipp/print/", 11)) ||
+ (!strcmp(name, "printer-uri") &&
+ strcmp(resource, "/ipp/print")))
+ respond_ipp(client, IPP_STATUS_ERROR_NOT_FOUND, "%s %s not found.",
+ name, ippGetString(uri, 0, NULL));
+ else
{
/*
- * Send 100-continue header...
+ * Try processing the operation...
*/
- if (!respond_http(client, HTTP_STATUS_CONTINUE, NULL, NULL, 0))
- return (0);
- }
-#endif /* 0 */
-
- switch (ippGetOperation(client->request))
- {
- case IPP_OP_PRINT_JOB :
- ipp_print_job(client);
- break;
-
- case IPP_OP_PRINT_URI :
- ipp_print_uri(client);
- break;
-
- case IPP_OP_VALIDATE_JOB :
- ipp_validate_job(client);
- break;
-
- case IPP_OP_CREATE_JOB :
- ipp_create_job(client);
- break;
-
- case IPP_OP_SEND_DOCUMENT :
- ipp_send_document(client);
- break;
-
- case IPP_OP_SEND_URI :
- ipp_send_uri(client);
- break;
-
- case IPP_OP_CANCEL_JOB :
- ipp_cancel_job(client);
- break;
-
- case IPP_OP_GET_JOB_ATTRIBUTES :
- ipp_get_job_attributes(client);
- break;
-
- case IPP_OP_GET_JOBS :
- ipp_get_jobs(client);
- break;
-
- case IPP_OP_GET_PRINTER_ATTRIBUTES :
- ipp_get_printer_attributes(client);
- break;
-
- default :
- respond_ipp(client, IPP_STATUS_ERROR_OPERATION_NOT_SUPPORTED,
- "Operation not supported.");
- break;
+ switch (ippGetOperation(client->request))
+ {
+ case IPP_OP_PRINT_JOB :
+ ipp_print_job(client);
+ break;
+
+ case IPP_OP_PRINT_URI :
+ ipp_print_uri(client);
+ break;
+
+ case IPP_OP_VALIDATE_JOB :
+ ipp_validate_job(client);
+ break;
+
+ case IPP_OP_CREATE_JOB :
+ ipp_create_job(client);
+ break;
+
+ case IPP_OP_SEND_DOCUMENT :
+ ipp_send_document(client);
+ break;
+
+ case IPP_OP_SEND_URI :
+ ipp_send_uri(client);
+ break;
+
+ case IPP_OP_CANCEL_JOB :
+ ipp_cancel_job(client);
+ break;
+
+ case IPP_OP_GET_JOB_ATTRIBUTES :
+ ipp_get_job_attributes(client);
+ break;
+
+ case IPP_OP_GET_JOBS :
+ ipp_get_jobs(client);
+ break;
+
+ case IPP_OP_GET_PRINTER_ATTRIBUTES :
+ ipp_get_printer_attributes(client);
+ break;
+
+ default :
+ respond_ipp(client, IPP_STATUS_ERROR_OPERATION_NOT_SUPPORTED,
+ "Operation not supported.");
+ break;
+ }
}
}
}
@@ -4418,7 +4423,7 @@ register_printer(
snprintf(product, sizeof(product), "(%s)", model);
TXTRecordCreate(&(printer->ipp_txt), 1024, NULL);
- TXTRecordSetValue(&(printer->ipp_txt), "rp", 3, "ipp");
+ TXTRecordSetValue(&(printer->ipp_txt), "rp", 9, "ipp/print");
TXTRecordSetValue(&(printer->ipp_txt), "ty", (uint8_t)strlen(make_model),
make_model);
TXTRecordSetValue(&(printer->ipp_txt), "adminurl", (uint8_t)strlen(adminurl),
@@ -4496,7 +4501,7 @@ register_printer(
return (0);
}
-# ifdef HAVE_SSL
+# if 0 /* ifdef HAVE_SSL */
/*
* Then register the _ipps._tcp (IPP) service type with the real port number to
* advertise our IPP printer...
@@ -4810,7 +4815,7 @@ usage(int status) /* O - Exit status */
{
if (!status)
{
- puts(CUPS_SVERSION " - Copyright 2010-2012 by Apple Inc. All rights "
+ puts(CUPS_SVERSION " - Copyright 2010-2013 by Apple Inc. All rights "
"reserved.");
puts("");
}
@@ -4820,17 +4825,22 @@ usage(int status) /* O - Exit status */
puts("Options:");
puts("-2 Supports 2-sided printing (default=1-sided)");
puts("-M manufacturer Manufacturer name (default=Test)");
+ puts("-P PIN printing mode");
+ puts("-c command Run command for every print job");
printf("-d spool-directory Spool directory "
"(default=/tmp/ippserver.%d)\n", (int)getpid());
puts("-f type/subtype[,...] List of supported types "
"(default=application/pdf,image/jpeg)");
puts("-h Show program help");
puts("-i iconfile.png PNG icon file (default=printer.png)");
+ puts("-k Keep job spool files");
puts("-l location Location of printer (default=empty string)");
puts("-m model Model name (default=Printer)");
puts("-n hostname Hostname for printer");
puts("-p port Port number (default=auto)");
+#ifdef HAVE_DNSSD
puts("-r subtype Bonjour service subtype (default=_print)");
+#endif /* HAVE_DNSSD */
puts("-s speed[,color-speed] Speed in pages per minute (default=10,0)");
puts("-v[vvv] Be (very) verbose");
@@ -4920,9 +4930,14 @@ valid_doc_attributes(
}
else
{
- format = "application/octet-stream";
- attr = ippAddString(client->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
- "document-format", NULL, format);
+ format = ippGetString(ippFindAttribute(client->printer->attrs,
+ "document-format-default",
+ IPP_TAG_MIMETYPE), 0, NULL);
+ if (!format)
+ format = "application/octet-stream"; /* Should never happen */
+
+ attr = ippAddString(client->request, IPP_TAG_JOB, IPP_TAG_MIMETYPE,
+ "document-format", NULL, format);
}
if (!strcmp(format, "application/octet-stream") &&
@@ -5166,29 +5181,26 @@ valid_job_attributes(
if ((attr = ippFindAttribute(client->request, "sides",
IPP_TAG_ZERO)) != NULL)
{
+ const char *sides = NULL; /* "sides" value... */
+
if (ippGetCount(attr) != 1 || ippGetValueTag(attr) != IPP_TAG_KEYWORD)
{
respond_unsupported(client, attr);
valid = 0;
}
- if ((supported = ippFindAttribute(client->printer->attrs, "sides",
+ sides = ippGetString(attr, 0, NULL);
+
+ if ((supported = ippFindAttribute(client->printer->attrs, "sides-supported",
IPP_TAG_KEYWORD)) != NULL)
{
- int count = ippGetCount(supported);
- const char *sides = ippGetString(attr, 0, NULL);
-
- for (i = 0; i < count; i ++)
- if (!strcmp(sides, ippGetString(supported, i, NULL)))
- break;
-
- if (i >= count)
+ if (!ippContainsString(supported, sides))
{
respond_unsupported(client, attr);
valid = 0;
}
}
- else
+ else if (strcmp(sides, "one-sided"))
{
respond_unsupported(client, attr);
valid = 0;
@@ -5200,5 +5212,5 @@ valid_job_attributes(
/*
- * End of "$Id: ippserver.c 10851 2013-01-31 16:06:14Z mike $".
+ * End of "$Id: ippserver.c 11097 2013-07-04 15:54:36Z msweet $".
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 06:36:10 +0000