X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=test%2Fipptool.c;h=697ea8a9623e0c2f4411e8694173d248a7d4dad4;hb=c77dede2ed16dae1f6d75cfe2a4e395111a472e2;hp=658927ae08efa28f347333788c34063c31969e4b;hpb=9d4ae311cb628b5d183f850d2be0f19e164bf795;p=thirdparty%2Fcups.git diff --git a/test/ipptool.c b/test/ipptool.c index 658927ae0..697ea8a96 100644 --- a/test/ipptool.c +++ b/test/ipptool.c @@ -1,16 +1,11 @@ /* * ipptool command for CUPS. * - * Copyright 2007-2017 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products. * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * Licensed under Apache License v2.0. See the file "LICENSE" for more + * information. */ /* @@ -51,6 +46,7 @@ typedef enum _cups_output_e /**** Output mode ****/ _CUPS_OUTPUT_QUIET, /* No output */ _CUPS_OUTPUT_TEST, /* Traditional CUPS test output */ _CUPS_OUTPUT_PLIST, /* XML plist test output */ + _CUPS_OUTPUT_IPPSERVER, /* ippserver attribute file output */ _CUPS_OUTPUT_LIST, /* Tabular list output */ _CUPS_OUTPUT_CSV /* Comma-separated values output */ } _cups_output_t; @@ -101,51 +97,68 @@ typedef struct _cups_status_s /**** Status info ****/ repeat_no_match; /* Repeat the test when it matches */ } _cups_status_t; -typedef struct _cups_var_s /**** Variable ****/ -{ - char *name, /* Name of variable */ - *value; /* Value of variable */ -} _cups_var_t; - -typedef struct _cups_vars_s /**** Set of variables ****/ +typedef struct _cups_testdata_s /**** Test Data ****/ { - char *uri, /* URI for printer */ - *filename, /* Filename */ - scheme[64], /* Scheme from URI */ - userpass[256], /* Username/password from URI */ - hostname[256], /* Hostname from URI */ - resource[1024]; /* Resource path from URI */ - int port; /* Port number from URI */ - http_encryption_t encryption; /* Encryption for connection? */ - double timeout; /* Timeout for connection */ + /* Global Options */ + http_encryption_t encryption; /* Encryption for connection */ int family; /* Address family */ - cups_array_t *vars; /* Array of variables */ -} _cups_vars_t; + _cups_output_t output; /* Output mode */ + int stop_after_include_error; + /* Stop after include errors? */ + double timeout; /* Timeout for connection */ + int validate_headers, /* Validate HTTP headers in response? */ + verbosity; /* Show all attributes? */ + + /* Test Defaults */ + int def_ignore_errors; /* Default IGNORE-ERRORS value */ + _cups_transfer_t def_transfer; /* Default TRANSFER value */ + int def_version; /* Default IPP version */ + + /* Global State */ + http_t *http; /* HTTP connection to printer/server */ + cups_file_t *outfile; /* Output file */ + int show_header, /* Show the test header? */ + xml_header; /* 1 if XML plist header was written */ + int pass, /* Have we passed all tests? */ + test_count, /* Number of tests (total) */ + pass_count, /* Number of tests that passed */ + fail_count, /* Number of tests that failed */ + skip_count; /* Number of tests that were skipped */ + + /* Per-Test State */ + cups_array_t *errors; /* Errors array */ + int prev_pass, /* Result of previous test */ + skip_previous; /* Skip on previous test failure? */ + char compression[16]; /* COMPRESSION value */ + useconds_t delay; /* Initial delay */ + int num_displayed; /* Number of displayed attributes */ + char *displayed[200]; /* Displayed attributes */ + int num_expects; /* Number of expected attributes */ + _cups_expect_t expects[200], /* Expected attributes */ + *expect, /* Current expected attribute */ + *last_expect; /* Last EXPECT (for predicates) */ + char file[1024], /* Data filename */ + file_id[1024]; /* File identifier */ + int ignore_errors; /* Ignore test failures? */ + char name[1024]; /* Test name */ + useconds_t repeat_interval; /* Repeat interval (delay) */ + int request_id; /* Current request ID */ + char resource[512]; /* Resource for request */ + int skip_test, /* Skip this test? */ + num_statuses; /* Number of valid status codes */ + _cups_status_t statuses[100], /* Valid status codes */ + *last_status; /* Last STATUS (for predicates) */ + char test_id[1024]; /* Test identifier */ + _cups_transfer_t transfer; /* To chunk or not to chunk */ + int version; /* IPP version number to use */ +} _cups_testdata_t; /* * Globals... */ -static _cups_transfer_t Transfer = _CUPS_TRANSFER_AUTO; - /* How to transfer requests */ -static _cups_output_t Output = _CUPS_OUTPUT_LIST; - /* Output mode */ -static int Cancel = 0, /* Cancel test? */ - IgnoreErrors = 0, /* Ignore errors? */ - StopAfterIncludeError = 0, - /* Stop after include errors? */ - ValidateHeaders = 0, /* Validate HTTP headers in response? */ - Verbosity = 0, /* Show all attributes? */ - Version = 11, /* Default IPP version */ - XMLHeader = 0, /* 1 if header is written */ - TestCount = 0, /* Number of tests run */ - PassCount = 0, /* Number of passing tests */ - FailCount = 0, /* Number of failing tests */ - SkipCount = 0; /* Number of skipped tests */ -static char *Username = NULL, /* Username from URI */ - *Password = NULL; /* Password from URI */ -static int PasswordTries = 0; /* Number of tries with password */ +static int Cancel = 0; /* Cancel test? */ /* @@ -154,34 +167,32 @@ static int PasswordTries = 0; /* Number of tries with password */ static void add_stringf(cups_array_t *a, const char *s, ...) __attribute__ ((__format__ (__printf__, 2, 3))); static int compare_uris(const char *a, const char *b); -static int compare_vars(_cups_var_t *a, _cups_var_t *b); -static int do_tests(cups_file_t *outfile, _cups_vars_t *vars, const char *testfile); -static void expand_variables(_cups_vars_t *vars, char *dst, const char *src, size_t dstsize) __attribute__((nonnull(1,2,3))); +static int do_test(_ipp_file_t *f, _ipp_vars_t *vars, _cups_testdata_t *data); +static int do_tests(const char *testfile, _ipp_vars_t *vars, _cups_testdata_t *data); +static int error_cb(_ipp_file_t *f, _cups_testdata_t *data, const char *error); static int expect_matches(_cups_expect_t *expect, ipp_tag_t value_tag); -static ipp_t *get_collection(cups_file_t *outfile, _cups_vars_t *vars, cups_file_t *fp, int *linenum); static char *get_filename(const char *testfile, char *dst, const char *src, size_t dstsize); static const char *get_string(ipp_attribute_t *attr, int element, int flags, char *buffer, size_t bufsize); -static char *get_token(cups_file_t *fp, char *buf, int buflen, int *linenum); -static char *get_variable(_cups_vars_t *vars, const char *name); -static char *iso_date(ipp_uchar_t *date); -static const char *password_cb(const char *prompt); +static void init_data(_cups_testdata_t *data); +static char *iso_date(const ipp_uchar_t *date); static void pause_message(const char *message); -static void print_attr(cups_file_t *outfile, int format, ipp_attribute_t *attr, ipp_tag_t *group); -static void print_csv(cups_file_t *outfile, ipp_attribute_t *attr, int num_displayed, char **displayed, size_t *widths); -static void print_fatal_error(cups_file_t *outfile, const char *s, ...) __attribute__ ((__format__ (__printf__, 2, 3))); -static void print_line(cups_file_t *outfile, ipp_attribute_t *attr, int num_displayed, char **displayed, size_t *widths); -static void print_xml_header(cups_file_t *outfile); +static void print_attr(cups_file_t *outfile, int output, ipp_attribute_t *attr, ipp_tag_t *group); +static void print_csv(_cups_testdata_t *data, ipp_t *ipp, ipp_attribute_t *attr, int num_displayed, char **displayed, size_t *widths); +static void print_fatal_error(_cups_testdata_t *data, const char *s, ...) __attribute__ ((__format__ (__printf__, 2, 3))); +static void print_ippserver_attr(_cups_testdata_t *data, ipp_attribute_t *attr, int indent); +static void print_ippserver_string(_cups_testdata_t *data, const char *s, size_t len); +static void print_line(_cups_testdata_t *data, ipp_t *ipp, ipp_attribute_t *attr, int num_displayed, char **displayed, size_t *widths); +static void print_xml_header(_cups_testdata_t *data); static void print_xml_string(cups_file_t *outfile, const char *element, const char *s); -static void print_xml_trailer(cups_file_t *outfile, int success, const char *message); -static void set_variable(cups_file_t *outfile, _cups_vars_t *vars, const char *name, const char *value); +static void print_xml_trailer(_cups_testdata_t *data, int success, const char *message); #ifndef WIN32 static void sigterm_handler(int sig); #endif /* WIN32 */ static int timeout_cb(http_t *http, void *user_data); +static int token_cb(_ipp_file_t *f, _ipp_vars_t *vars, _cups_testdata_t *data, const char *token); static void usage(void) __attribute__((noreturn)); -static int validate_attr(cups_file_t *outfile, cups_array_t *errors, ipp_attribute_t *attr); static const char *with_flags_string(int flags); -static int with_value(cups_file_t *outfile, cups_array_t *errors, char *value, int flags, ipp_attribute_t *attr, char *matchbuf, size_t matchlen); +static int with_value(_cups_testdata_t *data, cups_array_t *errors, char *value, int flags, ipp_attribute_t *attr, char *matchbuf, size_t matchlen); static int with_value_from(cups_array_t *errors, ipp_attribute_t *fromattr, ipp_attribute_t *attr, char *matchbuf, size_t matchlen); @@ -195,20 +206,17 @@ main(int argc, /* I - Number of command-line args */ { int i; /* Looping var */ int status; /* Status of tests... */ - cups_file_t *outfile = cupsFileStdout(); - /* Output file */ char *opt, /* Current option */ name[1024], /* Name/value buffer */ *value, /* Pointer to value */ filename[1024], /* Real filename */ - testname[1024], /* Real test filename */ - uri[1024]; /* Copy of printer URI */ + testname[1024]; /* Real test filename */ const char *ext, /* Extension on filename */ *testfile; /* Test file to use */ int interval, /* Test interval in microseconds */ repeat; /* Repeat count */ - _cups_vars_t vars; /* Variables */ - http_uri_status_t uri_status; /* URI separation status */ + _cups_testdata_t data; /* Test data */ + _ipp_vars_t vars; /* Variables */ _cups_globals_t *cg = _cupsGlobals(); /* Global data */ @@ -228,9 +236,9 @@ main(int argc, /* I - Number of command-line args */ _cupsSetLocale(argv); - memset(&vars, 0, sizeof(vars)); - vars.family = AF_UNSPEC; - vars.vars = cupsArrayNew((cups_array_func_t)compare_vars, NULL); + init_data(&data); + + _ippVarsInit(&vars, NULL, (_ipp_ferror_cb_t)error_cb, (_ipp_ftoken_cb_t)token_cb); /* * We need at least: @@ -249,9 +257,30 @@ main(int argc, /* I - Number of command-line args */ { usage(); } + else if (!strcmp(argv[i], "--ippserver")) + { + i ++; + + if (i >= argc) + { + _cupsLangPuts(stderr, _("ipptool: Missing filename for \"--ippserver\".")); + usage(); + } + + if (data.outfile != cupsFileStdout()) + usage(); + + if ((data.outfile = cupsFileOpen(argv[i], "w")) == NULL) + { + _cupsLangPrintf(stderr, _("%s: Unable to open \"%s\": %s"), "ipptool", argv[i], strerror(errno)); + exit(1); + } + + data.output = _CUPS_OUTPUT_IPPSERVER; + } else if (!strcmp(argv[i], "--stop-after-include-error")) { - StopAfterIncludeError = 1; + data.stop_after_include_error = 1; } else if (!strcmp(argv[i], "--version")) { @@ -265,22 +294,22 @@ main(int argc, /* I - Number of command-line args */ switch (*opt) { case '4' : /* Connect using IPv4 only */ - vars.family = AF_INET; + data.family = AF_INET; break; #ifdef AF_INET6 case '6' : /* Connect using IPv6 only */ - vars.family = AF_INET6; + data.family = AF_INET6; break; #endif /* AF_INET6 */ case 'C' : /* Enable HTTP chunking */ - Transfer = _CUPS_TRANSFER_CHUNKED; + data.def_transfer = _CUPS_TRANSFER_CHUNKED; break; case 'E' : /* Encrypt with TLS */ #ifdef HAVE_SSL - vars.encryption = HTTP_ENCRYPT_REQUIRED; + data.encryption = HTTP_ENCRYPT_REQUIRED; #else _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]); @@ -288,11 +317,11 @@ main(int argc, /* I - Number of command-line args */ break; case 'I' : /* Ignore errors */ - IgnoreErrors = 1; + data.def_ignore_errors = 1; break; case 'L' : /* Disable HTTP chunking */ - Transfer = _CUPS_TRANSFER_LENGTH; + data.def_transfer = _CUPS_TRANSFER_LENGTH; break; case 'P' : /* Output to plist file */ @@ -304,16 +333,16 @@ main(int argc, /* I - Number of command-line args */ usage(); } - if (outfile != cupsFileStdout()) + if (data.outfile != cupsFileStdout()) usage(); - if ((outfile = cupsFileOpen(argv[i], "w")) == NULL) + if ((data.outfile = cupsFileOpen(argv[i], "w")) == NULL) { _cupsLangPrintf(stderr, _("%s: Unable to open \"%s\": %s"), "ipptool", argv[i], strerror(errno)); exit(1); } - Output = _CUPS_OUTPUT_PLIST; + data.output = _CUPS_OUTPUT_PLIST; if (interval || repeat) { @@ -324,7 +353,7 @@ main(int argc, /* I - Number of command-line args */ case 'S' : /* Encrypt with SSL */ #ifdef HAVE_SSL - vars.encryption = HTTP_ENCRYPT_ALWAYS; + data.encryption = HTTP_ENCRYPT_ALWAYS; #else _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), argv[0]); @@ -342,7 +371,7 @@ main(int argc, /* I - Number of command-line args */ usage(); } - vars.timeout = _cupsStrScand(argv[i], NULL, localeconv()); + data.timeout = _cupsStrScand(argv[i], NULL, localeconv()); break; case 'V' : /* Set IPP version */ @@ -357,26 +386,34 @@ main(int argc, /* I - Number of command-line args */ } if (!strcmp(argv[i], "1.0")) - Version = 10; + { + data.def_version = 10; + } else if (!strcmp(argv[i], "1.1")) - Version = 11; + { + data.def_version = 11; + } else if (!strcmp(argv[i], "2.0")) - Version = 20; + { + data.def_version = 20; + } else if (!strcmp(argv[i], "2.1")) - Version = 21; + { + data.def_version = 21; + } else if (!strcmp(argv[i], "2.2")) - Version = 22; + { + data.def_version = 22; + } else { - _cupsLangPrintf(stderr, - _("%s: Bad version %s for \"-V\"."), - "ipptool", argv[i]); + _cupsLangPrintf(stderr, _("%s: Bad version %s for \"-V\"."), "ipptool", argv[i]); usage(); } break; case 'X' : /* Produce XML output */ - Output = _CUPS_OUTPUT_PLIST; + data.output = _CUPS_OUTPUT_PLIST; if (interval || repeat) { @@ -386,7 +423,7 @@ main(int argc, /* I - Number of command-line args */ break; case 'c' : /* CSV output */ - Output = _CUPS_OUTPUT_CSV; + data.output = _CUPS_OUTPUT_CSV; break; case 'd' : /* Define a variable */ @@ -405,7 +442,7 @@ main(int argc, /* I - Number of command-line args */ else value = name + strlen(name); - set_variable(outfile, &vars, name, value); + _ippVarsSet(&vars, name, value); break; case 'f' : /* Set the default test filename */ @@ -418,12 +455,6 @@ main(int argc, /* I - Number of command-line args */ usage(); } - if (vars.filename) - { - free(vars.filename); - vars.filename = NULL; - } - if (access(argv[i], 0)) { /* @@ -437,70 +468,64 @@ main(int argc, /* I - Number of command-line args */ #endif /* WIN32 */ ) { - snprintf(filename, sizeof(filename), "%s/ipptool/%s", - cg->cups_datadir, argv[i]); + snprintf(filename, sizeof(filename), "%s/ipptool/%s", cg->cups_datadir, argv[i]); if (access(filename, 0)) { - snprintf(filename, sizeof(filename), "%s/ipptool/%s.gz", - cg->cups_datadir, argv[i]); + snprintf(filename, sizeof(filename), "%s/ipptool/%s.gz", cg->cups_datadir, argv[i]); if (access(filename, 0)) - vars.filename = strdup(argv[i]); - else - vars.filename = strdup(filename); + strlcpy(filename, argv[i], sizeof(filename)); } - else - vars.filename = strdup(filename); } - else - vars.filename = strdup(filename); } else - vars.filename = strdup(argv[i]); + strlcpy(filename, argv[i], sizeof(filename)); - if ((ext = strrchr(vars.filename, '.')) != NULL) + _ippVarsSet(&vars, "filename", filename); + + if ((ext = strrchr(filename, '.')) != NULL) { /* * Guess the MIME media type based on the extension... */ if (!_cups_strcasecmp(ext, ".gif")) - set_variable(outfile, &vars, "filetype", "image/gif"); + _ippVarsSet(&vars, "filetype", "image/gif"); else if (!_cups_strcasecmp(ext, ".htm") || !_cups_strcasecmp(ext, ".htm.gz") || !_cups_strcasecmp(ext, ".html") || !_cups_strcasecmp(ext, ".html.gz")) - set_variable(outfile, &vars, "filetype", "text/html"); + _ippVarsSet(&vars, "filetype", "text/html"); else if (!_cups_strcasecmp(ext, ".jpg") || !_cups_strcasecmp(ext, ".jpeg")) - set_variable(outfile, &vars, "filetype", "image/jpeg"); + _ippVarsSet(&vars, "filetype", "image/jpeg"); else if (!_cups_strcasecmp(ext, ".pcl") || !_cups_strcasecmp(ext, ".pcl.gz")) - set_variable(outfile, &vars, "filetype", "application/vnd.hp-PCL"); + _ippVarsSet(&vars, "filetype", "application/vnd.hp-PCL"); else if (!_cups_strcasecmp(ext, ".pdf")) - set_variable(outfile, &vars, "filetype", "application/pdf"); + _ippVarsSet(&vars, "filetype", "application/pdf"); else if (!_cups_strcasecmp(ext, ".png")) - set_variable(outfile, &vars, "filetype", "image/png"); + _ippVarsSet(&vars, "filetype", "image/png"); else if (!_cups_strcasecmp(ext, ".ps") || !_cups_strcasecmp(ext, ".ps.gz")) - set_variable(outfile, &vars, "filetype", "application/postscript"); + _ippVarsSet(&vars, "filetype", "application/postscript"); else if (!_cups_strcasecmp(ext, ".pwg") || !_cups_strcasecmp(ext, ".pwg.gz") || !_cups_strcasecmp(ext, ".ras") || !_cups_strcasecmp(ext, ".ras.gz")) - set_variable(outfile, &vars, "filetype", "image/pwg-raster"); + _ippVarsSet(&vars, "filetype", "image/pwg-raster"); else if (!_cups_strcasecmp(ext, ".tif") || !_cups_strcasecmp(ext, ".tiff")) - set_variable(outfile, &vars, "filetype", "image/tiff"); + _ippVarsSet(&vars, "filetype", "image/tiff"); else if (!_cups_strcasecmp(ext, ".txt") || !_cups_strcasecmp(ext, ".txt.gz")) - set_variable(outfile, &vars, "filetype", "text/plain"); + _ippVarsSet(&vars, "filetype", "text/plain"); else if (!_cups_strcasecmp(ext, ".urf") || !_cups_strcasecmp(ext, ".urf.gz")) - set_variable(outfile, &vars, "filetype", "image/urf"); + _ippVarsSet(&vars, "filetype", "image/urf"); else if (!_cups_strcasecmp(ext, ".xps")) - set_variable(outfile, &vars, "filetype", "application/openxps"); + _ippVarsSet(&vars, "filetype", "application/openxps"); else - set_variable(outfile, &vars, "filetype", "application/octet-stream"); + _ippVarsSet(&vars, "filetype", "application/octet-stream"); } else { @@ -508,12 +533,12 @@ main(int argc, /* I - Number of command-line args */ * Use the "auto-type" MIME media type... */ - set_variable(outfile, &vars, "filetype", "application/octet-stream"); + _ippVarsSet(&vars, "filetype", "application/octet-stream"); } break; case 'h' : /* Validate response headers */ - ValidateHeaders = 1; + data.validate_headers = 1; break; case 'i' : /* Test every N seconds */ @@ -521,31 +546,28 @@ main(int argc, /* I - Number of command-line args */ if (i >= argc) { - _cupsLangPuts(stderr, - _("ipptool: Missing seconds for \"-i\".")); + _cupsLangPuts(stderr, _("ipptool: Missing seconds for \"-i\".")); usage(); } else { - interval = (int)(_cupsStrScand(argv[i], NULL, localeconv()) * - 1000000.0); + interval = (int)(_cupsStrScand(argv[i], NULL, localeconv()) * 1000000.0); if (interval <= 0) { - _cupsLangPuts(stderr, - _("ipptool: Invalid seconds for \"-i\".")); + _cupsLangPuts(stderr, _("ipptool: Invalid seconds for \"-i\".")); usage(); } } - if (Output == _CUPS_OUTPUT_PLIST && interval) + if ((data.output == _CUPS_OUTPUT_PLIST || data.output == _CUPS_OUTPUT_IPPSERVER) && interval) { - _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\".")); + _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", and \"-X\".")); usage(); } break; case 'l' : /* List as a table */ - Output = _CUPS_OUTPUT_LIST; + data.output = _CUPS_OUTPUT_LIST; break; case 'n' : /* Repeat count */ @@ -553,43 +575,40 @@ main(int argc, /* I - Number of command-line args */ if (i >= argc) { - _cupsLangPuts(stderr, - _("ipptool: Missing count for \"-n\".")); + _cupsLangPuts(stderr, _("ipptool: Missing count for \"-n\".")); usage(); } else repeat = atoi(argv[i]); - if (Output == _CUPS_OUTPUT_PLIST && repeat) + if ((data.output == _CUPS_OUTPUT_PLIST || data.output == _CUPS_OUTPUT_IPPSERVER) && repeat) { - _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are incompatible with \"-P\" and \"-X\".")); + _cupsLangPuts(stderr, _("ipptool: \"-i\" and \"-n\" are incompatible with \"--ippserver\", \"-P\", and \"-X\".")); usage(); } break; case 'q' : /* Be quiet */ - Output = _CUPS_OUTPUT_QUIET; + data.output = _CUPS_OUTPUT_QUIET; break; case 't' : /* CUPS test output */ - Output = _CUPS_OUTPUT_TEST; + data.output = _CUPS_OUTPUT_TEST; break; case 'v' : /* Be verbose */ - Verbosity ++; + data.verbosity ++; break; default : - _cupsLangPrintf(stderr, _("ipptool: Unknown option \"-%c\"."), - *opt); + _cupsLangPrintf(stderr, _("%s: Unknown option \"-%c\"."), "ipptool", *opt); usage(); } } } else if (!strncmp(argv[i], "ipp://", 6) || !strncmp(argv[i], "http://", 7) #ifdef HAVE_SSL - || !strncmp(argv[i], "ipps://", 7) - || !strncmp(argv[i], "https://", 8) + || !strncmp(argv[i], "ipps://", 7) || !strncmp(argv[i], "https://", 8) #endif /* HAVE_SSL */ ) { @@ -605,36 +624,17 @@ main(int argc, /* I - Number of command-line args */ #ifdef HAVE_SSL if (!strncmp(argv[i], "ipps://", 7) || !strncmp(argv[i], "https://", 8)) - vars.encryption = HTTP_ENCRYPT_ALWAYS; + data.encryption = HTTP_ENCRYPT_ALWAYS; #endif /* HAVE_SSL */ - vars.uri = argv[i]; - uri_status = httpSeparateURI(HTTP_URI_CODING_ALL, vars.uri, - vars.scheme, sizeof(vars.scheme), - vars.userpass, sizeof(vars.userpass), - vars.hostname, sizeof(vars.hostname), - &(vars.port), - vars.resource, sizeof(vars.resource)); - - if (uri_status != HTTP_URI_OK) + if (!_ippVarsSet(&vars, "uri", argv[i])) { - _cupsLangPrintf(stderr, _("ipptool: Bad URI - %s."), httpURIStatusString(uri_status)); + _cupsLangPrintf(stderr, _("ipptool: Bad URI \"%s\"."), argv[i]); return (1); } - if (vars.userpass[0]) - { - if ((Password = strchr(vars.userpass, ':')) != NULL) - *Password++ = '\0'; - - Username = vars.userpass; - cupsSetPasswordCB(password_cb); - set_variable(outfile, &vars, "uriuser", vars.userpass); - } - - httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), vars.scheme, NULL, - vars.hostname, vars.port, vars.resource); - vars.uri = uri; + if (vars.username[0] && vars.password) + cupsSetPasswordCB2(_ippVarsPasswordCB, &vars); } else { @@ -655,8 +655,7 @@ main(int argc, /* I - Number of command-line args */ #endif /* WIN32 */ ) { - snprintf(testname, sizeof(testname), "%s/ipptool/%s", cg->cups_datadir, - argv[i]); + snprintf(testname, sizeof(testname), "%s/ipptool/%s", cg->cups_datadir, argv[i]); if (access(testname, 0)) testfile = argv[i]; else @@ -665,7 +664,7 @@ main(int argc, /* I - Number of command-line args */ else testfile = argv[i]; - if (!do_tests(outfile, &vars, testfile)) + if (!do_tests(testfile, &vars, &data)) status = 1; } } @@ -677,14 +676,14 @@ main(int argc, /* I - Number of command-line args */ * Loop if the interval is set... */ - if (Output == _CUPS_OUTPUT_PLIST) - print_xml_trailer(outfile, !status, NULL); + if (data.output == _CUPS_OUTPUT_PLIST) + print_xml_trailer(&data, !status, NULL); else if (interval > 0 && repeat > 0) { while (repeat > 1) { usleep((useconds_t)interval); - do_tests(outfile, &vars, testfile); + do_tests(testfile, &vars, &data); repeat --; } } @@ -693,20 +692,20 @@ main(int argc, /* I - Number of command-line args */ for (;;) { usleep((useconds_t)interval); - do_tests(outfile, &vars, testfile); + do_tests(testfile, &vars, &data); } } - if ((Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile)) && TestCount > 1) + if ((data.output == _CUPS_OUTPUT_TEST || (data.output == _CUPS_OUTPUT_PLIST && data.outfile)) && data.test_count > 1) { /* * Show a summary report if there were multiple tests... */ - cupsFilePrintf(cupsFileStdout(), "\nSummary: %d tests, %d passed, %d failed, %d skipped\nScore: %d%%\n", TestCount, PassCount, FailCount, SkipCount, 100 * (PassCount + SkipCount) / TestCount); + cupsFilePrintf(cupsFileStdout(), "\nSummary: %d tests, %d passed, %d failed, %d skipped\nScore: %d%%\n", data.test_count, data.pass_count, data.fail_count, data.skip_count, 100 * (data.pass_count + data.skip_count) / data.test_count); } - cupsFileClose(outfile); + cupsFileClose(data.outfile); /* * Exit... @@ -818,4938 +817,3445 @@ compare_uris(const char *a, /* I - First URI */ /* - * 'compare_vars()' - Compare two variables. + * 'do_test()' - Do a single test from the test file. */ -static int /* O - Result of comparison */ -compare_vars(_cups_var_t *a, /* I - First variable */ - _cups_var_t *b) /* I - Second variable */ -{ - return (_cups_strcasecmp(a->name, b->name)); -} - - -/* - * 'do_tests()' - Do tests as specified in the test file. - */ +static int /* O - 1 on success, 0 on failure */ +do_test(_ipp_file_t *f, /* I - IPP data file */ + _ipp_vars_t *vars, /* I - IPP variables */ + _cups_testdata_t *data) /* I - Test data */ -static int /* 1 = success, 0 = failure */ -do_tests(cups_file_t *outfile, /* I - Output file */ - _cups_vars_t *vars, /* I - Variables */ - const char *testfile) /* I - Test file to use */ { - int i, /* Looping var */ - linenum, /* Current line number */ - pass, /* Did we pass the test? */ - prev_pass = 1, /* Did we pass the previous test? */ - request_id, /* Current request ID */ - show_header = 1, /* Show the test header? */ - ignore_errors, /* Ignore test failures? */ - skip_previous = 0, /* Skip on previous test failure? */ - repeat_count, /* Repeat count */ - repeat_test; /* Repeat a test? */ - useconds_t delay, /* Initial delay */ - repeat_interval; /* Repeat interval (delay) */ - http_t *http = NULL; /* HTTP connection to server */ - cups_file_t *fp = NULL; /* Test file */ - char resource[512], /* Resource for request */ - token[1024], /* Token from file */ - *tokenptr, /* Pointer into token */ - temp[1024], /* Temporary string */ - buffer[131072], /* Copy buffer */ - compression[16]; /* COMPRESSION value */ - ipp_t *request = NULL, /* IPP request */ - *response = NULL; /* IPP response */ + int i, /* Looping var */ + status_ok, /* Did we get a matching status? */ + repeat_count = 0, /* Repeat count */ + repeat_test; /* Repeat the test? */ + _cups_expect_t *expect; /* Current expected attribute */ + ipp_t *request, /* IPP request */ + *response; /* IPP response */ size_t length; /* Length of IPP request */ http_status_t status; /* HTTP status */ - cups_file_t *reqfile; /* File to send */ - ssize_t bytes; /* Bytes read/written */ - char attr[128]; /* Attribute name */ - ipp_op_t op; /* Operation */ + cups_array_t *a; /* Duplicate attribute array */ ipp_tag_t group; /* Current group */ - ipp_tag_t value; /* Current value type */ ipp_attribute_t *attrptr, /* Attribute pointer */ - *found, /* Found attribute */ - *lastcol = NULL; /* Last collection attribute */ - char name[1024], /* Name of test */ - file_id[1024], /* File identifier */ - test_id[1024]; /* Test identifier */ - char filename[1024]; /* Filename */ - _cups_transfer_t transfer; /* To chunk or not to chunk */ - int version, /* IPP version number to use */ - skip_test; /* Skip this test? */ - int num_statuses = 0; /* Number of valid status codes */ - _cups_status_t statuses[100], /* Valid status codes */ - *last_status; /* Last STATUS (for predicates) */ - int status_ok, /* Did we get a matching status? */ - num_expects = 0; /* Number of expected attributes */ - _cups_expect_t expects[200], /* Expected attributes */ - *expect, /* Current expected attribute */ - *last_expect; /* Last EXPECT (for predicates) */ - int num_displayed = 0; /* Number of displayed attributes */ - char *displayed[200]; /* Displayed attributes */ + *found; /* Found attribute */ + char temp[1024]; /* Temporary string */ + cups_file_t *reqfile; /* File to send */ + ssize_t bytes; /* Bytes read/written */ + char buffer[131072]; /* Copy buffer */ size_t widths[200]; /* Width of columns */ - cups_array_t *a, /* Duplicate attribute array */ - *errors = NULL; /* Errors array */ const char *error; /* Current error */ + if (Cancel) + return (0); + /* - * Open the test file... + * Take over control of the attributes in the request... */ - if ((fp = cupsFileOpen(testfile, "r")) == NULL) - { - print_fatal_error(outfile, "Unable to open test file %s - %s", testfile, - strerror(errno)); - pass = 0; - goto test_exit; - } + request = f->attrs; + f->attrs = NULL; /* - * Connect to the server... + * Submit the IPP request... */ - if ((http = httpConnect2(vars->hostname, vars->port, NULL, vars->family, - vars->encryption, 1, 30000, NULL)) == NULL) - { - print_fatal_error(outfile, "Unable to connect to %s on port %d - %s", vars->hostname, - vars->port, cupsLastErrorString()); - pass = 0; - goto test_exit; - } + data->test_count ++; -#ifdef HAVE_LIBZ - httpSetDefaultField(http, HTTP_FIELD_ACCEPT_ENCODING, - "deflate, gzip, identity"); -#else - httpSetDefaultField(http, HTTP_FIELD_ACCEPT_ENCODING, "identity"); -#endif /* HAVE_LIBZ */ + ippSetVersion(request, data->version / 10, data->version % 10); + ippSetRequestId(request, data->request_id); - if (vars->timeout > 0.0) - httpSetTimeout(http, vars->timeout, timeout_cb, NULL); + if (data->output == _CUPS_OUTPUT_PLIST) + { + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "Name\n"); + print_xml_string(data->outfile, "string", data->name); + if (data->file_id[0]) + { + cupsFilePuts(data->outfile, "FileId\n"); + print_xml_string(data->outfile, "string", data->file_id); + } + if (data->test_id[0]) + { + cupsFilePuts(data->outfile, "TestId\n"); + print_xml_string(data->outfile, "string", data->test_id); + } + cupsFilePuts(data->outfile, "Version\n"); + cupsFilePrintf(data->outfile, "%d.%d\n", data->version / 10, data->version % 10); + cupsFilePuts(data->outfile, "Operation\n"); + print_xml_string(data->outfile, "string", ippOpString(ippGetOperation(request))); + cupsFilePuts(data->outfile, "RequestId\n"); + cupsFilePrintf(data->outfile, "%d\n", data->request_id); + cupsFilePuts(data->outfile, "RequestAttributes\n"); + cupsFilePuts(data->outfile, "\n"); + if (ippFirstAttribute(request)) + { + cupsFilePuts(data->outfile, "\n"); + for (attrptr = ippFirstAttribute(request), group = ippGetGroupTag(attrptr); attrptr; attrptr = ippNextAttribute(request)) + print_attr(data->outfile, data->output, attrptr, &group); + cupsFilePuts(data->outfile, "\n"); + } + cupsFilePuts(data->outfile, "\n"); + } - /* - * Loop on tests... - */ + if (data->output == _CUPS_OUTPUT_TEST || (data->output == _CUPS_OUTPUT_PLIST && data->outfile != cupsFileStdout())) + { + if (data->verbosity) + { + cupsFilePrintf(cupsFileStdout(), " %s:\n", ippOpString(ippGetOperation(request))); - CUPS_SRAND((unsigned)time(NULL)); + for (attrptr = ippFirstAttribute(request); attrptr; attrptr = ippNextAttribute(request)) + print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL); + } - errors = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, - (cups_afree_func_t)free); - file_id[0] = '\0'; - pass = 1; - linenum = 0; - request_id = (CUPS_RAND() % 1000) * 137 + 1; + cupsFilePrintf(cupsFileStdout(), " %-68.68s [", data->name); + } - while (!Cancel && get_token(fp, token, sizeof(token), &linenum) != NULL) + if ((data->skip_previous && !data->prev_pass) || data->skip_test) { - /* - * Expect an open brace... - */ + data->skip_count ++; + + ippDelete(request); + request = NULL; + response = NULL; - if (!strcmp(token, "DEFINE")) + if (data->output == _CUPS_OUTPUT_PLIST) { - /* - * DEFINE name value - */ + cupsFilePuts(data->outfile, "Successful\n"); + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "Skipped\n"); + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "StatusCode\n"); + print_xml_string(data->outfile, "string", "skip"); + cupsFilePuts(data->outfile, "ResponseAttributes\n"); + cupsFilePuts(data->outfile, "\n"); + } - if (get_token(fp, attr, sizeof(attr), &linenum) && - get_token(fp, temp, sizeof(temp), &linenum)) - { - expand_variables(vars, token, temp, sizeof(token)); - set_variable(outfile, vars, attr, token); - } - else - { - print_fatal_error(outfile, "Missing DEFINE name and/or value on line %d.", - linenum); - pass = 0; - goto test_exit; - } + if (data->output == _CUPS_OUTPUT_TEST || (data->output == _CUPS_OUTPUT_PLIST && data->outfile != cupsFileStdout())) + cupsFilePuts(cupsFileStdout(), "SKIP]\n"); - continue; - } - else if (!strcmp(token, "DEFINE-DEFAULT")) - { - /* - * DEFINE-DEFAULT name value - */ + goto skip_error; + } - if (get_token(fp, attr, sizeof(attr), &linenum) && - get_token(fp, temp, sizeof(temp), &linenum)) - { - expand_variables(vars, token, temp, sizeof(token)); - if (!get_variable(vars, attr)) - set_variable(outfile, vars, attr, token); - } - else - { - print_fatal_error(outfile, "Missing DEFINE-DEFAULT name and/or value on line " - "%d.", linenum); - pass = 0; - goto test_exit; - } + vars->password_tries = 0; - continue; - } - else if (!strcmp(token, "FILE-ID")) - { - /* - * FILE-ID "string" - */ + do + { + if (data->delay > 0) + usleep(data->delay); - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - expand_variables(vars, file_id, temp, sizeof(file_id)); - } - else - { - print_fatal_error(outfile, "Missing FILE-ID value on line %d.", linenum); - pass = 0; - goto test_exit; - } + data->delay = data->repeat_interval; + repeat_count ++; - continue; - } - else if (!strcmp(token, "IGNORE-ERRORS")) + status = HTTP_STATUS_OK; + + if (data->transfer == _CUPS_TRANSFER_CHUNKED || (data->transfer == _CUPS_TRANSFER_AUTO && data->file[0])) { /* - * IGNORE-ERRORS yes - * IGNORE-ERRORS no + * Send request using chunking - a 0 length means "chunk". */ - if (get_token(fp, temp, sizeof(temp), &linenum) && - (!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) - { - IgnoreErrors = !_cups_strcasecmp(temp, "yes"); - } - else - { - print_fatal_error(outfile, "Missing IGNORE-ERRORS value on line %d.", linenum); - pass = 0; - goto test_exit; - } - - continue; + length = 0; } - else if (!strcmp(token, "INCLUDE")) + else { /* - * INCLUDE "filename" - * INCLUDE + * Send request using content length... */ - if (get_token(fp, temp, sizeof(temp), &linenum)) + length = ippLength(request); + + if (data->file[0] && (reqfile = cupsFileOpen(data->file, "r")) != NULL) { /* - * Map the filename to and then run the tests... + * Read the file to get the uncompressed file size... */ - if (!do_tests(outfile, vars, get_filename(testfile, filename, temp, sizeof(filename)))) - { - pass = 0; + while ((bytes = cupsFileRead(reqfile, buffer, sizeof(buffer))) > 0) + length += (size_t)bytes; - if (StopAfterIncludeError) - goto test_exit; - } - } - else - { - print_fatal_error(outfile, "Missing INCLUDE filename on line %d.", linenum); - pass = 0; - goto test_exit; + cupsFileClose(reqfile); } - - show_header = 1; - continue; } - else if (!strcmp(token, "INCLUDE-IF-DEFINED")) - { - /* - * INCLUDE-IF-DEFINED name "filename" - * INCLUDE-IF-DEFINED name - */ - if (get_token(fp, attr, sizeof(attr), &linenum) && - get_token(fp, temp, sizeof(temp), &linenum)) + /* + * Send the request... + */ + + data->prev_pass = 1; + repeat_test = 0; + response = NULL; + + if (status != HTTP_STATUS_ERROR) + { + while (!response && !Cancel && data->prev_pass) { + status = cupsSendRequest(data->http, request, data->resource, length); + +#ifdef HAVE_LIBZ + if (data->compression[0]) + httpSetField(data->http, HTTP_FIELD_CONTENT_ENCODING, data->compression); +#endif /* HAVE_LIBZ */ + + if (!Cancel && status == HTTP_STATUS_CONTINUE && ippGetState(request) == IPP_DATA && data->file[0]) + { + if ((reqfile = cupsFileOpen(data->file, "r")) != NULL) + { + while (!Cancel && (bytes = cupsFileRead(reqfile, buffer, sizeof(buffer))) > 0) + { + if ((status = cupsWriteRequestData(data->http, buffer, (size_t)bytes)) != HTTP_STATUS_CONTINUE) + break; + } + + cupsFileClose(reqfile); + } + else + { + snprintf(buffer, sizeof(buffer), "%s: %s", data->file, strerror(errno)); + _cupsSetError(IPP_INTERNAL_ERROR, buffer, 0); + + status = HTTP_STATUS_ERROR; + } + } + /* - * Map the filename to and then run the tests... + * Get the server's response... */ - if (get_variable(vars, attr) && - !do_tests(outfile, vars, get_filename(testfile, filename, temp, sizeof(filename)))) + if (!Cancel && status != HTTP_STATUS_ERROR) { - pass = 0; + response = cupsGetResponse(data->http, data->resource); + status = httpGetStatus(data->http); + } - if (StopAfterIncludeError) - goto test_exit; + if (!Cancel && status == HTTP_STATUS_ERROR && httpError(data->http) != EINVAL && +#ifdef WIN32 + httpError(data->http) != WSAETIMEDOUT) +#else + httpError(data->http) != ETIMEDOUT) +#endif /* WIN32 */ + { + if (httpReconnect2(data->http, 30000, NULL)) + data->prev_pass = 0; + } + else if (status == HTTP_STATUS_ERROR || status == HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED) + { + data->prev_pass = 0; + break; + } + else if (status != HTTP_STATUS_OK) + { + httpFlush(data->http); + + if (status == HTTP_STATUS_UNAUTHORIZED) + continue; + + break; } } - else - { - print_fatal_error(outfile, "Missing INCLUDE-IF-DEFINED name or filename on line " - "%d.", linenum); - pass = 0; - goto test_exit; - } + } - show_header = 1; - continue; + if (!Cancel && status == HTTP_STATUS_ERROR && httpError(data->http) != EINVAL && +#ifdef WIN32 + httpError(data->http) != WSAETIMEDOUT) +#else + httpError(data->http) != ETIMEDOUT) +#endif /* WIN32 */ + { + if (httpReconnect2(data->http, 30000, NULL)) + data->prev_pass = 0; } - else if (!strcmp(token, "INCLUDE-IF-NOT-DEFINED")) + else if (status == HTTP_STATUS_ERROR) { - /* - * INCLUDE-IF-NOT-DEFINED name "filename" - * INCLUDE-IF-NOT-DEFINED name - */ + if (!Cancel) + httpReconnect2(data->http, 30000, NULL); - if (get_token(fp, attr, sizeof(attr), &linenum) && - get_token(fp, temp, sizeof(temp), &linenum)) - { - /* - * Map the filename to and then run the tests... - */ + data->prev_pass = 0; + } + else if (status != HTTP_STATUS_OK) + { + httpFlush(data->http); + data->prev_pass = 0; + } - if (!get_variable(vars, attr) && - !do_tests(outfile, vars, get_filename(testfile, filename, temp, sizeof(filename)))) - { - pass = 0; + /* + * Check results of request... + */ - if (StopAfterIncludeError) - goto test_exit; - } - } - else - { - print_fatal_error(outfile, "Missing INCLUDE-IF-NOT-DEFINED name or filename on " - "line %d.", linenum); - pass = 0; - goto test_exit; - } + cupsArrayClear(data->errors); + + if (httpGetVersion(data->http) != HTTP_1_1) + { + int version = httpGetVersion(data->http); - show_header = 1; - continue; + add_stringf(data->errors, "Bad HTTP version (%d.%d)", version / 100, version % 100); } - else if (!strcmp(token, "SKIP-IF-DEFINED")) + + if (data->validate_headers) { - /* - * SKIP-IF-DEFINED variable - */ + const char *header; /* HTTP header value */ - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - if (get_variable(vars, temp)) - goto test_exit; - } - else - { - print_fatal_error(outfile, "Missing SKIP-IF-DEFINED variable on line %d.", - linenum); - pass = 0; - goto test_exit; - } + if ((header = httpGetField(data->http, HTTP_FIELD_CONTENT_TYPE)) == NULL || _cups_strcasecmp(header, "application/ipp")) + add_stringf(data->errors, "Bad HTTP Content-Type in response (%s)", header && *header ? header : ""); + + if ((header = httpGetField(data->http, HTTP_FIELD_DATE)) != NULL && *header && httpGetDateTime(header) == 0) + add_stringf(data->errors, "Bad HTTP Date in response (%s)", header); } - else if (!strcmp(token, "SKIP-IF-NOT-DEFINED")) + + if (!response) { /* - * SKIP-IF-NOT-DEFINED variable + * No response, log error... */ - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - if (!get_variable(vars, temp)) - goto test_exit; - } - else - { - print_fatal_error(outfile, "Missing SKIP-IF-NOT-DEFINED variable on line %d.", - linenum); - pass = 0; - goto test_exit; - } + add_stringf(data->errors, "IPP request failed with status %s (%s)", ippErrorString(cupsLastError()), cupsLastErrorString()); } - else if (!strcmp(token, "STOP-AFTER-INCLUDE-ERROR")) + else { /* - * STOP-AFTER-INCLUDE-ERROR yes - * STOP-AFTER-INCLUDE-ERROR no + * Collect common attribute values... */ - if (get_token(fp, temp, sizeof(temp), &linenum) && - (!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) + if ((attrptr = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) != NULL) { - StopAfterIncludeError = !_cups_strcasecmp(temp, "yes"); + snprintf(temp, sizeof(temp), "%d", ippGetInteger(attrptr, 0)); + _ippVarsSet(vars, "job-id", temp); } - else + + if ((attrptr = ippFindAttribute(response, "job-uri", IPP_TAG_URI)) != NULL) + _ippVarsSet(vars, "job-uri", ippGetString(attrptr, 0, NULL)); + + if ((attrptr = ippFindAttribute(response, "notify-subscription-id", IPP_TAG_INTEGER)) != NULL) { - print_fatal_error(outfile, "Missing STOP-AFTER-INCLUDE-ERROR value on line %d.", - linenum); - pass = 0; - goto test_exit; + snprintf(temp, sizeof(temp), "%d", ippGetInteger(attrptr, 0)); + _ippVarsSet(vars, "notify-subscription-id", temp); } - continue; - } - else if (!strcmp(token, "TRANSFER")) - { /* - * TRANSFER auto - * TRANSFER chunked - * TRANSFER length + * Check response, validating groups and attributes and logging errors + * as needed... */ - if (get_token(fp, temp, sizeof(temp), &linenum)) + if (ippGetState(response) != IPP_DATA) + add_stringf(data->errors, "Missing end-of-attributes-tag in response (RFC 2910 section 3.5.1)"); + + if (data->version) { - if (!strcmp(temp, "auto")) - Transfer = _CUPS_TRANSFER_AUTO; - else if (!strcmp(temp, "chunked")) - Transfer = _CUPS_TRANSFER_CHUNKED; - else if (!strcmp(temp, "length")) - Transfer = _CUPS_TRANSFER_LENGTH; - else - { - print_fatal_error(outfile, "Bad TRANSFER value \"%s\" on line %d.", temp, - linenum); - pass = 0; - goto test_exit; - } + int major, minor; /* IPP version */ + + major = ippGetVersion(response, &minor); + + if (major != (data->version / 10) || minor != (data->version % 10)) + add_stringf(data->errors, "Bad version %d.%d in response - expected %d.%d (RFC 2911 section 3.1.8).", major, minor, data->version / 10, data->version % 10); + } + + if (ippGetRequestId(response) != data->request_id) + add_stringf(data->errors, "Bad request ID %d in response - expected %d (RFC 2911 section 3.1.1)", ippGetRequestId(response), data->request_id); + + attrptr = ippFirstAttribute(response); + if (!attrptr) + { + add_stringf(data->errors, "Missing first attribute \"attributes-charset (charset)\" in group operation-attributes-tag (RFC 2911 section 3.1.4)."); } else { - print_fatal_error(outfile, "Missing TRANSFER value on line %d.", linenum); - pass = 0; - goto test_exit; + if (!ippGetName(attrptr) || ippGetValueTag(attrptr) != IPP_TAG_CHARSET || ippGetGroupTag(attrptr) != IPP_TAG_OPERATION || ippGetCount(attrptr) != 1 ||strcmp(ippGetName(attrptr), "attributes-charset")) + add_stringf(data->errors, "Bad first attribute \"%s (%s%s)\" in group %s, expected \"attributes-charset (charset)\" in group operation-attributes-tag (RFC 2911 section 3.1.4).", ippGetName(attrptr) ? ippGetName(attrptr) : "(null)", ippGetCount(attrptr) > 1 ? "1setOf " : "", ippTagString(ippGetValueTag(attrptr)), ippTagString(ippGetGroupTag(attrptr))); + + attrptr = ippNextAttribute(response); + if (!attrptr) + add_stringf(data->errors, "Missing second attribute \"attributes-natural-language (naturalLanguage)\" in group operation-attributes-tag (RFC 2911 section 3.1.4)."); + else if (!ippGetName(attrptr) || ippGetValueTag(attrptr) != IPP_TAG_LANGUAGE || ippGetGroupTag(attrptr) != IPP_TAG_OPERATION || ippGetCount(attrptr) != 1 || strcmp(ippGetName(attrptr), "attributes-natural-language")) + add_stringf(data->errors, "Bad first attribute \"%s (%s%s)\" in group %s, expected \"attributes-natural-language (naturalLanguage)\" in group operation-attributes-tag (RFC 2911 section 3.1.4).", ippGetName(attrptr) ? ippGetName(attrptr) : "(null)", ippGetCount(attrptr) > 1 ? "1setOf " : "", ippTagString(ippGetValueTag(attrptr)), ippTagString(ippGetGroupTag(attrptr))); } - continue; - } - else if (!strcmp(token, "VERSION")) - { - if (get_token(fp, temp, sizeof(temp), &linenum)) + if ((attrptr = ippFindAttribute(response, "status-message", IPP_TAG_ZERO)) != NULL) { - if (!strcmp(temp, "1.0")) - Version = 10; - else if (!strcmp(temp, "1.1")) - Version = 11; - else if (!strcmp(temp, "2.0")) - Version = 20; - else if (!strcmp(temp, "2.1")) - Version = 21; - else if (!strcmp(temp, "2.2")) - Version = 22; - else - { - print_fatal_error(outfile, "Bad VERSION \"%s\" on line %d.", temp, linenum); - pass = 0; - goto test_exit; - } + const char *status_message = ippGetString(attrptr, 0, NULL); + /* String value */ + + if (ippGetValueTag(attrptr) != IPP_TAG_TEXT) + add_stringf(data->errors, "status-message (text(255)) has wrong value tag %s (RFC 2911 section 3.1.6.2).", ippTagString(ippGetValueTag(attrptr))); + if (ippGetGroupTag(attrptr) != IPP_TAG_OPERATION) + add_stringf(data->errors, "status-message (text(255)) has wrong group tag %s (RFC 2911 section 3.1.6.2).", ippTagString(ippGetGroupTag(attrptr))); + if (ippGetCount(attrptr) != 1) + add_stringf(data->errors, "status-message (text(255)) has %d values (RFC 2911 section 3.1.6.2).", ippGetCount(attrptr)); + if (status_message && strlen(status_message) > 255) + add_stringf(data->errors, "status-message (text(255)) has bad length %d (RFC 2911 section 3.1.6.2).", (int)strlen(status_message)); } - else + + if ((attrptr = ippFindAttribute(response, "detailed-status-message", + IPP_TAG_ZERO)) != NULL) { - print_fatal_error(outfile, "Missing VERSION number on line %d.", linenum); - pass = 0; - goto test_exit; + const char *detailed_status_message = ippGetString(attrptr, 0, NULL); + /* String value */ + + if (ippGetValueTag(attrptr) != IPP_TAG_TEXT) + add_stringf(data->errors, + "detailed-status-message (text(MAX)) has wrong " + "value tag %s (RFC 2911 section 3.1.6.3).", + ippTagString(ippGetValueTag(attrptr))); + if (ippGetGroupTag(attrptr) != IPP_TAG_OPERATION) + add_stringf(data->errors, + "detailed-status-message (text(MAX)) has wrong " + "group tag %s (RFC 2911 section 3.1.6.3).", + ippTagString(ippGetGroupTag(attrptr))); + if (ippGetCount(attrptr) != 1) + add_stringf(data->errors, + "detailed-status-message (text(MAX)) has %d values" + " (RFC 2911 section 3.1.6.3).", + ippGetCount(attrptr)); + if (detailed_status_message && strlen(detailed_status_message) > 1023) + add_stringf(data->errors, + "detailed-status-message (text(MAX)) has bad " + "length %d (RFC 2911 section 3.1.6.3).", + (int)strlen(detailed_status_message)); } - continue; - } - else if (strcmp(token, "{")) - { - print_fatal_error(outfile, "Unexpected token %s seen on line %d.", token, linenum); - pass = 0; - goto test_exit; - } + a = cupsArrayNew((cups_array_func_t)strcmp, NULL); - /* - * Initialize things... - */ + for (attrptr = ippFirstAttribute(response), group = ippGetGroupTag(attrptr); + attrptr; + attrptr = ippNextAttribute(response)) + { + if (ippGetGroupTag(attrptr) != group) + { + int out_of_order = 0; /* Are attribute groups out-of-order? */ + cupsArrayClear(a); - if (show_header) - { - if (Output == _CUPS_OUTPUT_PLIST) - print_xml_header(outfile); - if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout())) - cupsFilePrintf(cupsFileStdout(), "\"%s\":\n", testfile); + switch (ippGetGroupTag(attrptr)) + { + case IPP_TAG_ZERO : + break; - show_header = 0; - } + case IPP_TAG_OPERATION : + out_of_order = 1; + break; - strlcpy(resource, vars->resource, sizeof(resource)); - - request_id ++; - request = ippNew(); - op = (ipp_op_t)0; - group = IPP_TAG_ZERO; - ignore_errors = IgnoreErrors; - last_expect = NULL; - last_status = NULL; - filename[0] = '\0'; - skip_previous = 0; - skip_test = 0; - test_id[0] = '\0'; - version = Version; - transfer = Transfer; - compression[0] = '\0'; - delay = 0; - repeat_count = 0; - repeat_interval = 5000000; - - strlcpy(name, testfile, sizeof(name)); - if (strrchr(name, '.') != NULL) - *strrchr(name, '.') = '\0'; + case IPP_TAG_UNSUPPORTED_GROUP : + if (group != IPP_TAG_OPERATION) + out_of_order = 1; + break; - /* - * Parse until we see a close brace... - */ + case IPP_TAG_JOB : + case IPP_TAG_PRINTER : + if (group != IPP_TAG_OPERATION && group != IPP_TAG_UNSUPPORTED_GROUP) + out_of_order = 1; + break; - while (get_token(fp, token, sizeof(token), &linenum) != NULL) - { - if (_cups_strcasecmp(token, "COUNT") && - _cups_strcasecmp(token, "DEFINE-MATCH") && - _cups_strcasecmp(token, "DEFINE-NO-MATCH") && - _cups_strcasecmp(token, "DEFINE-VALUE") && - _cups_strcasecmp(token, "IF-DEFINED") && - _cups_strcasecmp(token, "IF-NOT-DEFINED") && - _cups_strcasecmp(token, "IN-GROUP") && - _cups_strcasecmp(token, "OF-TYPE") && - _cups_strcasecmp(token, "REPEAT-LIMIT") && - _cups_strcasecmp(token, "REPEAT-MATCH") && - _cups_strcasecmp(token, "REPEAT-NO-MATCH") && - _cups_strcasecmp(token, "SAME-COUNT-AS") && - _cups_strcasecmp(token, "WITH-ALL-VALUES") && - _cups_strcasecmp(token, "WITH-ALL-HOSTNAMES") && - _cups_strcasecmp(token, "WITH-ALL-RESOURCES") && - _cups_strcasecmp(token, "WITH-ALL-SCHEMES") && - _cups_strcasecmp(token, "WITH-HOSTNAME") && - _cups_strcasecmp(token, "WITH-RESOURCE") && - _cups_strcasecmp(token, "WITH-SCHEME") && - _cups_strcasecmp(token, "WITH-VALUE") && - _cups_strcasecmp(token, "WITH-VALUE-FROM")) - last_expect = NULL; - - if (_cups_strcasecmp(token, "DEFINE-MATCH") && - _cups_strcasecmp(token, "DEFINE-NO-MATCH") && - _cups_strcasecmp(token, "IF-DEFINED") && - _cups_strcasecmp(token, "IF-NOT-DEFINED") && - _cups_strcasecmp(token, "REPEAT-LIMIT") && - _cups_strcasecmp(token, "REPEAT-MATCH") && - _cups_strcasecmp(token, "REPEAT-NO-MATCH")) - last_status = NULL; - - if (!strcmp(token, "}")) - break; - else if (!strcmp(token, "{") && lastcol) - { - /* - * Another collection value - */ + case IPP_TAG_SUBSCRIPTION : + if (group > ippGetGroupTag(attrptr) && group != IPP_TAG_DOCUMENT) + out_of_order = 1; + break; - ipp_t *col = get_collection(outfile, vars, fp, &linenum); - /* Collection value */ + default : + if (group > ippGetGroupTag(attrptr)) + out_of_order = 1; + break; + } - if (col) - { - ippSetCollection(request, &lastcol, ippGetCount(lastcol), col); - } - else - { - pass = 0; - goto test_exit; + if (out_of_order) + add_stringf(data->errors, "Attribute groups out of order (%s < %s)", + ippTagString(ippGetGroupTag(attrptr)), + ippTagString(group)); + + if (ippGetGroupTag(attrptr) != IPP_TAG_ZERO) + group = ippGetGroupTag(attrptr); } - } - else if (!strcmp(token, "COMPRESSION")) - { - /* - * COMPRESSION none - * COMPRESSION deflate - * COMPRESSION gzip - */ - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - expand_variables(vars, compression, temp, sizeof(compression)); -#ifdef HAVE_LIBZ - if (strcmp(compression, "none") && strcmp(compression, "deflate") && - strcmp(compression, "gzip")) -#else - if (strcmp(compression, "none")) -#endif /* HAVE_LIBZ */ - { - print_fatal_error(outfile, "Unsupported COMPRESSION value '%s' on line %d.", - compression, linenum); - pass = 0; - goto test_exit; - } + if (!ippValidateAttribute(attrptr)) + cupsArrayAdd(data->errors, (void *)cupsLastErrorString()); - if (!strcmp(compression, "none")) - compression[0] = '\0'; - } - else + if (ippGetName(attrptr)) { - print_fatal_error(outfile, "Missing COMPRESSION value on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!strcmp(token, "DEFINE")) - { - /* - * DEFINE name value - */ + if (cupsArrayFind(a, (void *)ippGetName(attrptr)) && data->output < _CUPS_OUTPUT_LIST) + add_stringf(data->errors, "Duplicate \"%s\" attribute in %s group", + ippGetName(attrptr), ippTagString(group)); - if (get_token(fp, attr, sizeof(attr), &linenum) && - get_token(fp, temp, sizeof(temp), &linenum)) - { - expand_variables(vars, token, temp, sizeof(token)); - set_variable(outfile, vars, attr, token); - } - else - { - print_fatal_error(outfile, "Missing DEFINE name and/or value on line %d.", - linenum); - pass = 0; - goto test_exit; + cupsArrayAdd(a, (void *)ippGetName(attrptr)); } } - else if (!strcmp(token, "IGNORE-ERRORS")) - { - /* - * IGNORE-ERRORS yes - * IGNORE-ERRORS no - */ - - if (get_token(fp, temp, sizeof(temp), &linenum) && - (!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) - { - ignore_errors = !_cups_strcasecmp(temp, "yes"); - } - else - { - print_fatal_error(outfile, "Missing IGNORE-ERRORS value on line %d.", linenum); - pass = 0; - goto test_exit; - } - continue; - } - else if (!_cups_strcasecmp(token, "NAME")) - { - /* - * Name of test... - */ + cupsArrayDelete(a); - get_token(fp, temp, sizeof(temp), &linenum); - expand_variables(vars, name, temp, sizeof(name)); - } - else if (!_cups_strcasecmp(token, "PAUSE")) - { - /* - * Pause with a message... - */ + /* + * Now check the test-defined expected status-code and attribute + * values... + */ - get_token(fp, token, sizeof(token), &linenum); - pause_message(token); - } - else if (!strcmp(token, "REQUEST-ID")) + for (i = 0, status_ok = 0; i < data->num_statuses; i ++) { - /* - * REQUEST-ID # - * REQUEST-ID random - */ + if (data->statuses[i].if_defined && + !_ippVarsGet(vars, data->statuses[i].if_defined)) + continue; - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - if (isdigit(temp[0] & 255)) - request_id = atoi(temp); - else if (!_cups_strcasecmp(temp, "random")) - request_id = (CUPS_RAND() % 1000) * 137 + 1; - else - { - print_fatal_error(outfile, "Bad REQUEST-ID value \"%s\" on line %d.", temp, - linenum); - pass = 0; - goto test_exit; - } - } - else - { - print_fatal_error(outfile, "Missing REQUEST-ID value on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!strcmp(token, "SKIP-IF-DEFINED")) - { - /* - * SKIP-IF-DEFINED variable - */ + if (data->statuses[i].if_not_defined && + _ippVarsGet(vars, data->statuses[i].if_not_defined)) + continue; - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - if (get_variable(vars, temp)) - skip_test = 1; - } - else + if (ippGetStatusCode(response) == data->statuses[i].status) { - print_fatal_error(outfile, "Missing SKIP-IF-DEFINED value on line %d.", - linenum); - pass = 0; - goto test_exit; - } - } - else if (!strcmp(token, "SKIP-IF-MISSING")) - { - /* - * SKIP-IF-MISSING filename - */ + status_ok = 1; - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - expand_variables(vars, token, temp, sizeof(token)); - get_filename(testfile, filename, token, sizeof(filename)); + if (data->statuses[i].repeat_match && repeat_count < data->statuses[i].repeat_limit) + repeat_test = 1; - if (access(filename, R_OK)) - skip_test = 1; + if (data->statuses[i].define_match) + _ippVarsSet(vars, data->statuses[i].define_match, "1"); } else { - print_fatal_error(outfile, "Missing SKIP-IF-MISSING filename on line %d.", - linenum); - pass = 0; - goto test_exit; - } - } - else if (!strcmp(token, "SKIP-IF-NOT-DEFINED")) - { - /* - * SKIP-IF-NOT-DEFINED variable - */ + if (data->statuses[i].repeat_no_match && repeat_count < data->statuses[i].repeat_limit) + repeat_test = 1; - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - if (!get_variable(vars, temp)) - skip_test = 1; - } - else - { - print_fatal_error(outfile, "Missing SKIP-IF-NOT-DEFINED value on line %d.", - linenum); - pass = 0; - goto test_exit; + if (data->statuses[i].define_no_match) + { + _ippVarsSet(vars, data->statuses[i].define_no_match, "1"); + status_ok = 1; + } } } - else if (!strcmp(token, "SKIP-PREVIOUS-ERROR")) - { - /* - * SKIP-PREVIOUS-ERROR yes - * SKIP-PREVIOUS-ERROR no - */ - if (get_token(fp, temp, sizeof(temp), &linenum) && - (!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) - { - skip_previous = !_cups_strcasecmp(temp, "yes"); - } - else + if (!status_ok && data->num_statuses > 0) + { + for (i = 0; i < data->num_statuses; i ++) { - print_fatal_error(outfile, "Missing SKIP-PREVIOUS-ERROR value on line %d.", linenum); - pass = 0; - goto test_exit; - } + if (data->statuses[i].if_defined && + !_ippVarsGet(vars, data->statuses[i].if_defined)) + continue; - continue; - } - else if (!strcmp(token, "TEST-ID")) - { - /* - * TEST-ID "string" - */ + if (data->statuses[i].if_not_defined && + _ippVarsGet(vars, data->statuses[i].if_not_defined)) + continue; - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - expand_variables(vars, test_id, temp, sizeof(test_id)); - } - else - { - print_fatal_error(outfile, "Missing TEST-ID value on line %d.", linenum); - pass = 0; - goto test_exit; + if (!data->statuses[i].repeat_match || repeat_count >= data->statuses[i].repeat_limit) + add_stringf(data->errors, "EXPECTED: STATUS %s (got %s)", + ippErrorString(data->statuses[i].status), + ippErrorString(cupsLastError())); } - continue; + if ((attrptr = ippFindAttribute(response, "status-message", + IPP_TAG_TEXT)) != NULL) + add_stringf(data->errors, "status-message=\"%s\"", ippGetString(attrptr, 0, NULL)); } - else if (!strcmp(token, "TRANSFER")) - { - /* - * TRANSFER auto - * TRANSFER chunked - * TRANSFER length - */ - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - if (!strcmp(temp, "auto")) - transfer = _CUPS_TRANSFER_AUTO; - else if (!strcmp(temp, "chunked")) - transfer = _CUPS_TRANSFER_CHUNKED; - else if (!strcmp(temp, "length")) - transfer = _CUPS_TRANSFER_LENGTH; - else - { - print_fatal_error(outfile, "Bad TRANSFER value \"%s\" on line %d.", temp, - linenum); - pass = 0; - goto test_exit; - } - } - else - { - print_fatal_error(outfile, "Missing TRANSFER value on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "VERSION")) - { - if (get_token(fp, temp, sizeof(temp), &linenum)) - { - if (!strcmp(temp, "0.0")) - version = 0; - else if (!strcmp(temp, "1.0")) - version = 10; - else if (!strcmp(temp, "1.1")) - version = 11; - else if (!strcmp(temp, "2.0")) - version = 20; - else if (!strcmp(temp, "2.1")) - version = 21; - else if (!strcmp(temp, "2.2")) - version = 22; - else - { - print_fatal_error(outfile, "Bad VERSION \"%s\" on line %d.", temp, linenum); - pass = 0; - goto test_exit; - } - } - else - { - print_fatal_error(outfile, "Missing VERSION number on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "RESOURCE")) + for (i = data->num_expects, expect = data->expects; i > 0; i --, expect ++) { - /* - * Resource name... - */ + ipp_attribute_t *group_found; /* Found parent attribute for group tests */ - if (!get_token(fp, resource, sizeof(resource), &linenum)) - { - print_fatal_error(outfile, "Missing RESOURCE path on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "OPERATION")) - { - /* - * Operation... - */ + if (expect->if_defined && !_ippVarsGet(vars, expect->if_defined)) + continue; - if (!get_token(fp, temp, sizeof(temp), &linenum)) - { - print_fatal_error(outfile, "Missing OPERATION code on line %d.", linenum); - pass = 0; - goto test_exit; - } + if (expect->if_not_defined && + _ippVarsGet(vars, expect->if_not_defined)) + continue; - expand_variables(vars, token, temp, sizeof(token)); + found = ippFindAttribute(response, expect->name, IPP_TAG_ZERO); - if ((op = ippOpValue(token)) == (ipp_op_t)-1 && - (op = (ipp_op_t)strtol(token, NULL, 0)) == 0) + do { - print_fatal_error(outfile, "Bad OPERATION code \"%s\" on line %d.", token, - linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "GROUP")) - { - /* - * Attribute group... - */ + group_found = found; - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing GROUP tag on line %d.", linenum); - pass = 0; - goto test_exit; - } + if (expect->in_group && strchr(expect->name, '/')) + { + char group_name[256],/* Parent attribute name */ + *group_ptr; /* Pointer into parent attribute name */ - if ((value = ippTagValue(token)) == IPP_TAG_ZERO || value >= IPP_TAG_UNSUPPORTED_VALUE) - { - print_fatal_error(outfile, "Bad GROUP tag \"%s\" on line %d.", token, linenum); - pass = 0; - goto test_exit; - } + strlcpy(group_name, expect->name, sizeof(group_name)); + if ((group_ptr = strchr(group_name, '/')) != NULL) + *group_ptr = '\0'; - if (value == group) - ippAddSeparator(request); + group_found = ippFindAttribute(response, group_name, IPP_TAG_ZERO); + } - group = value; - } - else if (!_cups_strcasecmp(token, "DELAY")) - { - /* - * Delay before operation... - */ + if ((found && expect->not_expect) || + (!found && !(expect->not_expect || expect->optional)) || + (found && !expect_matches(expect, ippGetValueTag(found))) || + (group_found && expect->in_group && ippGetGroupTag(group_found) != expect->in_group)) + { + if (expect->define_no_match) + _ippVarsSet(vars, expect->define_no_match, "1"); + else if (!expect->define_match && !expect->define_value) + { + if (found && expect->not_expect) + add_stringf(data->errors, "NOT EXPECTED: %s", expect->name); + else if (!found && !(expect->not_expect || expect->optional)) + add_stringf(data->errors, "EXPECTED: %s", expect->name); + else if (found) + { + if (!expect_matches(expect, ippGetValueTag(found))) + add_stringf(data->errors, "EXPECTED: %s OF-TYPE %s (got %s)", + expect->name, expect->of_type, + ippTagString(ippGetValueTag(found))); + + if (expect->in_group && ippGetGroupTag(group_found) != expect->in_group) + add_stringf(data->errors, "EXPECTED: %s IN-GROUP %s (got %s).", + expect->name, ippTagString(expect->in_group), + ippTagString(ippGetGroupTag(group_found))); + } + } - double dval; /* Delay value */ + if (expect->repeat_no_match && repeat_count < expect->repeat_limit) + repeat_test = 1; + break; + } - if (!get_token(fp, temp, sizeof(temp), &linenum)) - { - print_fatal_error(outfile, "Missing DELAY value on line %d.", linenum); - pass = 0; - goto test_exit; - } + if (found) + ippAttributeString(found, buffer, sizeof(buffer)); - expand_variables(vars, token, temp, sizeof(token)); + if (found && expect->with_value_from && !with_value_from(NULL, ippFindAttribute(response, expect->with_value_from, IPP_TAG_ZERO), found, buffer, sizeof(buffer))) + { + if (expect->define_no_match) + _ippVarsSet(vars, expect->define_no_match, "1"); + else if (!expect->define_match && !expect->define_value && ((!expect->repeat_match && !expect->repeat_no_match) || repeat_count >= expect->repeat_limit)) + { + add_stringf(data->errors, "EXPECTED: %s WITH-VALUES-FROM %s", expect->name, expect->with_value_from); - if ((dval = _cupsStrScand(token, &tokenptr, localeconv())) < 0.0 || (*tokenptr && *tokenptr != ',')) - { - print_fatal_error(outfile, "Bad DELAY value \"%s\" on line %d.", token, - linenum); - pass = 0; - goto test_exit; - } + with_value_from(data->errors, ippFindAttribute(response, expect->with_value_from, IPP_TAG_ZERO), found, buffer, sizeof(buffer)); + } - delay = (useconds_t)(1000000.0 * dval); + if (expect->repeat_no_match && repeat_count < expect->repeat_limit) + repeat_test = 1; - if (*tokenptr == ',') - { - if ((dval = _cupsStrScand(tokenptr + 1, &tokenptr, localeconv())) <= 0.0 || *tokenptr) - { - print_fatal_error(outfile, "Bad DELAY value \"%s\" on line %d.", token, - linenum); - pass = 0; - goto test_exit; - } + break; + } + else if (found && !with_value(data, NULL, expect->with_value, expect->with_flags, found, buffer, sizeof(buffer))) + { + if (expect->define_no_match) + _ippVarsSet(vars, expect->define_no_match, "1"); + else if (!expect->define_match && !expect->define_value && + !expect->repeat_match && (!expect->repeat_no_match || repeat_count >= expect->repeat_limit)) + { + if (expect->with_flags & _CUPS_WITH_REGEX) + add_stringf(data->errors, "EXPECTED: %s %s /%s/", expect->name, with_flags_string(expect->with_flags), expect->with_value); + else + add_stringf(data->errors, "EXPECTED: %s %s \"%s\"", expect->name, with_flags_string(expect->with_flags), expect->with_value); - repeat_interval = (useconds_t)(1000000.0 * dval); - } - else - repeat_interval = delay; - } - else if (!_cups_strcasecmp(token, "ATTR")) - { - /* - * Attribute... - */ + with_value(data, data->errors, expect->with_value, expect->with_flags, found, buffer, sizeof(buffer)); + } - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing ATTR value tag on line %d.", linenum); - pass = 0; - goto test_exit; - } + if (expect->repeat_no_match && + repeat_count < expect->repeat_limit) + repeat_test = 1; - if ((value = ippTagValue(token)) < IPP_TAG_UNSUPPORTED_VALUE) - { - print_fatal_error(outfile, "Bad ATTR value tag \"%s\" on line %d.", token, - linenum); - pass = 0; - goto test_exit; - } + break; + } - if (!get_token(fp, attr, sizeof(attr), &linenum)) - { - print_fatal_error(outfile, "Missing ATTR name on line %d.", linenum); - pass = 0; - goto test_exit; - } + if (found && expect->count > 0 && ippGetCount(found) != expect->count) + { + if (expect->define_no_match) + _ippVarsSet(vars, expect->define_no_match, "1"); + else if (!expect->define_match && !expect->define_value) + { + add_stringf(data->errors, "EXPECTED: %s COUNT %d (got %d)", expect->name, + expect->count, ippGetCount(found)); + } - if (value < IPP_TAG_INTEGER) - { - /* - * Add out-of-band value - no value string needed... - */ + if (expect->repeat_no_match && + repeat_count < expect->repeat_limit) + repeat_test = 1; - token[0] = '\0'; - } - else if (!get_token(fp, temp, sizeof(temp), &linenum)) - { - print_fatal_error(outfile, "Missing ATTR value on line %d.", linenum); - pass = 0; - goto test_exit; - } - else - { - expand_variables(vars, token, temp, sizeof(token)); - } + break; + } - attrptr = NULL; + if (found && expect->same_count_as) + { + attrptr = ippFindAttribute(response, expect->same_count_as, + IPP_TAG_ZERO); - switch (value) - { - default : - if (value < IPP_TAG_INTEGER) - { - /* - * Add out-of-band value... - */ + if (!attrptr || ippGetCount(attrptr) != ippGetCount(found)) + { + if (expect->define_no_match) + _ippVarsSet(vars, expect->define_no_match, "1"); + else if (!expect->define_match && !expect->define_value) + { + if (!attrptr) + add_stringf(data->errors, + "EXPECTED: %s (%d values) SAME-COUNT-AS %s " + "(not returned)", expect->name, + ippGetCount(found), expect->same_count_as); + else if (ippGetCount(attrptr) != ippGetCount(found)) + add_stringf(data->errors, + "EXPECTED: %s (%d values) SAME-COUNT-AS %s " + "(%d values)", expect->name, ippGetCount(found), + expect->same_count_as, ippGetCount(attrptr)); + } - attrptr = ippAddOutOfBand(request, group, value, attr); - } - else - { - print_fatal_error(outfile, "Unsupported ATTR value tag %s for \"%s\" on line %d.", ippTagString(value), attr, linenum); - pass = 0; - goto test_exit; - } - break; + if (expect->repeat_no_match && + repeat_count < expect->repeat_limit) + repeat_test = 1; - case IPP_TAG_BOOLEAN : - if (!_cups_strcasecmp(token, "true")) - attrptr = ippAddBoolean(request, group, attr, 1); - else - attrptr = ippAddBoolean(request, group, attr, (char)atoi(token)); break; + } + } - case IPP_TAG_INTEGER : - case IPP_TAG_ENUM : - if (!strchr(token, ',')) - { - if (isdigit(token[0] & 255) || token[0] == '-') - attrptr = ippAddInteger(request, group, value, attr, (int)strtol(token, &tokenptr, 0)); - else - { - tokenptr = token; - if ((i = ippEnumValue(attr, tokenptr)) >= 0) - { - attrptr = ippAddInteger(request, group, value, attr, i); - tokenptr += strlen(tokenptr); - } - } - } - else - { - int values[100], /* Values */ - num_values = 1; /* Number of values */ - - if (!isdigit(token[0] & 255) && token[0] != '-' && value == IPP_TAG_ENUM) - { - char *ptr; /* Pointer to next terminator */ + if (found && expect->define_match) + _ippVarsSet(vars, expect->define_match, "1"); - if ((ptr = strchr(token, ',')) != NULL) - *ptr++ = '\0'; - else - ptr = token + strlen(token); + if (found && expect->define_value) + { + if (!expect->with_value) + { + int last = ippGetCount(found) - 1; + /* Last element in attribute */ - if ((i = ippEnumValue(attr, token)) < 0) - tokenptr = NULL; - else - tokenptr = ptr; - } - else - i = (int)strtol(token, &tokenptr, 0); + switch (ippGetValueTag(found)) + { + case IPP_TAG_ENUM : + case IPP_TAG_INTEGER : + snprintf(buffer, sizeof(buffer), "%d", ippGetInteger(found, last)); + break; - values[0] = i; + case IPP_TAG_BOOLEAN : + if (ippGetBoolean(found, last)) + strlcpy(buffer, "true", sizeof(buffer)); + else + strlcpy(buffer, "false", sizeof(buffer)); + break; - while (tokenptr && *tokenptr && - num_values < (int)(sizeof(values) / sizeof(values[0]))) - { - if (*tokenptr == ',') - tokenptr ++; + case IPP_TAG_RESOLUTION : + { + int xres, /* Horizontal resolution */ + yres; /* Vertical resolution */ + ipp_res_t units; /* Resolution units */ - if (!isdigit(*tokenptr & 255) && *tokenptr != '-') - { - char *ptr; /* Pointer to next terminator */ + xres = ippGetResolution(found, last, &yres, &units); - if (value != IPP_TAG_ENUM) - break; + if (xres == yres) + snprintf(buffer, sizeof(buffer), "%d%s", xres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); + else + snprintf(buffer, sizeof(buffer), "%dx%d%s", xres, yres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); + } + break; - if ((ptr = strchr(tokenptr, ',')) != NULL) - *ptr++ = '\0'; - else - ptr = tokenptr + strlen(tokenptr); + case IPP_TAG_CHARSET : + case IPP_TAG_KEYWORD : + case IPP_TAG_LANGUAGE : + case IPP_TAG_MIMETYPE : + case IPP_TAG_NAME : + case IPP_TAG_NAMELANG : + case IPP_TAG_TEXT : + case IPP_TAG_TEXTLANG : + case IPP_TAG_URI : + case IPP_TAG_URISCHEME : + strlcpy(buffer, ippGetString(found, last, NULL), sizeof(buffer)); + break; - if ((i = ippEnumValue(attr, tokenptr)) < 0) - break; + default : + ippAttributeString(found, buffer, sizeof(buffer)); + break; + } + } - tokenptr = ptr; - } - else - i = (int)strtol(tokenptr, &tokenptr, 0); + _ippVarsSet(vars, expect->define_value, buffer); + } - values[num_values ++] = i; - } + if (found && expect->repeat_match && + repeat_count < expect->repeat_limit) + repeat_test = 1; + } + while (expect->expect_all && (found = ippFindNextAttribute(response, expect->name, IPP_TAG_ZERO)) != NULL); + } + } - attrptr = ippAddIntegers(request, group, value, attr, num_values, values); - } + /* + * If we are going to repeat this test, display intermediate results... + */ - if ((!token[0] || !tokenptr || *tokenptr) && !skip_test) + if (repeat_test) + { + if (data->output == _CUPS_OUTPUT_TEST || (data->output == _CUPS_OUTPUT_PLIST && data->outfile != cupsFileStdout())) + { + cupsFilePrintf(cupsFileStdout(), "%04d]\n", repeat_count); +\ + if (data->num_displayed > 0) + { + for (attrptr = ippFirstAttribute(response); attrptr; attrptr = ippNextAttribute(response)) + { + const char *attrname = ippGetName(attrptr); + if (attrname) + { + for (i = 0; i < data->num_displayed; i ++) { - print_fatal_error(outfile, "Bad %s value \'%s\' for \"%s\" on line %d.", - ippTagString(value), token, attr, linenum); - pass = 0; - goto test_exit; + if (!strcmp(data->displayed[i], attrname)) + { + print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL); + break; + } } - break; + } + } + } + } - case IPP_TAG_RESOLUTION : - { - int xres, /* X resolution */ - yres; /* Y resolution */ - char *ptr; /* Pointer into value */ - - xres = yres = (int)strtol(token, (char **)&ptr, 10); - if (ptr > token && xres > 0) - { - if (*ptr == 'x') - yres = (int)strtol(ptr + 1, (char **)&ptr, 10); - } - - if (ptr <= token || xres <= 0 || yres <= 0 || !ptr || - (_cups_strcasecmp(ptr, "dpi") && - _cups_strcasecmp(ptr, "dpc") && - _cups_strcasecmp(ptr, "dpcm") && - _cups_strcasecmp(ptr, "other"))) - { - if (skip_test) - break; - - print_fatal_error(outfile, "Bad resolution value \'%s\' for \"%s\" on line %d.", token, attr, linenum); - pass = 0; - goto test_exit; - } - - if (!_cups_strcasecmp(ptr, "dpi")) - attrptr = ippAddResolution(request, group, attr, IPP_RES_PER_INCH, xres, yres); - else if (!_cups_strcasecmp(ptr, "dpc") || - !_cups_strcasecmp(ptr, "dpcm")) - attrptr = ippAddResolution(request, group, attr, IPP_RES_PER_CM, xres, yres); - else - attrptr = ippAddResolution(request, group, attr, (ipp_res_t)0, xres, yres); - } - break; + if (data->output == _CUPS_OUTPUT_TEST || (data->output == _CUPS_OUTPUT_PLIST && data->outfile != cupsFileStdout())) + { + cupsFilePrintf(cupsFileStdout(), " %-68.68s [", data->name); + } - case IPP_TAG_RANGE : - { - int lowers[4], /* Lower value */ - uppers[4], /* Upper values */ - num_vals; /* Number of values */ + ippDelete(response); + response = NULL; + } + } + while (repeat_test); + ippDelete(request); - num_vals = sscanf(token, "%d-%d,%d-%d,%d-%d,%d-%d", - lowers + 0, uppers + 0, - lowers + 1, uppers + 1, - lowers + 2, uppers + 2, - lowers + 3, uppers + 3); + request = NULL; - if ((num_vals & 1) || num_vals == 0) - { - if (skip_test) - break; + if (cupsArrayCount(data->errors) > 0) + data->prev_pass = data->pass = 0; - print_fatal_error(outfile, "Bad rangeOfInteger value \'%s\' for \"%s\" on line %d.", token, attr, linenum); - pass = 0; - goto test_exit; - } + if (data->prev_pass) + data->pass_count ++; + else + data->fail_count ++; - attrptr = ippAddRanges(request, group, attr, num_vals / 2, lowers, - uppers); - } - break; + if (data->output == _CUPS_OUTPUT_PLIST) + { + cupsFilePuts(data->outfile, "Successful\n"); + cupsFilePuts(data->outfile, data->prev_pass ? "\n" : "\n"); + cupsFilePuts(data->outfile, "StatusCode\n"); + print_xml_string(data->outfile, "string", ippErrorString(cupsLastError())); + cupsFilePuts(data->outfile, "ResponseAttributes\n"); + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "\n"); + for (attrptr = ippFirstAttribute(response), group = ippGetGroupTag(attrptr); + attrptr; + attrptr = ippNextAttribute(response)) + print_attr(data->outfile, data->output, attrptr, &group); + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "\n"); + } + else if (data->output == _CUPS_OUTPUT_IPPSERVER && response) + { + for (attrptr = ippFirstAttribute(response); attrptr; attrptr = ippNextAttribute(response)) + { + if (!ippGetName(attrptr) || ippGetGroupTag(attrptr) != IPP_TAG_PRINTER) + continue; - case IPP_TAG_BEGIN_COLLECTION : - if (!strcmp(token, "{")) - { - ipp_t *col = get_collection(outfile, vars, fp, &linenum); - /* Collection value */ + print_ippserver_attr(data, attrptr, 0); + } + } - if (col) - { - attrptr = lastcol = ippAddCollection(request, group, attr, col); - ippDelete(col); - } - else - { - pass = 0; - goto test_exit; - } - } - else if (skip_test) - break; - else - { - print_fatal_error(outfile, "Bad ATTR collection value for \"%s\" on line %d.", attr, linenum); - pass = 0; - goto test_exit; - } + if (data->output == _CUPS_OUTPUT_TEST || (data->output == _CUPS_OUTPUT_PLIST && data->outfile != cupsFileStdout())) + { + cupsFilePuts(cupsFileStdout(), data->prev_pass ? "PASS]\n" : "FAIL]\n"); - do - { - ipp_t *col; /* Collection value */ - off_t savepos = cupsFileTell(fp); /* Save position of file */ - int savelinenum = linenum; /* Save line number */ + if (!data->prev_pass || (data->verbosity && response)) + { + cupsFilePrintf(cupsFileStdout(), " RECEIVED: %lu bytes in response\n", (unsigned long)ippLength(response)); + cupsFilePrintf(cupsFileStdout(), " status-code = %s (%s)\n", ippErrorString(cupsLastError()), cupsLastErrorString()); - if (!get_token(fp, token, sizeof(token), &linenum)) - break; + if (data->verbosity && response) + { + for (attrptr = ippFirstAttribute(response); attrptr; attrptr = ippNextAttribute(response)) + print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL); + } + } + } + else if (!data->prev_pass && data->output != _CUPS_OUTPUT_QUIET) + fprintf(stderr, "%s\n", cupsLastErrorString()); - if (strcmp(token, ",")) - { - cupsFileSeek(fp, savepos); - linenum = savelinenum; - break; - } + if (data->prev_pass && data->output >= _CUPS_OUTPUT_LIST && !data->verbosity && data->num_displayed > 0) + { + size_t width; /* Length of value */ - if (!get_token(fp, token, sizeof(token), &linenum) || strcmp(token, "{")) - { - print_fatal_error(outfile, "Unexpected \"%s\" on line %d.", token, linenum); - pass = 0; - goto test_exit; - break; - } + for (i = 0; i < data->num_displayed; i ++) + { + widths[i] = strlen(data->displayed[i]); - if ((col = get_collection(outfile, vars, fp, &linenum)) == NULL) - break; + for (attrptr = ippFindAttribute(response, data->displayed[i], IPP_TAG_ZERO); + attrptr; + attrptr = ippFindNextAttribute(response, data->displayed[i], IPP_TAG_ZERO)) + { + width = ippAttributeString(attrptr, NULL, 0); + if (width > widths[i]) + widths[i] = width; + } + } - ippSetCollection(request, &attrptr, ippGetCount(attrptr), col); - lastcol = attrptr; - } - while (!strcmp(token, "{")); - break; + if (data->output == _CUPS_OUTPUT_CSV) + print_csv(data, NULL, NULL, data->num_displayed, data->displayed, widths); + else + print_line(data, NULL, NULL, data->num_displayed, data->displayed, widths); - case IPP_TAG_STRING : - attrptr = ippAddOctetString(request, group, attr, token, (int)strlen(token)); - break; + attrptr = ippFirstAttribute(response); - case IPP_TAG_TEXTLANG : - case IPP_TAG_NAMELANG : - case IPP_TAG_TEXT : - case IPP_TAG_NAME : - case IPP_TAG_KEYWORD : - case IPP_TAG_URI : - case IPP_TAG_URISCHEME : - case IPP_TAG_CHARSET : - case IPP_TAG_LANGUAGE : - case IPP_TAG_MIMETYPE : - if (!strchr(token, ',')) - attrptr = ippAddString(request, group, value, attr, NULL, token); - else - { - /* - * Multiple string values... - */ + while (attrptr) + { + while (attrptr && ippGetGroupTag(attrptr) <= IPP_TAG_OPERATION) + attrptr = ippNextAttribute(response); - int num_values; /* Number of values */ - char *values[100], /* Values */ - *ptr; /* Pointer to next value */ + if (attrptr) + { + if (data->output == _CUPS_OUTPUT_CSV) + print_csv(data, response, attrptr, data->num_displayed, data->displayed, widths); + else + print_line(data, response, attrptr, data->num_displayed, data->displayed, widths); + while (attrptr && ippGetGroupTag(attrptr) > IPP_TAG_OPERATION) + attrptr = ippNextAttribute(response); + } + } + } + else if (!data->prev_pass) + { + if (data->output == _CUPS_OUTPUT_PLIST) + { + cupsFilePuts(data->outfile, "Errors\n"); + cupsFilePuts(data->outfile, "\n"); - values[0] = token; - num_values = 1; + for (error = (char *)cupsArrayFirst(data->errors); + error; + error = (char *)cupsArrayNext(data->errors)) + print_xml_string(data->outfile, "string", error); - for (ptr = strchr(token, ','); ptr; ptr = strchr(ptr, ',')) - { - if (ptr > token && ptr[-1] == '\\') - _cups_strcpy(ptr - 1, ptr); - else - { - *ptr++ = '\0'; - values[num_values] = ptr; - num_values ++; - } - } + cupsFilePuts(data->outfile, "\n"); + } - attrptr = ippAddStrings(request, group, value, attr, num_values, - NULL, (const char **)values); - } - break; - } + if (data->output == _CUPS_OUTPUT_TEST || (data->output == _CUPS_OUTPUT_PLIST && data->outfile != cupsFileStdout())) + { + for (error = (char *)cupsArrayFirst(data->errors); + error; + error = (char *)cupsArrayNext(data->errors)) + cupsFilePrintf(cupsFileStdout(), " %s\n", error); + } + } - if (!attrptr && !skip_test) + if (data->num_displayed > 0 && !data->verbosity && response && (data->output == _CUPS_OUTPUT_TEST || (data->output == _CUPS_OUTPUT_PLIST && data->outfile != cupsFileStdout()))) + { + for (attrptr = ippFirstAttribute(response); attrptr; attrptr = ippNextAttribute(response)) + { + if (ippGetName(attrptr)) + { + for (i = 0; i < data->num_displayed; i ++) { - print_fatal_error(outfile, "Unable to add attribute \"%s\" on line %d.", attr, linenum); - pass = 0; - goto test_exit; + if (!strcmp(data->displayed[i], ippGetName(attrptr))) + { + print_attr(data->outfile, data->output, attrptr, NULL); + break; + } } } - else if (!_cups_strcasecmp(token, "FILE")) - { - /* - * File... - */ + } + } - if (!get_token(fp, temp, sizeof(temp), &linenum)) - { - print_fatal_error(outfile, "Missing FILE filename on line %d.", linenum); - pass = 0; - goto test_exit; - } + skip_error: - expand_variables(vars, token, temp, sizeof(token)); - get_filename(testfile, filename, token, sizeof(filename)); + if (data->output == _CUPS_OUTPUT_PLIST) + cupsFilePuts(data->outfile, "\n"); - if (access(filename, R_OK)) - { - print_fatal_error(outfile, "Filename \"%s\" on line %d cannot be read.", - temp, linenum); - print_fatal_error(outfile, "Filename mapped to \"%s\".", filename); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "STATUS")) - { - /* - * Status... - */ + ippDelete(response); + response = NULL; - if (num_statuses >= (int)(sizeof(statuses) / sizeof(statuses[0]))) - { - print_fatal_error(outfile, "Too many STATUS's on line %d.", linenum); - pass = 0; - goto test_exit; - } + for (i = 0; i < data->num_statuses; i ++) + { + if (data->statuses[i].if_defined) + free(data->statuses[i].if_defined); + if (data->statuses[i].if_not_defined) + free(data->statuses[i].if_not_defined); + if (data->statuses[i].define_match) + free(data->statuses[i].define_match); + if (data->statuses[i].define_no_match) + free(data->statuses[i].define_no_match); + } + data->num_statuses = 0; - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing STATUS code on line %d.", linenum); - pass = 0; - goto test_exit; - } + for (i = data->num_expects, expect = data->expects; i > 0; i --, expect ++) + { + free(expect->name); + if (expect->of_type) + free(expect->of_type); + if (expect->same_count_as) + free(expect->same_count_as); + if (expect->if_defined) + free(expect->if_defined); + if (expect->if_not_defined) + free(expect->if_not_defined); + if (expect->with_value) + free(expect->with_value); + if (expect->define_match) + free(expect->define_match); + if (expect->define_no_match) + free(expect->define_no_match); + if (expect->define_value) + free(expect->define_value); + } + data->num_expects = 0; - if ((statuses[num_statuses].status = ippErrorValue(token)) - == (ipp_status_t)-1 && - (statuses[num_statuses].status = (ipp_status_t)strtol(token, NULL, 0)) == 0) - { - print_fatal_error(outfile, "Bad STATUS code \"%s\" on line %d.", token, - linenum); - pass = 0; - goto test_exit; - } + for (i = 0; i < data->num_displayed; i ++) + free(data->displayed[i]); + data->num_displayed = 0; - last_status = statuses + num_statuses; - num_statuses ++; + return (data->ignore_errors || data->prev_pass); +} - last_status->define_match = NULL; - last_status->define_no_match = NULL; - last_status->if_defined = NULL; - last_status->if_not_defined = NULL; - last_status->repeat_limit = 1000; - last_status->repeat_match = 0; - last_status->repeat_no_match = 0; - } - else if (!_cups_strcasecmp(token, "EXPECT") || !_cups_strcasecmp(token, "EXPECT-ALL")) - { - /* - * Expected attributes... - */ - int expect_all = !_cups_strcasecmp(token, "EXPECT-ALL"); +/* + * 'do_tests()' - Do tests as specified in the test file. + */ - if (num_expects >= (int)(sizeof(expects) / sizeof(expects[0]))) - { - print_fatal_error(outfile, "Too many EXPECT's on line %d.", linenum); - pass = 0; - goto test_exit; - } +static int /* O - 1 on success, 0 on failure */ +do_tests(const char *testfile, /* I - Test file to use */ + _ipp_vars_t *vars, /* I - Variables */ + _cups_testdata_t *data) /* I - Test data */ +{ + http_encryption_t encryption; /* Encryption mode */ - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing EXPECT name on line %d.", linenum); - pass = 0; - goto test_exit; - } - last_expect = expects + num_expects; - num_expects ++; + /* + * Connect to the printer/server... + */ - memset(last_expect, 0, sizeof(_cups_expect_t)); - last_expect->repeat_limit = 1000; - last_expect->expect_all = expect_all; + if (!_cups_strcasecmp(vars->scheme, "https") || !_cups_strcasecmp(vars->scheme, "ipps")) + encryption = HTTP_ENCRYPTION_ALWAYS; + else + encryption = data->encryption; - if (token[0] == '!') - { - last_expect->not_expect = 1; - last_expect->name = strdup(token + 1); - } - else if (token[0] == '?') - { - last_expect->optional = 1; - last_expect->name = strdup(token + 1); - } - else - last_expect->name = strdup(token); - } - else if (!_cups_strcasecmp(token, "COUNT")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing COUNT number on line %d.", linenum); - pass = 0; - goto test_exit; - } + if ((data->http = httpConnect2(vars->host, vars->port, NULL, data->family, encryption, 1, 30000, NULL)) == NULL) + { + print_fatal_error(data, "Unable to connect to \"%s\" on port %d - %s", vars->host, vars->port, cupsLastErrorString()); + return (0); + } - if ((i = atoi(token)) <= 0) - { - print_fatal_error(outfile, "Bad COUNT \"%s\" on line %d.", token, linenum); - pass = 0; - goto test_exit; - } +#ifdef HAVE_LIBZ + httpSetDefaultField(data->http, HTTP_FIELD_ACCEPT_ENCODING, "deflate, gzip, identity"); +#else + httpSetDefaultField(data->http, HTTP_FIELD_ACCEPT_ENCODING, "identity"); +#endif /* HAVE_LIBZ */ - if (last_expect) - last_expect->count = i; - else - { - print_fatal_error(outfile, "COUNT without a preceding EXPECT on line %d.", - linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "DEFINE-MATCH")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing DEFINE-MATCH variable on line %d.", - linenum); - pass = 0; - goto test_exit; - } + if (data->timeout > 0.0) + httpSetTimeout(data->http, data->timeout, timeout_cb, NULL); - if (last_expect) - last_expect->define_match = strdup(token); - else if (last_status) - last_status->define_match = strdup(token); - else - { - print_fatal_error(outfile, "DEFINE-MATCH without a preceding EXPECT or STATUS " - "on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "DEFINE-NO-MATCH")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing DEFINE-NO-MATCH variable on line %d.", - linenum); - pass = 0; - goto test_exit; - } + /* + * Run tests... + */ - if (last_expect) - last_expect->define_no_match = strdup(token); - else if (last_status) - last_status->define_no_match = strdup(token); - else - { - print_fatal_error(outfile, "DEFINE-NO-MATCH without a preceding EXPECT or " - "STATUS on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "DEFINE-VALUE")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing DEFINE-VALUE variable on line %d.", - linenum); - pass = 0; - goto test_exit; - } + _ippFileParse(vars, testfile, (void *)data); - if (last_expect) - last_expect->define_value = strdup(token); - else - { - print_fatal_error(outfile, "DEFINE-VALUE without a preceding EXPECT on " - "line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "OF-TYPE")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing OF-TYPE value tag(s) on line %d.", - linenum); - pass = 0; - goto test_exit; - } + /* + * Close connection and return... + */ - if (last_expect) - last_expect->of_type = strdup(token); - else - { - print_fatal_error(outfile, "OF-TYPE without a preceding EXPECT on line %d.", - linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "IN-GROUP")) - { - ipp_tag_t in_group; /* IN-GROUP value */ + httpClose(data->http); + data->http = NULL; + return (data->pass); +} - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing IN-GROUP group tag on line %d.", linenum); - pass = 0; - goto test_exit; - } - if ((in_group = ippTagValue(token)) == IPP_TAG_ZERO || in_group >= IPP_TAG_UNSUPPORTED_VALUE) - { - print_fatal_error(outfile, "Bad IN-GROUP group tag \"%s\" on line %d.", token, linenum); - pass = 0; - goto test_exit; - } - else if (last_expect) - last_expect->in_group = in_group; - else - { - print_fatal_error(outfile, "IN-GROUP without a preceding EXPECT on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "REPEAT-LIMIT")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing REPEAT-LIMIT value on line %d.", linenum); - pass = 0; - goto test_exit; - } - else if (atoi(token) <= 0) - { - print_fatal_error(outfile, "Bad REPEAT-LIMIT value on line %d.", linenum); - pass = 0; - goto test_exit; - } +/* + * 'error_cb()' - Print/add an error message. + */ - if (last_status) - last_status->repeat_limit = atoi(token); - else if (last_expect) - last_expect->repeat_limit = atoi(token); - else - { - print_fatal_error(outfile, "REPEAT-LIMIT without a preceding EXPECT or STATUS on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "REPEAT-MATCH")) - { - if (last_status) - last_status->repeat_match = 1; - else if (last_expect) - last_expect->repeat_match = 1; - else - { - print_fatal_error(outfile, "REPEAT-MATCH without a preceding EXPECT or STATUS on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "REPEAT-NO-MATCH")) - { - if (last_status) - last_status->repeat_no_match = 1; - else if (last_expect) - last_expect->repeat_no_match = 1; - else - { - print_fatal_error(outfile, "REPEAT-NO-MATCH without a preceding EXPECT or STATUS on ine %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "SAME-COUNT-AS")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing SAME-COUNT-AS name on line %d.", linenum); - pass = 0; - goto test_exit; - } +static int /* O - 1 to continue, 0 to stop */ +error_cb(_ipp_file_t *f, /* I - IPP file data */ + _cups_testdata_t *data, /* I - Test data */ + const char *error) /* I - Error message */ +{ + (void)f; - if (last_expect) - last_expect->same_count_as = strdup(token); - else - { - print_fatal_error(outfile, "SAME-COUNT-AS without a preceding EXPECT on line " - "%d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "IF-DEFINED")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing IF-DEFINED name on line %d.", linenum); - pass = 0; - goto test_exit; - } + print_fatal_error(data, "%s", error); - if (last_expect) - last_expect->if_defined = strdup(token); - else if (last_status) - last_status->if_defined = strdup(token); - else - { - print_fatal_error(outfile, "IF-DEFINED without a preceding EXPECT or STATUS on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "IF-NOT-DEFINED")) - { - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing IF-NOT-DEFINED name on line %d.", linenum); - pass = 0; - goto test_exit; - } + return (1); +} - if (last_expect) - last_expect->if_not_defined = strdup(token); - else if (last_status) - last_status->if_not_defined = strdup(token); - else - { - print_fatal_error(outfile, "IF-NOT-DEFINED without a preceding EXPECT or STATUS on line %d.", linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "WITH-ALL-VALUES") || - !_cups_strcasecmp(token, "WITH-ALL-HOSTNAMES") || - !_cups_strcasecmp(token, "WITH-ALL-RESOURCES") || - !_cups_strcasecmp(token, "WITH-ALL-SCHEMES") || - !_cups_strcasecmp(token, "WITH-HOSTNAME") || - !_cups_strcasecmp(token, "WITH-RESOURCE") || - !_cups_strcasecmp(token, "WITH-SCHEME") || - !_cups_strcasecmp(token, "WITH-VALUE")) - { - if (last_expect) - { - if (!_cups_strcasecmp(token, "WITH-ALL-HOSTNAMES") || - !_cups_strcasecmp(token, "WITH-HOSTNAME")) - last_expect->with_flags = _CUPS_WITH_HOSTNAME; - else if (!_cups_strcasecmp(token, "WITH-ALL-RESOURCES") || - !_cups_strcasecmp(token, "WITH-RESOURCE")) - last_expect->with_flags = _CUPS_WITH_RESOURCE; - else if (!_cups_strcasecmp(token, "WITH-ALL-SCHEMES") || - !_cups_strcasecmp(token, "WITH-SCHEME")) - last_expect->with_flags = _CUPS_WITH_SCHEME; - - if (!_cups_strncasecmp(token, "WITH-ALL-", 9)) - last_expect->with_flags |= _CUPS_WITH_ALL; - } - if (!get_token(fp, temp, sizeof(temp), &linenum)) - { - print_fatal_error(outfile, "Missing %s value on line %d.", token, linenum); - pass = 0; - goto test_exit; - } +/* + * 'expect_matches()' - Return true if the tag matches the specification. + */ - if (last_expect) - { - /* - * Expand any variables in the value and then save it. - */ +static int /* O - 1 if matches, 0 otherwise */ +expect_matches( + _cups_expect_t *expect, /* I - Expected attribute */ + ipp_tag_t value_tag) /* I - Value tag for attribute */ +{ + int match; /* Match? */ + char *of_type, /* Type name to match */ + *next, /* Next name to match */ + sep; /* Separator character */ - expand_variables(vars, token, temp, sizeof(token)); - tokenptr = token + strlen(token) - 1; + /* + * If we don't expect a particular type, return immediately... + */ - if (token[0] == '/' && tokenptr > token && *tokenptr == '/') - { - /* - * WITH-VALUE is a POSIX extended regular expression. - */ + if (!expect->of_type) + return (1); - last_expect->with_value = calloc(1, (size_t)(tokenptr - token)); - last_expect->with_flags |= _CUPS_WITH_REGEX; + /* + * Parse the "of_type" value since the string can contain multiple attribute + * types separated by "," or "|"... + */ - if (last_expect->with_value) - memcpy(last_expect->with_value, token + 1, (size_t)(tokenptr - token - 1)); - } - else - { - /* - * WITH-VALUE is a literal value... - */ + for (of_type = expect->of_type, match = 0; !match && *of_type; of_type = next) + { + /* + * Find the next separator, and set it (temporarily) to nul if present. + */ - char *ptr; /* Pointer into value */ + for (next = of_type; *next && *next != '|' && *next != ','; next ++); - for (ptr = token; *ptr; ptr ++) - { - if (*ptr == '\\' && ptr[1]) - { - /* - * Remove \ from \foo... - */ + if ((sep = *next) != '\0') + *next = '\0'; - _cups_strcpy(ptr, ptr + 1); - } - } + /* + * Support some meta-types to make it easier to write the test file. + */ - last_expect->with_value = strdup(token); - last_expect->with_flags |= _CUPS_WITH_LITERAL; - } - } - else - { - print_fatal_error(outfile, "%s without a preceding EXPECT on line %d.", token, linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "WITH-VALUE-FROM")) - { - if (!get_token(fp, temp, sizeof(temp), &linenum)) - { - print_fatal_error(outfile, "Missing %s value on line %d.", token, linenum); - pass = 0; - goto test_exit; - } + if (!strcmp(of_type, "text")) + match = value_tag == IPP_TAG_TEXTLANG || value_tag == IPP_TAG_TEXT; + else if (!strcmp(of_type, "name")) + match = value_tag == IPP_TAG_NAMELANG || value_tag == IPP_TAG_NAME; + else if (!strcmp(of_type, "collection")) + match = value_tag == IPP_TAG_BEGIN_COLLECTION; + else + match = value_tag == ippTagValue(of_type); - if (last_expect) - { - /* - * Expand any variables in the value and then save it. - */ + /* + * Restore the separator if we have one... + */ - expand_variables(vars, token, temp, sizeof(token)); + if (sep) + *next++ = sep; + } - last_expect->with_value_from = strdup(token); - last_expect->with_flags = _CUPS_WITH_LITERAL; - } - else - { - print_fatal_error(outfile, "%s without a preceding EXPECT on line %d.", token, linenum); - pass = 0; - goto test_exit; - } - } - else if (!_cups_strcasecmp(token, "DISPLAY")) - { - /* - * Display attributes... - */ + return (match); +} - if (num_displayed >= (int)(sizeof(displayed) / sizeof(displayed[0]))) - { - print_fatal_error(outfile, "Too many DISPLAY's on line %d", linenum); - pass = 0; - goto test_exit; - } - if (!get_token(fp, token, sizeof(token), &linenum)) - { - print_fatal_error(outfile, "Missing DISPLAY name on line %d.", linenum); - pass = 0; - goto test_exit; - } +/* + * 'get_filename()' - Get a filename based on the current test file. + */ - displayed[num_displayed] = strdup(token); - num_displayed ++; - } - else - { - print_fatal_error(outfile, "Unexpected token %s seen on line %d.", token, linenum); - pass = 0; - goto test_exit; - } - } +static char * /* O - Filename */ +get_filename(const char *testfile, /* I - Current test file */ + char *dst, /* I - Destination filename */ + const char *src, /* I - Source filename */ + size_t dstsize) /* I - Size of destination buffer */ +{ + char *dstptr; /* Pointer into destination */ + _cups_globals_t *cg = _cupsGlobals(); + /* Global data */ + + if (*src == '<' && src[strlen(src) - 1] == '>') + { /* - * Submit the IPP request... + * Map to CUPS_DATADIR/ipptool/filename... */ - TestCount ++; - - ippSetVersion(request, version / 10, version % 10); - ippSetOperation(request, op); - ippSetRequestId(request, request_id); - - if (Output == _CUPS_OUTPUT_PLIST) - { - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "Name\n"); - print_xml_string(outfile, "string", name); - if (file_id[0]) - { - cupsFilePuts(outfile, "FileId\n"); - print_xml_string(outfile, "string", file_id); - } - if (test_id[0]) - { - cupsFilePuts(outfile, "TestId\n"); - print_xml_string(outfile, "string", test_id); - } - cupsFilePuts(outfile, "Version\n"); - cupsFilePrintf(outfile, "%d.%d\n", version / 10, version % 10); - cupsFilePuts(outfile, "Operation\n"); - print_xml_string(outfile, "string", ippOpString(op)); - cupsFilePuts(outfile, "RequestId\n"); - cupsFilePrintf(outfile, "%d\n", request_id); - cupsFilePuts(outfile, "RequestAttributes\n"); - cupsFilePuts(outfile, "\n"); - if (request->attrs) - { - cupsFilePuts(outfile, "\n"); - for (attrptr = request->attrs, - group = attrptr ? attrptr->group_tag : IPP_TAG_ZERO; - attrptr; - attrptr = attrptr->next) - print_attr(outfile, Output, attrptr, &group); - cupsFilePuts(outfile, "\n"); - } - cupsFilePuts(outfile, "\n"); - } + snprintf(dst, dstsize, "%s/ipptool/%s", cg->cups_datadir, src + 1); + dstptr = dst + strlen(dst) - 1; + if (*dstptr == '>') + *dstptr = '\0'; + } + else if (!access(src, R_OK) || *src == '/' +#ifdef WIN32 + || (isalpha(*src & 255) && src[1] == ':') +#endif /* WIN32 */ + ) + { + /* + * Use the path as-is... + */ - if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout())) - { - if (Verbosity) - { - cupsFilePrintf(cupsFileStdout(), " %s:\n", ippOpString(op)); + strlcpy(dst, src, dstsize); + } + else + { + /* + * Make path relative to testfile... + */ - for (attrptr = request->attrs; attrptr; attrptr = attrptr->next) - print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL); - } + strlcpy(dst, testfile, dstsize); + if ((dstptr = strrchr(dst, '/')) != NULL) + dstptr ++; + else + dstptr = dst; /* Should never happen */ - cupsFilePrintf(cupsFileStdout(), " %-68.68s [", name); - } + strlcpy(dstptr, src, dstsize - (size_t)(dstptr - dst)); + } - if ((skip_previous && !prev_pass) || skip_test) - { - SkipCount ++; + return (dst); +} - ippDelete(request); - request = NULL; - if (Output == _CUPS_OUTPUT_PLIST) - { - cupsFilePuts(outfile, "Successful\n"); - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "Skipped\n"); - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "StatusCode\n"); - print_xml_string(outfile, "string", "skip"); - cupsFilePuts(outfile, "ResponseAttributes\n"); - cupsFilePuts(outfile, "\n"); - } +/* + * 'get_string()' - Get a pointer to a string value or the portion of interest. + */ - if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout())) - cupsFilePuts(cupsFileStdout(), "SKIP]\n"); +static const char * /* O - Pointer to string */ +get_string(ipp_attribute_t *attr, /* I - IPP attribute */ + int element, /* I - Element to fetch */ + int flags, /* I - Value ("with") flags */ + char *buffer, /* I - Temporary buffer */ + size_t bufsize) /* I - Size of temporary buffer */ +{ + const char *value; /* Value */ + char *ptr, /* Pointer into value */ + scheme[256], /* URI scheme */ + userpass[256], /* Username/password */ + hostname[256], /* Hostname */ + resource[1024]; /* Resource */ + int port; /* Port number */ - goto skip_error; - } - PasswordTries = 0; + value = ippGetString(attr, element, NULL); - do - { - if (delay > 0) - usleep(delay); + if (flags & _CUPS_WITH_HOSTNAME) + { + if (httpSeparateURI(HTTP_URI_CODING_ALL, value, scheme, sizeof(scheme), userpass, sizeof(userpass), buffer, (int)bufsize, &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK) + buffer[0] = '\0'; - delay = repeat_interval; - repeat_count ++; + ptr = buffer + strlen(buffer) - 1; + if (ptr >= buffer && *ptr == '.') + *ptr = '\0'; /* Drop trailing "." */ - status = HTTP_STATUS_OK; + return (buffer); + } + else if (flags & _CUPS_WITH_RESOURCE) + { + if (httpSeparateURI(HTTP_URI_CODING_ALL, value, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, buffer, (int)bufsize) < HTTP_URI_STATUS_OK) + buffer[0] = '\0'; - if (transfer == _CUPS_TRANSFER_CHUNKED || - (transfer == _CUPS_TRANSFER_AUTO && filename[0])) - { - /* - * Send request using chunking - a 0 length means "chunk". - */ + return (buffer); + } + else if (flags & _CUPS_WITH_SCHEME) + { + if (httpSeparateURI(HTTP_URI_CODING_ALL, value, buffer, (int)bufsize, userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK) + buffer[0] = '\0'; - length = 0; - } - else - { - /* - * Send request using content length... - */ + return (buffer); + } + else if (ippGetValueTag(attr) == IPP_TAG_URI && (!strncmp(value, "ipp://", 6) || !strncmp(value, "http://", 7) || !strncmp(value, "ipps://", 7) || !strncmp(value, "https://", 8))) + { + http_uri_status_t status = httpSeparateURI(HTTP_URI_CODING_ALL, value, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, sizeof(resource)); - length = ippLength(request); + if (status < HTTP_URI_STATUS_OK) + { + /* + * Bad URI... + */ - if (filename[0] && (reqfile = cupsFileOpen(filename, "r")) != NULL) - { - /* - * Read the file to get the uncompressed file size... - */ + buffer[0] = '\0'; + } + else + { + /* + * Normalize URI with no trailing dot... + */ - while ((bytes = cupsFileRead(reqfile, buffer, sizeof(buffer))) > 0) - length += (size_t)bytes; + if ((ptr = hostname + strlen(hostname) - 1) >= hostname && *ptr == '.') + *ptr = '\0'; - cupsFileClose(reqfile); - } - } + httpAssembleURI(HTTP_URI_CODING_ALL, buffer, (int)bufsize, scheme, userpass, hostname, port, resource); + } - /* - * Send the request... - */ + return (buffer); + } + else + return (value); +} - response = NULL; - repeat_test = 0; - prev_pass = 1; - if (status != HTTP_STATUS_ERROR) - { - while (!response && !Cancel && prev_pass) - { - status = cupsSendRequest(http, request, resource, length); +/* + * 'init_data()' - Initialize test data. + */ -#ifdef HAVE_LIBZ - if (compression[0]) - httpSetField(http, HTTP_FIELD_CONTENT_ENCODING, compression); -#endif /* HAVE_LIBZ */ +static void +init_data(_cups_testdata_t *data) /* I - Data */ +{ + memset(data, 0, sizeof(_cups_testdata_t)); + + data->output = _CUPS_OUTPUT_LIST; + data->outfile = cupsFileStdout(); + data->family = AF_UNSPEC; + data->def_transfer = _CUPS_TRANSFER_AUTO; + data->def_version = 11; + data->errors = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free); + data->pass = 1; + data->prev_pass = 1; + data->request_id = (CUPS_RAND() % 1000) * 137 + 1; + data->show_header = 1; +} - if (!Cancel && status == HTTP_STATUS_CONTINUE && - request->state == IPP_DATA && filename[0]) - { - if ((reqfile = cupsFileOpen(filename, "r")) != NULL) - { - while (!Cancel && - (bytes = cupsFileRead(reqfile, buffer, sizeof(buffer))) > 0) - if ((status = cupsWriteRequestData(http, buffer, (size_t)bytes)) != HTTP_STATUS_CONTINUE) - break; - cupsFileClose(reqfile); - } - else - { - snprintf(buffer, sizeof(buffer), "%s: %s", filename, - strerror(errno)); - _cupsSetError(IPP_INTERNAL_ERROR, buffer, 0); +/* + * 'iso_date()' - Return an ISO 8601 date/time string for the given IPP dateTime + * value. + */ - status = HTTP_STATUS_ERROR; - } - } +static char * /* O - ISO 8601 date/time string */ +iso_date(const ipp_uchar_t *date) /* I - IPP (RFC 1903) date/time value */ +{ + time_t utctime; /* UTC time since 1970 */ + struct tm *utcdate; /* UTC date/time */ + static char buffer[255]; /* String buffer */ - /* - * Get the server's response... - */ - if (!Cancel && status != HTTP_STATUS_ERROR) - { - response = cupsGetResponse(http, resource); - status = httpGetStatus(http); - } + utctime = ippDateToTime(date); + utcdate = gmtime(&utctime); - if (!Cancel && status == HTTP_STATUS_ERROR && http->error != EINVAL && -#ifdef WIN32 - http->error != WSAETIMEDOUT) -#else - http->error != ETIMEDOUT) -#endif /* WIN32 */ - { - if (httpReconnect2(http, 30000, NULL)) - prev_pass = 0; - } - else if (status == HTTP_STATUS_ERROR || status == HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED) - { - prev_pass = 0; - break; - } - else if (status != HTTP_STATUS_OK) - { - httpFlush(http); + snprintf(buffer, sizeof(buffer), "%04d-%02d-%02dT%02d:%02d:%02dZ", + utcdate->tm_year + 1900, utcdate->tm_mon + 1, utcdate->tm_mday, + utcdate->tm_hour, utcdate->tm_min, utcdate->tm_sec); - if (status == HTTP_STATUS_UNAUTHORIZED) - continue; + return (buffer); +} - break; - } - } - } - if (!Cancel && status == HTTP_STATUS_ERROR && http->error != EINVAL && +/* + * 'pause_message()' - Display the message and pause until the user presses a key. + */ + +static void +pause_message(const char *message) /* I - Message */ +{ #ifdef WIN32 - http->error != WSAETIMEDOUT) -#else - http->error != ETIMEDOUT) -#endif /* WIN32 */ - { - if (httpReconnect2(http, 30000, NULL)) - prev_pass = 0; - } - else if (status == HTTP_STATUS_ERROR) - { - if (!Cancel) - httpReconnect2(http, 30000, NULL); + HANDLE tty; /* Console handle */ + DWORD mode; /* Console mode */ + char key; /* Key press */ + DWORD bytes; /* Bytes read for key press */ - prev_pass = 0; - } - else if (status != HTTP_STATUS_OK) - { - httpFlush(http); - prev_pass = 0; - } - /* - * Check results of request... - */ + /* + * Disable input echo and set raw input... + */ - cupsArrayClear(errors); + if ((tty = GetStdHandle(STD_INPUT_HANDLE)) == INVALID_HANDLE_VALUE) + return; - if (http->version != HTTP_1_1) - add_stringf(errors, "Bad HTTP version (%d.%d)", http->version / 100, - http->version % 100); + if (!GetConsoleMode(tty, &mode)) + return; - if (ValidateHeaders) - { - const char *header; /* HTTP header value */ + if (!SetConsoleMode(tty, 0)) + return; - if ((header = httpGetField(http, HTTP_FIELD_CONTENT_TYPE)) == NULL || _cups_strcasecmp(header, "application/ipp")) - add_stringf(errors, "Bad HTTP Content-Type in response (%s)", header && *header ? header : ""); +#else + int tty; /* /dev/tty - never read from stdin */ + struct termios original, /* Original input mode */ + noecho; /* No echo input mode */ + char key; /* Current key press */ - if ((header = httpGetField(http, HTTP_FIELD_DATE)) != NULL && *header && httpGetDateTime(header) == 0) - add_stringf(errors, "Bad HTTP Date in response (%s)", header); - } - if (!response) - { - /* - * No response, log error... - */ + /* + * Disable input echo and set raw input... + */ - add_stringf(errors, "IPP request failed with status %s (%s)", - ippErrorString(cupsLastError()), - cupsLastErrorString()); - } - else - { - /* - * Collect common attribute values... - */ + if ((tty = open("/dev/tty", O_RDONLY)) < 0) + return; - if ((attrptr = ippFindAttribute(response, "job-id", - IPP_TAG_INTEGER)) != NULL) - { - snprintf(temp, sizeof(temp), "%d", attrptr->values[0].integer); - set_variable(outfile, vars, "job-id", temp); - } + if (tcgetattr(tty, &original)) + { + close(tty); + return; + } - if ((attrptr = ippFindAttribute(response, "job-uri", - IPP_TAG_URI)) != NULL) - set_variable(outfile, vars, "job-uri", attrptr->values[0].string.text); + noecho = original; + noecho.c_lflag &= (tcflag_t)~(ICANON | ECHO | ECHOE | ISIG); - if ((attrptr = ippFindAttribute(response, "notify-subscription-id", - IPP_TAG_INTEGER)) != NULL) - { - snprintf(temp, sizeof(temp), "%d", attrptr->values[0].integer); - set_variable(outfile, vars, "notify-subscription-id", temp); - } + if (tcsetattr(tty, TCSAFLUSH, &noecho)) + { + close(tty); + return; + } +#endif /* WIN32 */ - /* - * Check response, validating groups and attributes and logging errors - * as needed... - */ - - if (response->state != IPP_DATA) - add_stringf(errors, - "Missing end-of-attributes-tag in response " - "(RFC 2910 section 3.5.1)"); - - if (version && - (response->request.status.version[0] != (version / 10) || - response->request.status.version[1] != (version % 10))) - add_stringf(errors, - "Bad version %d.%d in response - expected %d.%d " - "(RFC 2911 section 3.1.8).", - response->request.status.version[0], - response->request.status.version[1], - version / 10, version % 10); - - if (response->request.status.request_id != request_id) - add_stringf(errors, - "Bad request ID %d in response - expected %d " - "(RFC 2911 section 3.1.1)", - response->request.status.request_id, request_id); - - attrptr = response->attrs; - if (!attrptr) - add_stringf(errors, - "Missing first attribute \"attributes-charset " - "(charset)\" in group operation-attributes-tag " - "(RFC 2911 section 3.1.4)."); - else - { - if (!attrptr->name || - attrptr->value_tag != IPP_TAG_CHARSET || - attrptr->group_tag != IPP_TAG_OPERATION || - attrptr->num_values != 1 || - strcmp(attrptr->name, "attributes-charset")) - add_stringf(errors, - "Bad first attribute \"%s (%s%s)\" in group %s, " - "expected \"attributes-charset (charset)\" in " - "group operation-attributes-tag (RFC 2911 section " - "3.1.4).", - attrptr->name ? attrptr->name : "(null)", - attrptr->num_values > 1 ? "1setOf " : "", - ippTagString(attrptr->value_tag), - ippTagString(attrptr->group_tag)); - - attrptr = attrptr->next; - if (!attrptr) - add_stringf(errors, - "Missing second attribute \"attributes-natural-" - "language (naturalLanguage)\" in group " - "operation-attributes-tag (RFC 2911 section " - "3.1.4)."); - else if (!attrptr->name || - attrptr->value_tag != IPP_TAG_LANGUAGE || - attrptr->group_tag != IPP_TAG_OPERATION || - attrptr->num_values != 1 || - strcmp(attrptr->name, "attributes-natural-language")) - add_stringf(errors, - "Bad first attribute \"%s (%s%s)\" in group %s, " - "expected \"attributes-natural-language " - "(naturalLanguage)\" in group " - "operation-attributes-tag (RFC 2911 section " - "3.1.4).", - attrptr->name ? attrptr->name : "(null)", - attrptr->num_values > 1 ? "1setOf " : "", - ippTagString(attrptr->value_tag), - ippTagString(attrptr->group_tag)); - } + /* + * Display the prompt... + */ - if ((attrptr = ippFindAttribute(response, "status-message", - IPP_TAG_ZERO)) != NULL) - { - if (attrptr->value_tag != IPP_TAG_TEXT) - add_stringf(errors, - "status-message (text(255)) has wrong value tag " - "%s (RFC 2911 section 3.1.6.2).", - ippTagString(attrptr->value_tag)); - if (attrptr->group_tag != IPP_TAG_OPERATION) - add_stringf(errors, - "status-message (text(255)) has wrong group tag " - "%s (RFC 2911 section 3.1.6.2).", - ippTagString(attrptr->group_tag)); - if (attrptr->num_values != 1) - add_stringf(errors, - "status-message (text(255)) has %d values " - "(RFC 2911 section 3.1.6.2).", - attrptr->num_values); - if (attrptr->value_tag == IPP_TAG_TEXT && - strlen(attrptr->values[0].string.text) > 255) - add_stringf(errors, - "status-message (text(255)) has bad length %d" - " (RFC 2911 section 3.1.6.2).", - (int)strlen(attrptr->values[0].string.text)); - } + cupsFilePrintf(cupsFileStdout(), "%s\n---- PRESS ANY KEY ----", message); - if ((attrptr = ippFindAttribute(response, "detailed-status-message", - IPP_TAG_ZERO)) != NULL) - { - if (attrptr->value_tag != IPP_TAG_TEXT) - add_stringf(errors, - "detailed-status-message (text(MAX)) has wrong " - "value tag %s (RFC 2911 section 3.1.6.3).", - ippTagString(attrptr->value_tag)); - if (attrptr->group_tag != IPP_TAG_OPERATION) - add_stringf(errors, - "detailed-status-message (text(MAX)) has wrong " - "group tag %s (RFC 2911 section 3.1.6.3).", - ippTagString(attrptr->group_tag)); - if (attrptr->num_values != 1) - add_stringf(errors, - "detailed-status-message (text(MAX)) has %d values" - " (RFC 2911 section 3.1.6.3).", - attrptr->num_values); - if (attrptr->value_tag == IPP_TAG_TEXT && - strlen(attrptr->values[0].string.text) > 1023) - add_stringf(errors, - "detailed-status-message (text(MAX)) has bad " - "length %d (RFC 2911 section 3.1.6.3).", - (int)strlen(attrptr->values[0].string.text)); - } +#ifdef WIN32 + /* + * Read a key... + */ - a = cupsArrayNew((cups_array_func_t)strcmp, NULL); + ReadFile(tty, &key, 1, &bytes, NULL); - for (attrptr = response->attrs, - group = attrptr ? attrptr->group_tag : IPP_TAG_ZERO; - attrptr; - attrptr = attrptr->next) - { - if (attrptr->group_tag != group) - { - int out_of_order = 0; /* Are attribute groups out-of-order? */ - cupsArrayClear(a); + /* + * Cleanup... + */ - switch (attrptr->group_tag) - { - case IPP_TAG_ZERO : - break; + SetConsoleMode(tty, mode); - case IPP_TAG_OPERATION : - out_of_order = 1; - break; +#else + /* + * Read a key... + */ - case IPP_TAG_UNSUPPORTED_GROUP : - if (group != IPP_TAG_OPERATION) - out_of_order = 1; - break; + read(tty, &key, 1); - case IPP_TAG_JOB : - case IPP_TAG_PRINTER : - if (group != IPP_TAG_OPERATION && - group != IPP_TAG_UNSUPPORTED_GROUP) - out_of_order = 1; - break; + /* + * Cleanup... + */ - case IPP_TAG_SUBSCRIPTION : - if (group > attrptr->group_tag && - group != IPP_TAG_DOCUMENT) - out_of_order = 1; - break; + tcsetattr(tty, TCSAFLUSH, &original); + close(tty); +#endif /* WIN32 */ - default : - if (group > attrptr->group_tag) - out_of_order = 1; - break; - } + /* + * Erase the "press any key" prompt... + */ - if (out_of_order) - add_stringf(errors, "Attribute groups out of order (%s < %s)", - ippTagString(attrptr->group_tag), - ippTagString(group)); + cupsFilePuts(cupsFileStdout(), "\r \r"); +} - if (attrptr->group_tag != IPP_TAG_ZERO) - group = attrptr->group_tag; - } - validate_attr(outfile, errors, attrptr); +/* + * 'print_attr()' - Print an attribute on the screen. + */ - if (attrptr->name) - { - if (cupsArrayFind(a, attrptr->name)) - add_stringf(errors, "Duplicate \"%s\" attribute in %s group", - attrptr->name, ippTagString(group)); +static void +print_attr(cups_file_t *outfile, /* I - Output file */ + int output, /* I - Output format */ + ipp_attribute_t *attr, /* I - Attribute to print */ + ipp_tag_t *group) /* IO - Current group */ +{ + int i, /* Looping var */ + count; /* Number of values */ + ipp_attribute_t *colattr; /* Collection attribute */ - cupsArrayAdd(a, attrptr->name); - } - } - cupsArrayDelete(a); + if (output == _CUPS_OUTPUT_PLIST) + { + if (!ippGetName(attr) || (group && *group != ippGetGroupTag(attr))) + { + if (ippGetGroupTag(attr) != IPP_TAG_ZERO) + { + cupsFilePuts(outfile, "\n"); + cupsFilePuts(outfile, "\n"); + } - /* - * Now check the test-defined expected status-code and attribute - * values... - */ + if (group) + *group = ippGetGroupTag(attr); + } - for (i = 0, status_ok = 0; i < num_statuses; i ++) - { - if (statuses[i].if_defined && - !get_variable(vars, statuses[i].if_defined)) - continue; + if (!ippGetName(attr)) + return; - if (statuses[i].if_not_defined && - get_variable(vars, statuses[i].if_not_defined)) - continue; + print_xml_string(outfile, "key", ippGetName(attr)); + if ((count = ippGetCount(attr)) > 1) + cupsFilePuts(outfile, "\n"); - if (ippGetStatusCode(response) == statuses[i].status) - { - status_ok = 1; + switch (ippGetValueTag(attr)) + { + case IPP_TAG_INTEGER : + case IPP_TAG_ENUM : + for (i = 0; i < count; i ++) + cupsFilePrintf(outfile, "%d\n", ippGetInteger(attr, i)); + break; - if (statuses[i].repeat_match && repeat_count < statuses[i].repeat_limit) - repeat_test = 1; + case IPP_TAG_BOOLEAN : + for (i = 0; i < count; i ++) + cupsFilePuts(outfile, ippGetBoolean(attr, i) ? "\n" : "\n"); + break; - if (statuses[i].define_match) - set_variable(outfile, vars, statuses[i].define_match, "1"); - } - else + case IPP_TAG_RANGE : + for (i = 0; i < count; i ++) { - if (statuses[i].repeat_no_match && repeat_count < statuses[i].repeat_limit) - repeat_test = 1; + int lower, upper; /* Lower and upper ranges */ - if (statuses[i].define_no_match) - { - set_variable(outfile, vars, statuses[i].define_no_match, "1"); - status_ok = 1; - } - } - } + lower = ippGetRange(attr, i, &upper); + cupsFilePrintf(outfile, "lower%dupper%d\n", lower, upper); + } + break; - if (!status_ok && num_statuses > 0) - { - for (i = 0; i < num_statuses; i ++) + case IPP_TAG_RESOLUTION : + for (i = 0; i < count; i ++) { - if (statuses[i].if_defined && - !get_variable(vars, statuses[i].if_defined)) - continue; - - if (statuses[i].if_not_defined && - get_variable(vars, statuses[i].if_not_defined)) - continue; - - if (!statuses[i].repeat_match || repeat_count >= statuses[i].repeat_limit) - add_stringf(errors, "EXPECTED: STATUS %s (got %s)", - ippErrorString(statuses[i].status), - ippErrorString(cupsLastError())); - } + int xres, yres; /* Resolution values */ + ipp_res_t units; /* Resolution units */ - if ((attrptr = ippFindAttribute(response, "status-message", - IPP_TAG_TEXT)) != NULL) - add_stringf(errors, "status-message=\"%s\"", - attrptr->values[0].string.text); - } - - for (i = num_expects, expect = expects; i > 0; i --, expect ++) - { - if (expect->if_defined && !get_variable(vars, expect->if_defined)) - continue; - - if (expect->if_not_defined && - get_variable(vars, expect->if_not_defined)) - continue; + xres = ippGetResolution(attr, i, &yres, &units); + cupsFilePrintf(outfile, "xres%dyres%dunits%s\n", xres, yres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); + } + break; - found = ippFindAttribute(response, expect->name, IPP_TAG_ZERO); + case IPP_TAG_DATE : + for (i = 0; i < count; i ++) + cupsFilePrintf(outfile, "%s\n", iso_date(ippGetDate(attr, i))); + break; - do + case IPP_TAG_STRING : + for (i = 0; i < count; i ++) { - if ((found && expect->not_expect) || - (!found && !(expect->not_expect || expect->optional)) || - (found && !expect_matches(expect, found->value_tag)) || - (found && expect->in_group && - found->group_tag != expect->in_group)) - { - if (expect->define_no_match) - set_variable(outfile, vars, expect->define_no_match, "1"); - else if (!expect->define_match && !expect->define_value) - { - if (found && expect->not_expect) - add_stringf(errors, "NOT EXPECTED: %s", expect->name); - else if (!found && !(expect->not_expect || expect->optional)) - add_stringf(errors, "EXPECTED: %s", expect->name); - else if (found) - { - if (!expect_matches(expect, found->value_tag)) - add_stringf(errors, "EXPECTED: %s OF-TYPE %s (got %s)", - expect->name, expect->of_type, - ippTagString(found->value_tag)); - - if (expect->in_group && found->group_tag != expect->in_group) - add_stringf(errors, "EXPECTED: %s IN-GROUP %s (got %s).", - expect->name, ippTagString(expect->in_group), - ippTagString(found->group_tag)); - } - } - - if (expect->repeat_no_match && repeat_count < expect->repeat_limit) - repeat_test = 1; + int datalen; /* Length of data */ + void *data = ippGetOctetString(attr, i, &datalen); + /* Data */ + char buffer[IPP_MAX_LENGTH * 5 / 4 + 1]; + /* Base64 output buffer */ - break; - } + cupsFilePrintf(outfile, "%s\n", httpEncode64_2(buffer, sizeof(buffer), data, datalen)); + } + break; - if (found) - ippAttributeString(found, buffer, sizeof(buffer)); + case IPP_TAG_TEXT : + case IPP_TAG_NAME : + case IPP_TAG_KEYWORD : + case IPP_TAG_URI : + case IPP_TAG_URISCHEME : + case IPP_TAG_CHARSET : + case IPP_TAG_LANGUAGE : + case IPP_TAG_MIMETYPE : + for (i = 0; i < count; i ++) + print_xml_string(outfile, "string", ippGetString(attr, i, NULL)); + break; - if (found && expect->with_value_from && !with_value_from(NULL, ippFindAttribute(response, expect->with_value_from, IPP_TAG_ZERO), found, buffer, sizeof(buffer))) - { - if (expect->define_no_match) - set_variable(outfile, vars, expect->define_no_match, "1"); - else if (!expect->define_match && !expect->define_value && ((!expect->repeat_match && !expect->repeat_no_match) || repeat_count >= expect->repeat_limit)) - { - add_stringf(errors, "EXPECTED: %s WITH-VALUES-FROM %s", expect->name, expect->with_value_from); + case IPP_TAG_TEXTLANG : + case IPP_TAG_NAMELANG : + for (i = 0; i < count; i ++) + { + const char *s, /* String */ + *lang; /* Language */ - with_value_from(errors, ippFindAttribute(response, expect->with_value_from, IPP_TAG_ZERO), found, buffer, sizeof(buffer)); - } + s = ippGetString(attr, i, &lang); + cupsFilePuts(outfile, "language"); + print_xml_string(outfile, NULL, lang); + cupsFilePuts(outfile, "string"); + print_xml_string(outfile, NULL, s); + cupsFilePuts(outfile, "\n"); + } + break; - if (expect->repeat_no_match && repeat_count < expect->repeat_limit) - repeat_test = 1; + case IPP_TAG_BEGIN_COLLECTION : + for (i = 0; i < count; i ++) + { + ipp_t *col = ippGetCollection(attr, i); + /* Collection value */ - break; - } - else if (found && !with_value(outfile, NULL, expect->with_value, expect->with_flags, found, buffer, sizeof(buffer))) - { - if (expect->define_no_match) - set_variable(outfile, vars, expect->define_no_match, "1"); - else if (!expect->define_match && !expect->define_value && - !expect->repeat_match && (!expect->repeat_no_match || repeat_count >= expect->repeat_limit)) - { - if (expect->with_flags & _CUPS_WITH_REGEX) - add_stringf(errors, "EXPECTED: %s %s /%s/", expect->name, with_flags_string(expect->with_flags), expect->with_value); - else - add_stringf(errors, "EXPECTED: %s %s \"%s\"", expect->name, with_flags_string(expect->with_flags), expect->with_value); + cupsFilePuts(outfile, "\n"); + for (colattr = ippFirstAttribute(col); colattr; colattr = ippNextAttribute(col)) + print_attr(outfile, output, colattr, NULL); + cupsFilePuts(outfile, "\n"); + } + break; - with_value(outfile, errors, expect->with_value, expect->with_flags, found, buffer, sizeof(buffer)); - } + default : + cupsFilePrintf(outfile, "<<%s>>\n", ippTagString(ippGetValueTag(attr))); + break; + } - if (expect->repeat_no_match && - repeat_count < expect->repeat_limit) - repeat_test = 1; + if (count > 1) + cupsFilePuts(outfile, "\n"); + } + else + { + char buffer[131072]; /* Value buffer */ - break; - } + if (output == _CUPS_OUTPUT_TEST) + { + if (!ippGetName(attr)) + { + cupsFilePuts(outfile, " -- separator --\n"); + return; + } - if (found && expect->count > 0 && - found->num_values != expect->count) - { - if (expect->define_no_match) - set_variable(outfile, vars, expect->define_no_match, "1"); - else if (!expect->define_match && !expect->define_value) - { - add_stringf(errors, "EXPECTED: %s COUNT %d (got %d)", expect->name, - expect->count, found->num_values); - } + cupsFilePrintf(outfile, " %s (%s%s) = ", ippGetName(attr), ippGetCount(attr) > 1 ? "1setOf " : "", ippTagString(ippGetValueTag(attr))); + } - if (expect->repeat_no_match && - repeat_count < expect->repeat_limit) - repeat_test = 1; + ippAttributeString(attr, buffer, sizeof(buffer)); + cupsFilePrintf(outfile, "%s\n", buffer); + } +} - break; - } - if (found && expect->same_count_as) - { - attrptr = ippFindAttribute(response, expect->same_count_as, - IPP_TAG_ZERO); +/* + * 'print_csv()' - Print a line of CSV text. + */ - if (!attrptr || attrptr->num_values != found->num_values) - { - if (expect->define_no_match) - set_variable(outfile, vars, expect->define_no_match, "1"); - else if (!expect->define_match && !expect->define_value) - { - if (!attrptr) - add_stringf(errors, - "EXPECTED: %s (%d values) SAME-COUNT-AS %s " - "(not returned)", expect->name, - found->num_values, expect->same_count_as); - else if (attrptr->num_values != found->num_values) - add_stringf(errors, - "EXPECTED: %s (%d values) SAME-COUNT-AS %s " - "(%d values)", expect->name, found->num_values, - expect->same_count_as, attrptr->num_values); - } +static void +print_csv( + _cups_testdata_t *data, /* I - Test data */ + ipp_t *ipp, /* I - Response message */ + ipp_attribute_t *attr, /* I - First attribute for line */ + int num_displayed, /* I - Number of attributes to display */ + char **displayed, /* I - Attributes to display */ + size_t *widths) /* I - Column widths */ +{ + int i; /* Looping var */ + size_t maxlength; /* Max length of all columns */ + char *buffer, /* String buffer */ + *bufptr; /* Pointer into buffer */ + ipp_attribute_t *current; /* Current attribute */ - if (expect->repeat_no_match && - repeat_count < expect->repeat_limit) - repeat_test = 1; - break; - } - } + /* + * Get the maximum string length we have to show and allocate... + */ - if (found && expect->define_match) - set_variable(outfile, vars, expect->define_match, "1"); + for (i = 1, maxlength = widths[0]; i < num_displayed; i ++) + if (widths[i] > maxlength) + maxlength = widths[i]; - if (found && expect->define_value) - { - if (!expect->with_value) - { - int last = ippGetCount(found) - 1; - /* Last element in attribute */ + maxlength += 2; - switch (ippGetValueTag(found)) - { - case IPP_TAG_ENUM : - case IPP_TAG_INTEGER : - snprintf(buffer, sizeof(buffer), "%d", ippGetInteger(found, last)); - break; - - case IPP_TAG_BOOLEAN : - if (ippGetBoolean(found, last)) - strlcpy(buffer, "true", sizeof(buffer)); - else - strlcpy(buffer, "false", sizeof(buffer)); - break; - - case IPP_TAG_RESOLUTION : - { - int xres, /* Horizontal resolution */ - yres; /* Vertical resolution */ - ipp_res_t units; /* Resolution units */ - - xres = ippGetResolution(found, last, &yres, &units); - - if (xres == yres) - snprintf(buffer, sizeof(buffer), "%d%s", xres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); - else - snprintf(buffer, sizeof(buffer), "%dx%d%s", xres, yres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); - } - break; - - case IPP_TAG_CHARSET : - case IPP_TAG_KEYWORD : - case IPP_TAG_LANGUAGE : - case IPP_TAG_MIMETYPE : - case IPP_TAG_NAME : - case IPP_TAG_NAMELANG : - case IPP_TAG_TEXT : - case IPP_TAG_TEXTLANG : - case IPP_TAG_URI : - case IPP_TAG_URISCHEME : - strlcpy(buffer, ippGetString(found, last, NULL), sizeof(buffer)); - break; - - default : - ippAttributeString(found, buffer, sizeof(buffer)); - break; - } - } + if ((buffer = malloc(maxlength)) == NULL) + return; - set_variable(outfile, vars, expect->define_value, buffer); - } + /* + * Loop through the attributes to display... + */ - if (found && expect->repeat_match && - repeat_count < expect->repeat_limit) - repeat_test = 1; - } - while (expect->expect_all && (found = ippFindNextAttribute(response, expect->name, IPP_TAG_ZERO)) != NULL); - } - } + if (attr) + { + for (i = 0; i < num_displayed; i ++) + { + if (i) + cupsFilePutChar(data->outfile, ','); - /* - * If we are going to repeat this test, display intermediate results... - */ + buffer[0] = '\0'; - if (repeat_test) + for (current = attr; current; current = ippNextAttribute(ipp)) { - if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout())) + if (!ippGetName(current)) + break; + else if (!strcmp(ippGetName(current), displayed[i])) { - cupsFilePrintf(cupsFileStdout(), "%04d]\n", repeat_count); -\ - if (num_displayed > 0) - { - for (attrptr = ippFirstAttribute(response); attrptr; attrptr = ippNextAttribute(response)) - { - const char *attrname = ippGetName(attrptr); - if (attrname) - { - for (i = 0; i < num_displayed; i ++) - { - if (!strcmp(displayed[i], attrname)) - { - print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL); - break; - } - } - } - } - } + ippAttributeString(current, buffer, maxlength); + break; } + } - if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout())) - { - cupsFilePrintf(cupsFileStdout(), " %-68.68s [", name); - } - - ippDelete(response); - response = NULL; + if (strchr(buffer, ',') != NULL || strchr(buffer, '\"') != NULL || + strchr(buffer, '\\') != NULL) + { + cupsFilePutChar(cupsFileStdout(), '\"'); + for (bufptr = buffer; *bufptr; bufptr ++) + { + if (*bufptr == '\\' || *bufptr == '\"') + cupsFilePutChar(cupsFileStdout(), '\\'); + cupsFilePutChar(cupsFileStdout(), *bufptr); + } + cupsFilePutChar(cupsFileStdout(), '\"'); } + else + cupsFilePuts(data->outfile, buffer); } - while (repeat_test); + cupsFilePutChar(cupsFileStdout(), '\n'); + } + else + { + for (i = 0; i < num_displayed; i ++) + { + if (i) + cupsFilePutChar(cupsFileStdout(), ','); - ippDelete(request); + cupsFilePuts(data->outfile, displayed[i]); + } + cupsFilePutChar(cupsFileStdout(), '\n'); + } - request = NULL; + free(buffer); +} - if (cupsArrayCount(errors) > 0) - prev_pass = pass = 0; - if (prev_pass) - PassCount ++; - else - FailCount ++; +/* + * 'print_fatal_error()' - Print a fatal error message. + */ - if (Output == _CUPS_OUTPUT_PLIST) - { - cupsFilePuts(outfile, "Successful\n"); - cupsFilePuts(outfile, prev_pass ? "\n" : "\n"); - cupsFilePuts(outfile, "StatusCode\n"); - print_xml_string(outfile, "string", ippErrorString(cupsLastError())); - cupsFilePuts(outfile, "ResponseAttributes\n"); - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "\n"); - for (attrptr = response ? response->attrs : NULL, - group = attrptr ? attrptr->group_tag : IPP_TAG_ZERO; - attrptr; - attrptr = attrptr->next) - print_attr(outfile, Output, attrptr, &group); - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "\n"); - } +static void +print_fatal_error( + _cups_testdata_t *data, /* I - Test data */ + const char *s, /* I - Printf-style format string */ + ...) /* I - Additional arguments as needed */ +{ + char buffer[10240]; /* Format buffer */ + va_list ap; /* Pointer to arguments */ - if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout())) - { - cupsFilePuts(cupsFileStdout(), prev_pass ? "PASS]\n" : "FAIL]\n"); - if (!prev_pass || (Verbosity && response)) - { - cupsFilePrintf(cupsFileStdout(), " RECEIVED: %lu bytes in response\n", (unsigned long)ippLength(response)); - cupsFilePrintf(cupsFileStdout(), " status-code = %s (%s)\n", ippErrorString(cupsLastError()), cupsLastErrorString()); + /* + * Format the error message... + */ - if (Verbosity && response) - { - for (attrptr = response->attrs; - attrptr != NULL; - attrptr = attrptr->next) - print_attr(cupsFileStdout(), _CUPS_OUTPUT_TEST, attrptr, NULL); - } - } - } - else if (!prev_pass && Output != _CUPS_OUTPUT_QUIET) - fprintf(stderr, "%s\n", cupsLastErrorString()); + va_start(ap, s); + vsnprintf(buffer, sizeof(buffer), s, ap); + va_end(ap); - if (prev_pass && Output >= _CUPS_OUTPUT_LIST && !Verbosity && - num_displayed > 0) - { - size_t width; /* Length of value */ + /* + * Then output it... + */ - for (i = 0; i < num_displayed; i ++) - { - widths[i] = strlen(displayed[i]); + if (data->output == _CUPS_OUTPUT_PLIST) + { + print_xml_header(data); + print_xml_trailer(data, 0, buffer); + } - for (attrptr = ippFindAttribute(response, displayed[i], IPP_TAG_ZERO); - attrptr; - attrptr = ippFindNextAttribute(response, displayed[i], - IPP_TAG_ZERO)) - { - width = ippAttributeString(attrptr, NULL, 0); - if (width > widths[i]) - widths[i] = width; - } - } + _cupsLangPrintf(stderr, "ipptool: %s", buffer); +} - if (Output == _CUPS_OUTPUT_CSV) - print_csv(outfile, NULL, num_displayed, displayed, widths); - else - print_line(outfile, NULL, num_displayed, displayed, widths); - attrptr = response->attrs; +/* + * 'print_ippserver_attr()' - Print a attribute suitable for use by ippserver. + */ - while (attrptr) - { - while (attrptr && attrptr->group_tag <= IPP_TAG_OPERATION) - attrptr = attrptr->next; +static void +print_ippserver_attr( + _cups_testdata_t *data, /* I - Test data */ + ipp_attribute_t *attr, /* I - Attribute to print */ + int indent) /* I - Indentation level */ +{ + int i, /* Looping var */ + count = ippGetCount(attr); + /* Number of values */ + ipp_attribute_t *colattr; /* Collection attribute */ - if (attrptr) - { - if (Output == _CUPS_OUTPUT_CSV) - print_csv(outfile, attrptr, num_displayed, displayed, widths); - else - print_line(outfile, attrptr, num_displayed, displayed, widths); - while (attrptr && attrptr->group_tag > IPP_TAG_OPERATION) - attrptr = attrptr->next; - } - } - } - else if (!prev_pass) - { - if (Output == _CUPS_OUTPUT_PLIST) - { - cupsFilePuts(outfile, "Errors\n"); - cupsFilePuts(outfile, "\n"); + if (indent == 0) + cupsFilePrintf(data->outfile, "ATTR %s %s", ippTagString(ippGetValueTag(attr)), ippGetName(attr)); + else + cupsFilePrintf(data->outfile, "%*sMEMBER %s %s", indent, "", ippTagString(ippGetValueTag(attr)), ippGetName(attr)); - for (error = (char *)cupsArrayFirst(errors); - error; - error = (char *)cupsArrayNext(errors)) - print_xml_string(outfile, "string", error); + switch (ippGetValueTag(attr)) + { + case IPP_TAG_INTEGER : + case IPP_TAG_ENUM : + for (i = 0; i < count; i ++) + cupsFilePrintf(data->outfile, "%s%d", i ? "," : " ", ippGetInteger(attr, i)); + break; - cupsFilePuts(outfile, "\n"); - } + case IPP_TAG_BOOLEAN : + cupsFilePuts(data->outfile, ippGetBoolean(attr, 0) ? " true" : " false"); - if (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout())) - { - for (error = (char *)cupsArrayFirst(errors); - error; - error = (char *)cupsArrayNext(errors)) - cupsFilePrintf(cupsFileStdout(), " %s\n", error); - } - } + for (i = 1; i < count; i ++) + cupsFilePuts(data->outfile, ippGetBoolean(attr, 1) ? ",true" : ",false"); + break; - if (num_displayed > 0 && !Verbosity && response && (Output == _CUPS_OUTPUT_TEST || (Output == _CUPS_OUTPUT_PLIST && outfile != cupsFileStdout()))) - { - for (attrptr = response->attrs; - attrptr != NULL; - attrptr = attrptr->next) - { - if (attrptr->name) + case IPP_TAG_RANGE : + for (i = 0; i < count; i ++) { - for (i = 0; i < num_displayed; i ++) - { - if (!strcmp(displayed[i], attrptr->name)) - { - print_attr(outfile, Output, attrptr, NULL); - break; - } - } - } - } - } - - skip_error: + int upper, lower = ippGetRange(attr, i, &upper); - if (Output == _CUPS_OUTPUT_PLIST) - cupsFilePuts(outfile, "\n"); - - ippDelete(response); - response = NULL; + cupsFilePrintf(data->outfile, "%s%d-%d", i ? "," : " ", lower, upper); + } + break; - for (i = 0; i < num_statuses; i ++) - { - if (statuses[i].if_defined) - free(statuses[i].if_defined); - if (statuses[i].if_not_defined) - free(statuses[i].if_not_defined); - if (statuses[i].define_match) - free(statuses[i].define_match); - if (statuses[i].define_no_match) - free(statuses[i].define_no_match); - } - num_statuses = 0; + case IPP_TAG_RESOLUTION : + for (i = 0; i < count; i ++) + { + ipp_res_t units; + int yres, xres = ippGetResolution(attr, i, &yres, &units); - for (i = num_expects, expect = expects; i > 0; i --, expect ++) - { - free(expect->name); - if (expect->of_type) - free(expect->of_type); - if (expect->same_count_as) - free(expect->same_count_as); - if (expect->if_defined) - free(expect->if_defined); - if (expect->if_not_defined) - free(expect->if_not_defined); - if (expect->with_value) - free(expect->with_value); - if (expect->define_match) - free(expect->define_match); - if (expect->define_no_match) - free(expect->define_no_match); - if (expect->define_value) - free(expect->define_value); - } - num_expects = 0; + cupsFilePrintf(data->outfile, "%s%dx%d%s", i ? "," : " ", xres, yres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); + } + break; - for (i = 0; i < num_displayed; i ++) - free(displayed[i]); - num_displayed = 0; + case IPP_TAG_DATE : + for (i = 0; i < count; i ++) + cupsFilePrintf(data->outfile, "%s%s", i ? "," : " ", iso_date(ippGetDate(attr, i))); + break; - if (!ignore_errors && !prev_pass) - break; - } + case IPP_TAG_STRING : + for (i = 0; i < count; i ++) + { + int len; + const char *s = (const char *)ippGetOctetString(attr, i, &len); - test_exit: + cupsFilePuts(data->outfile, i ? "," : " "); + print_ippserver_string(data, s, (size_t)len); + } + break; - cupsArrayDelete(errors); + case IPP_TAG_TEXT : + case IPP_TAG_TEXTLANG : + case IPP_TAG_NAME : + case IPP_TAG_NAMELANG : + case IPP_TAG_KEYWORD : + case IPP_TAG_URI : + case IPP_TAG_URISCHEME : + case IPP_TAG_CHARSET : + case IPP_TAG_LANGUAGE : + case IPP_TAG_MIMETYPE : + for (i = 0; i < count; i ++) + { + const char *s = ippGetString(attr, i, NULL); - if (fp) - cupsFileClose(fp); + cupsFilePuts(data->outfile, i ? "," : " "); + print_ippserver_string(data, s, strlen(s)); + } + break; - httpClose(http); - ippDelete(request); - ippDelete(response); + case IPP_TAG_BEGIN_COLLECTION : + for (i = 0; i < count; i ++) + { + ipp_t *col = ippGetCollection(attr, i); - for (i = 0; i < num_statuses; i ++) - { - if (statuses[i].if_defined) - free(statuses[i].if_defined); - if (statuses[i].if_not_defined) - free(statuses[i].if_not_defined); - if (statuses[i].define_match) - free(statuses[i].define_match); - if (statuses[i].define_no_match) - free(statuses[i].define_no_match); - } + cupsFilePuts(data->outfile, i ? ",{\n" : " {\n"); + for (colattr = ippFirstAttribute(col); colattr; colattr = ippNextAttribute(col)) + print_ippserver_attr(data, colattr, indent + 4); + cupsFilePrintf(data->outfile, "%*s}", indent, ""); + } + break; - for (i = num_expects, expect = expects; i > 0; i --, expect ++) - { - free(expect->name); - if (expect->of_type) - free(expect->of_type); - if (expect->same_count_as) - free(expect->same_count_as); - if (expect->if_defined) - free(expect->if_defined); - if (expect->if_not_defined) - free(expect->if_not_defined); - if (expect->with_value) - free(expect->with_value); - if (expect->define_match) - free(expect->define_match); - if (expect->define_no_match) - free(expect->define_no_match); - if (expect->define_value) - free(expect->define_value); + default : + /* Out-of-band value */ + break; } - for (i = 0; i < num_displayed; i ++) - free(displayed[i]); - - return (pass); + cupsFilePuts(data->outfile, "\n"); } /* - * 'expand_variables()' - Expand variables in a string. + * 'print_ippserver_string()' - Print a string suitable for use by ippserver. */ static void -expand_variables(_cups_vars_t *vars, /* I - Variables */ - char *dst, /* I - Destination string buffer */ - const char *src, /* I - Source string */ - size_t dstsize) /* I - Size of destination buffer */ +print_ippserver_string( + _cups_testdata_t *data, /* I - Test data */ + const char *s, /* I - String to print */ + size_t len) /* I - Length of string */ { - char *dstptr, /* Pointer into destination */ - *dstend, /* End of destination */ - temp[256], /* Temporary string */ - *tempptr; /* Pointer into temporary string */ - const char *value; /* Value to substitute */ - - - dstptr = dst; - dstend = dst + dstsize - 1; - - while (*src && dstptr < dstend) + cupsFilePutChar(data->outfile, '\"'); + while (len > 0) { - if (*src == '$') - { - /* - * Substitute a string/number... - */ - - if (!strncmp(src, "$$", 2)) - { - value = "$"; - src += 2; - } - else if (!strncmp(src, "$ENV[", 5)) - { - strlcpy(temp, src + 5, sizeof(temp)); - - for (tempptr = temp; *tempptr; tempptr ++) - if (*tempptr == ']') - break; - - if (*tempptr) - *tempptr++ = '\0'; - - value = getenv(temp); - src += tempptr - temp + 5; - } - else - { - if (src[1] == '{') - { - src += 2; - strlcpy(temp, src, sizeof(temp)); - if ((tempptr = strchr(temp, '}')) != NULL) - *tempptr = '\0'; - else - tempptr = temp + strlen(temp); - } - else - { - strlcpy(temp, src + 1, sizeof(temp)); - - for (tempptr = temp; *tempptr; tempptr ++) - if (!isalnum(*tempptr & 255) && *tempptr != '-' && *tempptr != '_') - break; - - if (*tempptr) - *tempptr = '\0'; - } - - if (!strcmp(temp, "uri")) - value = vars->uri; - else if (!strcmp(temp, "filename")) - value = vars->filename; - else if (!strcmp(temp, "scheme") || !strcmp(temp, "method")) - value = vars->scheme; - else if (!strcmp(temp, "username")) - value = vars->userpass; - else if (!strcmp(temp, "hostname")) - value = vars->hostname; - else if (!strcmp(temp, "port")) - { - snprintf(temp, sizeof(temp), "%d", vars->port); - value = temp; - } - else if (!strcmp(temp, "resource")) - value = vars->resource; - else if (!strcmp(temp, "user")) - value = cupsUser(); - else - value = get_variable(vars, temp); - - src += tempptr - temp + 1; - } + if (*s == '\"') + cupsFilePutChar(data->outfile, '\\'); + cupsFilePutChar(data->outfile, *s); - if (value) - { - strlcpy(dstptr, value, (size_t)(dstend - dstptr + 1)); - dstptr += strlen(dstptr); - } - } - else - *dstptr++ = *src++; + s ++; + len --; } - - *dstptr = '\0'; + cupsFilePutChar(data->outfile, '\"'); } /* - * 'expect_matches()' - Return true if the tag matches the specification. + * 'print_line()' - Print a line of formatted or CSV text. */ -static int /* O - 1 if matches, 0 otherwise */ -expect_matches( - _cups_expect_t *expect, /* I - Expected attribute */ - ipp_tag_t value_tag) /* I - Value tag for attribute */ +static void +print_line( + _cups_testdata_t *data, /* I - Test data */ + ipp_t *ipp, /* I - Response message */ + ipp_attribute_t *attr, /* I - First attribute for line */ + int num_displayed, /* I - Number of attributes to display */ + char **displayed, /* I - Attributes to display */ + size_t *widths) /* I - Column widths */ { - int match; /* Match? */ - char *of_type, /* Type name to match */ - *next, /* Next name to match */ - sep; /* Separator character */ + int i; /* Looping var */ + size_t maxlength; /* Max length of all columns */ + char *buffer; /* String buffer */ + ipp_attribute_t *current; /* Current attribute */ /* - * If we don't expect a particular type, return immediately... + * Get the maximum string length we have to show and allocate... */ - if (!expect->of_type) - return (1); + for (i = 1, maxlength = widths[0]; i < num_displayed; i ++) + if (widths[i] > maxlength) + maxlength = widths[i]; + + maxlength += 2; + + if ((buffer = malloc(maxlength)) == NULL) + return; /* - * Parse the "of_type" value since the string can contain multiple attribute - * types separated by "," or "|"... + * Loop through the attributes to display... */ - for (of_type = expect->of_type, match = 0; !match && *of_type; of_type = next) + if (attr) { - /* - * Find the next separator, and set it (temporarily) to nul if present. - */ + for (i = 0; i < num_displayed; i ++) + { + if (i) + cupsFilePutChar(cupsFileStdout(), ' '); - for (next = of_type; *next && *next != '|' && *next != ','; next ++); + buffer[0] = '\0'; - if ((sep = *next) != '\0') - *next = '\0'; + for (current = attr; current; current = ippNextAttribute(ipp)) + { + if (!ippGetName(current)) + break; + else if (!strcmp(ippGetName(current), displayed[i])) + { + ippAttributeString(current, buffer, maxlength); + break; + } + } - /* - * Support some meta-types to make it easier to write the test file. - */ + cupsFilePrintf(data->outfile, "%*s", (int)-widths[i], buffer); + } + cupsFilePutChar(cupsFileStdout(), '\n'); + } + else + { + for (i = 0; i < num_displayed; i ++) + { + if (i) + cupsFilePutChar(cupsFileStdout(), ' '); - if (!strcmp(of_type, "text")) - match = value_tag == IPP_TAG_TEXTLANG || value_tag == IPP_TAG_TEXT; - else if (!strcmp(of_type, "name")) - match = value_tag == IPP_TAG_NAMELANG || value_tag == IPP_TAG_NAME; - else if (!strcmp(of_type, "collection")) - match = value_tag == IPP_TAG_BEGIN_COLLECTION; - else - match = value_tag == ippTagValue(of_type); + cupsFilePrintf(data->outfile, "%*s", (int)-widths[i], displayed[i]); + } + cupsFilePutChar(cupsFileStdout(), '\n'); - /* - * Restore the separator if we have one... - */ + for (i = 0; i < num_displayed; i ++) + { + if (i) + cupsFilePutChar(cupsFileStdout(), ' '); - if (sep) - *next++ = sep; + memset(buffer, '-', widths[i]); + buffer[widths[i]] = '\0'; + cupsFilePuts(data->outfile, buffer); + } + cupsFilePutChar(cupsFileStdout(), '\n'); } - return (match); + free(buffer); } /* - * 'get_collection()' - Get a collection value from the current test file. + * 'print_xml_header()' - Print a standard XML plist header. */ -static ipp_t * /* O - Collection value */ -get_collection(cups_file_t *outfile, /* I - Output file */ - _cups_vars_t *vars, /* I - Variables */ - cups_file_t *fp, /* I - File to read from */ - int *linenum) /* IO - Line number */ +static void +print_xml_header(_cups_testdata_t *data)/* I - Test data */ { - char token[1024], /* Token from file */ - temp[1024], /* Temporary string */ - attr[128]; /* Attribute name */ - ipp_tag_t value; /* Current value type */ - ipp_t *col = ippNew(); /* Collection value */ - ipp_attribute_t *lastcol = NULL; /* Last collection attribute */ + if (!data->xml_header) + { + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "ipptoolVersion\n"); + cupsFilePuts(data->outfile, "" CUPS_SVERSION "\n"); + cupsFilePuts(data->outfile, "Transfer\n"); + cupsFilePrintf(data->outfile, "%s\n", data->transfer == _CUPS_TRANSFER_AUTO ? "auto" : data->transfer == _CUPS_TRANSFER_CHUNKED ? "chunked" : "length"); + cupsFilePuts(data->outfile, "Tests\n"); + cupsFilePuts(data->outfile, "\n"); + + data->xml_header = 1; + } +} + +/* + * 'print_xml_string()' - Print an XML string with escaping. + */ + +static void +print_xml_string(cups_file_t *outfile, /* I - Test data */ + const char *element, /* I - Element name or NULL */ + const char *s) /* I - String to print */ +{ + if (element) + cupsFilePrintf(outfile, "<%s>", element); - while (get_token(fp, token, sizeof(token), linenum) != NULL) + while (*s) { - if (!strcmp(token, "}")) - break; - else if (!strcmp(token, "{") && lastcol) + if (*s == '&') + cupsFilePuts(outfile, "&"); + else if (*s == '<') + cupsFilePuts(outfile, "<"); + else if (*s == '>') + cupsFilePuts(outfile, ">"); + else if ((*s & 0xe0) == 0xc0) { /* - * Another collection value + * Validate UTF-8 two-byte sequence... */ - ipp_t *subcol = get_collection(outfile, vars, fp, linenum); - /* Collection value */ - - if (subcol) - ippSetCollection(col, &lastcol, ippGetCount(lastcol), subcol); + if ((s[1] & 0xc0) != 0x80) + { + cupsFilePutChar(outfile, '?'); + s ++; + } else - goto col_error; + { + cupsFilePutChar(outfile, *s++); + cupsFilePutChar(outfile, *s); + } } - else if (!_cups_strcasecmp(token, "MEMBER")) + else if ((*s & 0xf0) == 0xe0) { /* - * Attribute... + * Validate UTF-8 three-byte sequence... */ - lastcol = NULL; - - if (!get_token(fp, token, sizeof(token), linenum)) + if ((s[1] & 0xc0) != 0x80 || (s[2] & 0xc0) != 0x80) { - print_fatal_error(outfile, "Missing MEMBER value tag on line %d.", *linenum); - goto col_error; + cupsFilePutChar(outfile, '?'); + s += 2; } - - if ((value = ippTagValue(token)) < IPP_TAG_UNSUPPORTED_VALUE) + else { - print_fatal_error(outfile, "Bad MEMBER value tag \"%s\" on line %d.", token, - *linenum); - goto col_error; + cupsFilePutChar(outfile, *s++); + cupsFilePutChar(outfile, *s++); + cupsFilePutChar(outfile, *s); } + } + else if ((*s & 0xf8) == 0xf0) + { + /* + * Validate UTF-8 four-byte sequence... + */ - if (!get_token(fp, attr, sizeof(attr), linenum)) - { - print_fatal_error(outfile, "Missing MEMBER name on line %d.", *linenum); - goto col_error; - } - - if (value < IPP_TAG_INTEGER) - { - /* - * Out-of-band member attributes have no value... - */ - - token[0] = '\0'; - } - else if (!get_token(fp, temp, sizeof(temp), linenum)) + if ((s[1] & 0xc0) != 0x80 || (s[2] & 0xc0) != 0x80 || + (s[3] & 0xc0) != 0x80) { - print_fatal_error(outfile, "Missing MEMBER value on line %d.", *linenum); - goto col_error; + cupsFilePutChar(outfile, '?'); + s += 3; } else { - expand_variables(vars, token, temp, sizeof(token)); - } - - switch (value) - { - default : - if (value < IPP_TAG_INTEGER) - { - /* - * Add out-of-band value... - */ - - ippAddOutOfBand(col, IPP_TAG_ZERO, value, attr); - } - else - { - print_fatal_error(outfile, "Unsupported MEMBER value tag %s for \"%s\" on line %d.", ippTagString(value), attr, *linenum); - goto col_error; - } - break; - - case IPP_TAG_BOOLEAN : - if (!_cups_strcasecmp(token, "true")) - ippAddBoolean(col, IPP_TAG_ZERO, attr, 1); - else - ippAddBoolean(col, IPP_TAG_ZERO, attr, (char)atoi(token)); - break; - - case IPP_TAG_INTEGER : - case IPP_TAG_ENUM : - ippAddInteger(col, IPP_TAG_ZERO, value, attr, atoi(token)); - break; - - case IPP_TAG_RESOLUTION : - { - int xres, /* X resolution */ - yres; /* Y resolution */ - char units[6]; /* Units */ - - if (sscanf(token, "%dx%d%5s", &xres, &yres, units) != 3 || - (_cups_strcasecmp(units, "dpi") && - _cups_strcasecmp(units, "dpc") && - _cups_strcasecmp(units, "dpcm") && - _cups_strcasecmp(units, "other"))) - { - print_fatal_error(outfile, "Bad resolution value \"%s\" on line %d.", - token, *linenum); - goto col_error; - } - - if (!_cups_strcasecmp(units, "dpi")) - ippAddResolution(col, IPP_TAG_ZERO, attr, IPP_RES_PER_INCH, xres, yres); - else if (!_cups_strcasecmp(units, "dpc") || - !_cups_strcasecmp(units, "dpcm")) - ippAddResolution(col, IPP_TAG_ZERO, attr, IPP_RES_PER_CM, xres, yres); - else - ippAddResolution(col, IPP_TAG_ZERO, attr, (ipp_res_t)0, xres, yres); - } - break; - - case IPP_TAG_RANGE : - { - int lowers[4], /* Lower value */ - uppers[4], /* Upper values */ - num_vals; /* Number of values */ - - - num_vals = sscanf(token, "%d-%d,%d-%d,%d-%d,%d-%d", - lowers + 0, uppers + 0, - lowers + 1, uppers + 1, - lowers + 2, uppers + 2, - lowers + 3, uppers + 3); - - if ((num_vals & 1) || num_vals == 0) - { - print_fatal_error(outfile, "Bad rangeOfInteger value \"%s\" on line %d.", - token, *linenum); - goto col_error; - } - - ippAddRanges(col, IPP_TAG_ZERO, attr, num_vals / 2, lowers, - uppers); - } - break; - - case IPP_TAG_BEGIN_COLLECTION : - if (!strcmp(token, "{")) - { - ipp_t *subcol = get_collection(outfile, vars, fp, linenum); - /* Collection value */ - - if (subcol) - { - lastcol = ippAddCollection(col, IPP_TAG_ZERO, attr, subcol); - ippDelete(subcol); - } - else - goto col_error; - } - else - { - print_fatal_error(outfile, "Bad collection value on line %d.", *linenum); - goto col_error; - } - break; - - case IPP_TAG_STRING : - ippAddOctetString(col, IPP_TAG_ZERO, attr, token, (int)strlen(token)); - break; - - case IPP_TAG_TEXTLANG : - case IPP_TAG_NAMELANG : - case IPP_TAG_TEXT : - case IPP_TAG_NAME : - case IPP_TAG_KEYWORD : - case IPP_TAG_URI : - case IPP_TAG_URISCHEME : - case IPP_TAG_CHARSET : - case IPP_TAG_LANGUAGE : - case IPP_TAG_MIMETYPE : - if (!strchr(token, ',')) - ippAddString(col, IPP_TAG_ZERO, value, attr, NULL, token); - else - { - /* - * Multiple string values... - */ - - int num_values; /* Number of values */ - char *values[100], /* Values */ - *ptr; /* Pointer to next value */ - - - values[0] = token; - num_values = 1; - - for (ptr = strchr(token, ','); ptr; ptr = strchr(ptr, ',')) - { - if (ptr > token && ptr[-1] == '\\') - _cups_strcpy(ptr - 1, ptr); - else - { - *ptr++ = '\0'; - values[num_values] = ptr; - num_values ++; - } - } - - ippAddStrings(col, IPP_TAG_ZERO, value, attr, num_values, - NULL, (const char **)values); - } - break; + cupsFilePutChar(outfile, *s++); + cupsFilePutChar(outfile, *s++); + cupsFilePutChar(outfile, *s++); + cupsFilePutChar(outfile, *s); } } - else + else if ((*s & 0x80) || (*s < ' ' && !isspace(*s & 255))) { - print_fatal_error(outfile, "Unexpected token %s seen on line %d.", token, *linenum); - goto col_error; - } - } - - return (col); - - /* - * If we get here there was a parse error; free memory and return. - */ + /* + * Invalid control character... + */ - col_error: + cupsFilePutChar(outfile, '?'); + } + else + cupsFilePutChar(outfile, *s); - ippDelete(col); + s ++; + } - return (NULL); + if (element) + cupsFilePrintf(outfile, "\n", element); } /* - * 'get_filename()' - Get a filename based on the current test file. + * 'print_xml_trailer()' - Print the XML trailer with success/fail value. */ -static char * /* O - Filename */ -get_filename(const char *testfile, /* I - Current test file */ - char *dst, /* I - Destination filename */ - const char *src, /* I - Source filename */ - size_t dstsize) /* I - Size of destination buffer */ +static void +print_xml_trailer( + _cups_testdata_t *data, /* I - Test data */ + int success, /* I - 1 on success, 0 on failure */ + const char *message) /* I - Error message or NULL */ { - char *dstptr; /* Pointer into destination */ - _cups_globals_t *cg = _cupsGlobals(); - /* Global data */ - - - if (*src == '<' && src[strlen(src) - 1] == '>') - { - /* - * Map to CUPS_DATADIR/ipptool/filename... - */ - - snprintf(dst, dstsize, "%s/ipptool/%s", cg->cups_datadir, src + 1); - dstptr = dst + strlen(dst) - 1; - if (*dstptr == '>') - *dstptr = '\0'; - } - else if (*src == '/' || !strchr(testfile, '/') -#ifdef WIN32 - || (isalpha(*src & 255) && src[1] == ':') -#endif /* WIN32 */ - ) - { - /* - * Use the path as-is... - */ - - strlcpy(dst, src, dstsize); - } - else + if (data->xml_header) { - /* - * Make path relative to testfile... - */ - - strlcpy(dst, testfile, dstsize); - if ((dstptr = strrchr(dst, '/')) != NULL) - dstptr ++; - else - dstptr = dst; /* Should never happen */ + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "Successful\n"); + cupsFilePuts(data->outfile, success ? "\n" : "\n"); + if (message) + { + cupsFilePuts(data->outfile, "ErrorMessage\n"); + print_xml_string(data->outfile, "string", message); + } + cupsFilePuts(data->outfile, "\n"); + cupsFilePuts(data->outfile, "\n"); - strlcpy(dstptr, src, dstsize - (size_t)(dstptr - dst)); + data->xml_header = 0; } - - return (dst); } +#ifndef WIN32 /* - * 'get_string()' - Get a pointer to a string value or the portion of interest. + * 'sigterm_handler()' - Handle SIGINT and SIGTERM. */ -static const char * /* O - Pointer to string */ -get_string(ipp_attribute_t *attr, /* I - IPP attribute */ - int element, /* I - Element to fetch */ - int flags, /* I - Value ("with") flags */ - char *buffer, /* I - Temporary buffer */ - size_t bufsize) /* I - Size of temporary buffer */ +static void +sigterm_handler(int sig) /* I - Signal number (unused) */ { - const char *value; /* Value */ - char *ptr, /* Pointer into value */ - scheme[256], /* URI scheme */ - userpass[256], /* Username/password */ - hostname[256], /* Hostname */ - resource[1024]; /* Resource */ - int port; /* Port number */ + (void)sig; + Cancel = 1; - value = ippGetString(attr, element, NULL); + signal(SIGINT, SIG_DFL); + signal(SIGTERM, SIG_DFL); +} +#endif /* !WIN32 */ - if (flags & _CUPS_WITH_HOSTNAME) - { - if (httpSeparateURI(HTTP_URI_CODING_ALL, value, scheme, sizeof(scheme), userpass, sizeof(userpass), buffer, (int)bufsize, &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK) - buffer[0] = '\0'; - ptr = buffer + strlen(buffer) - 1; - if (ptr >= buffer && *ptr == '.') - *ptr = '\0'; /* Drop trailing "." */ +/* + * 'timeout_cb()' - Handle HTTP timeouts. + */ - return (buffer); - } - else if (flags & _CUPS_WITH_RESOURCE) - { - if (httpSeparateURI(HTTP_URI_CODING_ALL, value, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, buffer, (int)bufsize) < HTTP_URI_STATUS_OK) - buffer[0] = '\0'; +static int /* O - 1 to continue, 0 to cancel */ +timeout_cb(http_t *http, /* I - Connection to server */ + void *user_data) /* I - User data (unused) */ +{ + int buffered = 0; /* Bytes buffered but not yet sent */ - return (buffer); - } - else if (flags & _CUPS_WITH_SCHEME) - { - if (httpSeparateURI(HTTP_URI_CODING_ALL, value, buffer, (int)bufsize, userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK) - buffer[0] = '\0'; - return (buffer); - } - else if (ippGetValueTag(attr) == IPP_TAG_URI && (!strncmp(value, "ipp://", 6) || !strncmp(value, "http://", 7) || !strncmp(value, "ipps://", 7) || !strncmp(value, "https://", 8))) - { - http_uri_status_t status = httpSeparateURI(HTTP_URI_CODING_ALL, value, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, sizeof(resource)); + (void)user_data; - if (status < HTTP_URI_STATUS_OK) - { - /* - * Bad URI... - */ + /* + * If the socket still have data waiting to be sent to the printer (as can + * happen if the printer runs out of paper), continue to wait until the output + * buffer is empty... + */ - buffer[0] = '\0'; - } - else - { - /* - * Normalize URI with no trailing dot... - */ +#ifdef SO_NWRITE /* macOS and some versions of Linux */ + socklen_t len = sizeof(buffered); /* Size of return value */ - if ((ptr = hostname + strlen(hostname) - 1) >= hostname && *ptr == '.') - *ptr = '\0'; + if (getsockopt(httpGetFd(http), SOL_SOCKET, SO_NWRITE, &buffered, &len)) + buffered = 0; - httpAssembleURI(HTTP_URI_CODING_ALL, buffer, (int)bufsize, scheme, userpass, hostname, port, resource); - } +#elif defined(SIOCOUTQ) /* Others except Windows */ + if (ioctl(httpGetFd(http), SIOCOUTQ, &buffered)) + buffered = 0; - return (buffer); - } - else - return (value); +#else /* Windows (not possible) */ + (void)http; +#endif /* SO_NWRITE */ + + return (buffered > 0); } /* - * 'get_token()' - Get a token from a file. + * 'token_cb()' - Parse test file-specific tokens and run tests. */ -static char * /* O - Token from file or NULL on EOF */ -get_token(cups_file_t *fp, /* I - File to read from */ - char *buf, /* I - Buffer to read into */ - int buflen, /* I - Length of buffer */ - int *linenum) /* IO - Current line number */ +static int /* O - 1 to continue, 0 to stop */ +token_cb(_ipp_file_t *f, /* I - IPP file data */ + _ipp_vars_t *vars, /* I - IPP variables */ + _cups_testdata_t *data, /* I - Test data */ + const char *token) /* I - Current token */ { - int ch, /* Character from file */ - quote; /* Quoting character */ - char *bufptr, /* Pointer into buffer */ - *bufend; /* End of buffer */ + char name[1024], /* Name string */ + temp[1024], /* Temporary string */ + value[1024], /* Value string */ + *ptr; /* Pointer into value */ - for (;;) + if (!token) { /* - * Skip whitespace... + * Initialize state as needed (nothing for now...) */ - while (isspace(ch = cupsFileGetChar(fp))) - { - if (ch == '\n') - (*linenum) ++; - } - + return (1); + } + else if (f->attrs) + { /* - * Read a token... + * Parse until we see a close brace... */ - if (ch == EOF) - return (NULL); - else if (ch == '\'' || ch == '\"') + if (_cups_strcasecmp(token, "COUNT") && + _cups_strcasecmp(token, "DEFINE-MATCH") && + _cups_strcasecmp(token, "DEFINE-NO-MATCH") && + _cups_strcasecmp(token, "DEFINE-VALUE") && + _cups_strcasecmp(token, "IF-DEFINED") && + _cups_strcasecmp(token, "IF-NOT-DEFINED") && + _cups_strcasecmp(token, "IN-GROUP") && + _cups_strcasecmp(token, "OF-TYPE") && + _cups_strcasecmp(token, "REPEAT-LIMIT") && + _cups_strcasecmp(token, "REPEAT-MATCH") && + _cups_strcasecmp(token, "REPEAT-NO-MATCH") && + _cups_strcasecmp(token, "SAME-COUNT-AS") && + _cups_strcasecmp(token, "WITH-ALL-VALUES") && + _cups_strcasecmp(token, "WITH-ALL-HOSTNAMES") && + _cups_strcasecmp(token, "WITH-ALL-RESOURCES") && + _cups_strcasecmp(token, "WITH-ALL-SCHEMES") && + _cups_strcasecmp(token, "WITH-HOSTNAME") && + _cups_strcasecmp(token, "WITH-RESOURCE") && + _cups_strcasecmp(token, "WITH-SCHEME") && + _cups_strcasecmp(token, "WITH-VALUE") && + _cups_strcasecmp(token, "WITH-VALUE-FROM")) + data->last_expect = NULL; + + if (_cups_strcasecmp(token, "DEFINE-MATCH") && + _cups_strcasecmp(token, "DEFINE-NO-MATCH") && + _cups_strcasecmp(token, "IF-DEFINED") && + _cups_strcasecmp(token, "IF-NOT-DEFINED") && + _cups_strcasecmp(token, "REPEAT-LIMIT") && + _cups_strcasecmp(token, "REPEAT-MATCH") && + _cups_strcasecmp(token, "REPEAT-NO-MATCH")) + data->last_status = NULL; + + if (!strcmp(token, "}")) + { + return (do_test(f, vars, data)); + } + else if (!strcmp(token, "COMPRESSION")) { /* - * Quoted text or regular expression... + * COMPRESSION none + * COMPRESSION deflate + * COMPRESSION gzip */ - quote = ch; - bufptr = buf; - bufend = buf + buflen - 1; - - while ((ch = cupsFileGetChar(fp)) != EOF) + if (_ippFileReadToken(f, temp, sizeof(temp))) { - if (ch == '\\') - { - /* - * Escape next character... - */ - - if (bufptr < bufend) - *bufptr++ = (char)ch; - - if ((ch = cupsFileGetChar(fp)) != EOF && bufptr < bufend) - *bufptr++ = (char)ch; + _ippVarsExpand(vars, data->compression, temp, sizeof(data->compression)); +#ifdef HAVE_LIBZ + if (strcmp(data->compression, "none") && strcmp(data->compression, "deflate") && + strcmp(data->compression, "gzip")) +#else + if (strcmp(data->compression, "none")) +#endif /* HAVE_LIBZ */ + { + print_fatal_error(data, "Unsupported COMPRESSION value \"%s\" on line %d of \"%s\".", data->compression, f->linenum, f->filename); + return (0); } - else if (ch == quote) - break; - else if (bufptr < bufend) - *bufptr++ = (char)ch; + + if (!strcmp(data->compression, "none")) + data->compression[0] = '\0'; + } + else + { + print_fatal_error(data, "Missing COMPRESSION value on line %d of \"%s\".", f->linenum, f->filename); + return (0); } + } + else if (!strcmp(token, "DEFINE")) + { + /* + * DEFINE name value + */ - *bufptr = '\0'; + if (_ippFileReadToken(f, name, sizeof(name)) && _ippFileReadToken(f, temp, sizeof(temp))) + { + _ippVarsExpand(vars, value, temp, sizeof(value)); + _ippVarsSet(vars, name, value); + } + else + { + print_fatal_error(data, "Missing DEFINE name and/or value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "IGNORE-ERRORS")) + { + /* + * IGNORE-ERRORS yes + * IGNORE-ERRORS no + */ - return (buf); + if (_ippFileReadToken(f, temp, sizeof(temp)) && (!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) + { + data->ignore_errors = !_cups_strcasecmp(temp, "yes"); + } + else + { + print_fatal_error(data, "Missing IGNORE-ERRORS value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } } - else if (ch == '#') + else if (!_cups_strcasecmp(token, "NAME")) { /* - * Comment... + * Name of test... */ - while ((ch = cupsFileGetChar(fp)) != EOF) - if (ch == '\n') - break; + _ippFileReadToken(f, temp, sizeof(temp)); + _ippVarsExpand(vars, data->name, temp, sizeof(data->name)); + } + else if (!_cups_strcasecmp(token, "PAUSE")) + { + /* + * Pause with a message... + */ - (*linenum) ++; + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + pause_message(temp); + } + else + { + print_fatal_error(data, "Missing PAUSE message on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } } - else if (ch == '{' || ch == '}' || ch == ',') + else if (!strcmp(token, "REQUEST-ID")) { - buf[0] = (char)ch; - buf[1] = '\0'; + /* + * REQUEST-ID # + * REQUEST-ID random + */ - return (buf); + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + if (isdigit(temp[0] & 255)) + { + data->request_id = atoi(temp); + } + else if (!_cups_strcasecmp(temp, "random")) + { + data->request_id = (CUPS_RAND() % 1000) * 137 + 1; + } + else + { + print_fatal_error(data, "Bad REQUEST-ID value \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } + } + else + { + print_fatal_error(data, "Missing REQUEST-ID value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } } - else + else if (!strcmp(token, "SKIP-IF-DEFINED")) { /* - * Whitespace delimited text... + * SKIP-IF-DEFINED variable */ - cupsFileSeek(fp, cupsFileTell(fp) - 1); + if (_ippFileReadToken(f, name, sizeof(name))) + { + if (_ippVarsGet(vars, name)) + data->skip_test = 1; + } + else + { + print_fatal_error(data, "Missing SKIP-IF-DEFINED value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "SKIP-IF-MISSING")) + { + /* + * SKIP-IF-MISSING filename + */ - bufptr = buf; - bufend = buf + buflen - 1; + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + char filename[1024]; /* Filename */ - while ((ch = cupsFileGetChar(fp)) != EOF) - if (isspace(ch) || ch == '#') - break; - else if (bufptr < bufend) - *bufptr++ = (char)ch; + _ippVarsExpand(vars, value, temp, sizeof(value)); + get_filename(f->filename, filename, temp, sizeof(filename)); - if (ch == '#') - cupsFileSeek(fp, cupsFileTell(fp) - 1); - else if (ch == '\n') - (*linenum) ++; + if (access(filename, R_OK)) + data->skip_test = 1; + } + else + { + print_fatal_error(data, "Missing SKIP-IF-MISSING filename on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "SKIP-IF-NOT-DEFINED")) + { + /* + * SKIP-IF-NOT-DEFINED variable + */ - *bufptr = '\0'; + if (_ippFileReadToken(f, name, sizeof(name))) + { + if (!_ippVarsGet(vars, name)) + data->skip_test = 1; + } + else + { + print_fatal_error(data, "Missing SKIP-IF-NOT-DEFINED value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "SKIP-PREVIOUS-ERROR")) + { + /* + * SKIP-PREVIOUS-ERROR yes + * SKIP-PREVIOUS-ERROR no + */ - return (buf); + if (_ippFileReadToken(f, temp, sizeof(temp)) && (!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) + { + data->skip_previous = !_cups_strcasecmp(temp, "yes"); + } + else + { + print_fatal_error(data, "Missing SKIP-PREVIOUS-ERROR value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } } - } -} + else if (!strcmp(token, "TEST-ID")) + { + /* + * TEST-ID "string" + */ + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + _ippVarsExpand(vars, data->test_id, temp, sizeof(data->test_id)); + } + else + { + print_fatal_error(data, "Missing TEST-ID value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "TRANSFER")) + { + /* + * TRANSFER auto + * TRANSFER chunked + * TRANSFER length + */ -/* - * 'get_variable()' - Get the value of a variable. - */ + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + if (!strcmp(temp, "auto")) + { + data->transfer = _CUPS_TRANSFER_AUTO; + } + else if (!strcmp(temp, "chunked")) + { + data->transfer = _CUPS_TRANSFER_CHUNKED; + } + else if (!strcmp(temp, "length")) + { + data->transfer = _CUPS_TRANSFER_LENGTH; + } + else + { + print_fatal_error(data, "Bad TRANSFER value \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } + } + else + { + print_fatal_error(data, "Missing TRANSFER value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "VERSION")) + { + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + if (!strcmp(temp, "0.0")) + { + data->version = 0; + } + else if (!strcmp(temp, "1.0")) + { + data->version = 10; + } + else if (!strcmp(temp, "1.1")) + { + data->version = 11; + } + else if (!strcmp(temp, "2.0")) + { + data->version = 20; + } + else if (!strcmp(temp, "2.1")) + { + data->version = 21; + } + else if (!strcmp(temp, "2.2")) + { + data->version = 22; + } + else + { + print_fatal_error(data, "Bad VERSION \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } + } + else + { + print_fatal_error(data, "Missing VERSION number on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "RESOURCE")) + { + /* + * Resource name... + */ -static char * /* O - Value or NULL */ -get_variable(_cups_vars_t *vars, /* I - Variables */ - const char *name) /* I - Variable name */ -{ - _cups_var_t key, /* Search key */ - *match; /* Matching variable, if any */ + if (!_ippFileReadToken(f, data->resource, sizeof(data->resource))) + { + print_fatal_error(data, "Missing RESOURCE path on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "OPERATION")) + { + /* + * Operation... + */ + ipp_op_t op; /* Operation code */ - key.name = (char *)name; - match = cupsArrayFind(vars->vars, &key); + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing OPERATION code on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - return (match ? match->value : NULL); -} + _ippVarsExpand(vars, value, temp, sizeof(value)); + if ((op = ippOpValue(value)) == (ipp_op_t)-1 && (op = (ipp_op_t)strtol(value, NULL, 0)) == 0) + { + print_fatal_error(data, "Bad OPERATION code \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } -/* - * 'iso_date()' - Return an ISO 8601 date/time string for the given IPP dateTime - * value. - */ + ippSetOperation(f->attrs, op); + } + else if (!_cups_strcasecmp(token, "GROUP")) + { + /* + * Attribute group... + */ -static char * /* O - ISO 8601 date/time string */ -iso_date(ipp_uchar_t *date) /* I - IPP (RFC 1903) date/time value */ -{ - time_t utctime; /* UTC time since 1970 */ - struct tm *utcdate; /* UTC date/time */ - static char buffer[255]; /* String buffer */ + ipp_tag_t group_tag; /* Group tag */ + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing GROUP tag on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - utctime = ippDateToTime(date); - utcdate = gmtime(&utctime); + if ((group_tag = ippTagValue(temp)) == IPP_TAG_ZERO || group_tag >= IPP_TAG_UNSUPPORTED_VALUE) + { + print_fatal_error(data, "Bad GROUP tag \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } - snprintf(buffer, sizeof(buffer), "%04d-%02d-%02dT%02d:%02d:%02dZ", - utcdate->tm_year + 1900, utcdate->tm_mon + 1, utcdate->tm_mday, - utcdate->tm_hour, utcdate->tm_min, utcdate->tm_sec); + if (group_tag == f->group_tag) + ippAddSeparator(f->attrs); - return (buffer); -} + f->group_tag = group_tag; + } + else if (!_cups_strcasecmp(token, "DELAY")) + { + /* + * Delay before operation... + */ + double dval; /* Delay value */ -/* - * 'password_cb()' - Password callback for authenticated tests. - */ + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing DELAY value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } -static const char * /* O - Password */ -password_cb(const char *prompt) /* I - Prompt (unused) */ -{ - (void)prompt; + _ippVarsExpand(vars, value, temp, sizeof(value)); - if (PasswordTries < 3) - { - PasswordTries ++; + if ((dval = _cupsStrScand(value, &ptr, localeconv())) < 0.0 || (*ptr && *ptr != ',')) + { + print_fatal_error(data, "Bad DELAY value \"%s\" on line %d of \"%s\".", value, f->linenum, f->filename); + return (0); + } - cupsSetUser(Username); + data->delay = (useconds_t)(1000000.0 * dval); - return (Password); - } - else - return (NULL); -} + if (*ptr == ',') + { + if ((dval = _cupsStrScand(ptr + 1, &ptr, localeconv())) <= 0.0 || *ptr) + { + print_fatal_error(data, "Bad DELAY value \"%s\" on line %d of \"%s\".", value, f->linenum, f->filename); + return (0); + } + data->repeat_interval = (useconds_t)(1000000.0 * dval); + } + else + data->repeat_interval = data->delay; + } + else if (!_cups_strcasecmp(token, "FILE")) + { + /* + * File... + */ -/* - * 'pause_message()' - Display the message and pause until the user presses a key. - */ + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing FILE filename on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } -static void -pause_message(const char *message) /* I - Message */ -{ -#ifdef WIN32 - HANDLE tty; /* Console handle */ - DWORD mode; /* Console mode */ - char key; /* Key press */ - DWORD bytes; /* Bytes read for key press */ + _ippVarsExpand(vars, value, temp, sizeof(value)); + get_filename(f->filename, data->file, value, sizeof(data->file)); + if (access(data->file, R_OK)) + { + print_fatal_error(data, "Filename \"%s\" (mapped to \"%s\") on line %d of \"%s\" cannot be read.", value, data->file, f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "STATUS")) + { + /* + * Status... + */ - /* - * Disable input echo and set raw input... - */ + if (data->num_statuses >= (int)(sizeof(data->statuses) / sizeof(data->statuses[0]))) + { + print_fatal_error(data, "Too many STATUS's on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - if ((tty = GetStdHandle(STD_INPUT_HANDLE)) == INVALID_HANDLE_VALUE) - return; + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing STATUS code on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - if (!GetConsoleMode(tty, &mode)) - return; + if ((data->statuses[data->num_statuses].status = ippErrorValue(temp)) == (ipp_status_t)-1 && (data->statuses[data->num_statuses].status = (ipp_status_t)strtol(temp, NULL, 0)) == 0) + { + print_fatal_error(data, "Bad STATUS code \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } - if (!SetConsoleMode(tty, 0)) - return; + data->last_status = data->statuses + data->num_statuses; + data->num_statuses ++; -#else - int tty; /* /dev/tty - never read from stdin */ - struct termios original, /* Original input mode */ - noecho; /* No echo input mode */ - char key; /* Current key press */ - - - /* - * Disable input echo and set raw input... - */ - - if ((tty = open("/dev/tty", O_RDONLY)) < 0) - return; - - if (tcgetattr(tty, &original)) - { - close(tty); - return; - } - - noecho = original; - noecho.c_lflag &= (tcflag_t)~(ICANON | ECHO | ECHOE | ISIG); - - if (tcsetattr(tty, TCSAFLUSH, &noecho)) - { - close(tty); - return; - } -#endif /* WIN32 */ - - /* - * Display the prompt... - */ - - cupsFilePrintf(cupsFileStdout(), "%s\n---- PRESS ANY KEY ----", message); - -#ifdef WIN32 - /* - * Read a key... - */ - - ReadFile(tty, &key, 1, &bytes, NULL); - - /* - * Cleanup... - */ - - SetConsoleMode(tty, mode); - -#else - /* - * Read a key... - */ - - read(tty, &key, 1); - - /* - * Cleanup... - */ - - tcsetattr(tty, TCSAFLUSH, &original); - close(tty); -#endif /* WIN32 */ - - /* - * Erase the "press any key" prompt... - */ + data->last_status->define_match = NULL; + data->last_status->define_no_match = NULL; + data->last_status->if_defined = NULL; + data->last_status->if_not_defined = NULL; + data->last_status->repeat_limit = 1000; + data->last_status->repeat_match = 0; + data->last_status->repeat_no_match = 0; + } + else if (!_cups_strcasecmp(token, "EXPECT") || !_cups_strcasecmp(token, "EXPECT-ALL")) + { + /* + * Expected attributes... + */ - cupsFilePuts(cupsFileStdout(), "\r \r"); -} + int expect_all = !_cups_strcasecmp(token, "EXPECT-ALL"); + if (data->num_expects >= (int)(sizeof(data->expects) / sizeof(data->expects[0]))) + { + print_fatal_error(data, "Too many EXPECT's on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } -/* - * 'print_attr()' - Print an attribute on the screen. - */ + if (!_ippFileReadToken(f, name, sizeof(name))) + { + print_fatal_error(data, "Missing EXPECT name on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } -static void -print_attr(cups_file_t *outfile, /* I - Output file */ - int format, /* I - Output format */ - ipp_attribute_t *attr, /* I - Attribute to print */ - ipp_tag_t *group) /* IO - Current group */ -{ - int i; /* Looping var */ - ipp_attribute_t *colattr; /* Collection attribute */ + data->last_expect = data->expects + data->num_expects; + data->num_expects ++; + memset(data->last_expect, 0, sizeof(_cups_expect_t)); + data->last_expect->repeat_limit = 1000; + data->last_expect->expect_all = expect_all; - if (format == _CUPS_OUTPUT_PLIST) - { - if (!attr->name || (group && *group != attr->group_tag)) - { - if (attr->group_tag != IPP_TAG_ZERO) + if (name[0] == '!') { - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "\n"); + data->last_expect->not_expect = 1; + data->last_expect->name = strdup(name + 1); } - - if (group) - *group = attr->group_tag; + else if (name[0] == '?') + { + data->last_expect->optional = 1; + data->last_expect->name = strdup(name + 1); + } + else + data->last_expect->name = strdup(name); } - - if (!attr->name) - return; - - print_xml_string(outfile, "key", attr->name); - if (attr->num_values > 1) - cupsFilePuts(outfile, "\n"); - - switch (attr->value_tag) + else if (!_cups_strcasecmp(token, "COUNT")) { - case IPP_TAG_INTEGER : - case IPP_TAG_ENUM : - for (i = 0; i < attr->num_values; i ++) - cupsFilePrintf(outfile, "%d\n", attr->values[i].integer); - break; - - case IPP_TAG_BOOLEAN : - for (i = 0; i < attr->num_values; i ++) - cupsFilePuts(outfile, attr->values[i].boolean ? "\n" : "\n"); - break; - - case IPP_TAG_RANGE : - for (i = 0; i < attr->num_values; i ++) - cupsFilePrintf(outfile, "lower%d" - "upper%d\n", - attr->values[i].range.lower, attr->values[i].range.upper); - break; - - case IPP_TAG_RESOLUTION : - for (i = 0; i < attr->num_values; i ++) - cupsFilePrintf(outfile, "xres%d" - "yres%d" - "units%s\n", - attr->values[i].resolution.xres, - attr->values[i].resolution.yres, - attr->values[i].resolution.units == IPP_RES_PER_INCH ? - "dpi" : "dpcm"); - break; - - case IPP_TAG_DATE : - for (i = 0; i < attr->num_values; i ++) - cupsFilePrintf(outfile, "%s\n", iso_date(attr->values[i].date)); - break; - - case IPP_TAG_STRING : - for (i = 0; i < attr->num_values; i ++) - { - char buffer[IPP_MAX_LENGTH * 5 / 4 + 1]; - /* Output buffer */ - - cupsFilePrintf(outfile, "%s\n", - httpEncode64_2(buffer, sizeof(buffer), - attr->values[i].unknown.data, - attr->values[i].unknown.length)); - } - break; - - case IPP_TAG_TEXT : - case IPP_TAG_NAME : - case IPP_TAG_KEYWORD : - case IPP_TAG_URI : - case IPP_TAG_URISCHEME : - case IPP_TAG_CHARSET : - case IPP_TAG_LANGUAGE : - case IPP_TAG_MIMETYPE : - for (i = 0; i < attr->num_values; i ++) - print_xml_string(outfile, "string", attr->values[i].string.text); - break; + int count; /* Count value */ - case IPP_TAG_TEXTLANG : - case IPP_TAG_NAMELANG : - for (i = 0; i < attr->num_values; i ++) - { - cupsFilePuts(outfile, "language"); - print_xml_string(outfile, NULL, attr->values[i].string.language); - cupsFilePuts(outfile, "string"); - print_xml_string(outfile, NULL, attr->values[i].string.text); - cupsFilePuts(outfile, "\n"); - } - break; + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing COUNT number on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - case IPP_TAG_BEGIN_COLLECTION : - for (i = 0; i < attr->num_values; i ++) - { - cupsFilePuts(outfile, "\n"); - for (colattr = attr->values[i].collection->attrs; - colattr; - colattr = colattr->next) - print_attr(outfile, format, colattr, NULL); - cupsFilePuts(outfile, "\n"); - } - break; + if ((count = atoi(temp)) <= 0) + { + print_fatal_error(data, "Bad COUNT \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } - default : - cupsFilePrintf(outfile, "<<%s>>\n", ippTagString(attr->value_tag)); - break; + if (data->last_expect) + { + data->last_expect->count = count; + } + else + { + print_fatal_error(data, "COUNT without a preceding EXPECT on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } } - - if (attr->num_values > 1) - cupsFilePuts(outfile, "\n"); - } - else - { - char buffer[131072]; /* Value buffer */ - - if (format == _CUPS_OUTPUT_TEST) + else if (!_cups_strcasecmp(token, "DEFINE-MATCH")) { - if (!attr->name) + if (!_ippFileReadToken(f, temp, sizeof(temp))) { - cupsFilePuts(outfile, " -- separator --\n"); - return; + print_fatal_error(data, "Missing DEFINE-MATCH variable on line %d of \"%s\".", f->linenum, f->filename); + return (0); } - cupsFilePrintf(outfile, " %s (%s%s) = ", attr->name, attr->num_values > 1 ? "1setOf " : "", ippTagString(attr->value_tag)); + if (data->last_expect) + { + data->last_expect->define_match = strdup(temp); + } + else if (data->last_status) + { + data->last_status->define_match = strdup(temp); + } + else + { + print_fatal_error(data, "DEFINE-MATCH without a preceding EXPECT or STATUS on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } } - - ippAttributeString(attr, buffer, sizeof(buffer)); - cupsFilePrintf(outfile, "%s\n", buffer); - } -} - - -/* - * 'print_csv()' - Print a line of CSV text. - */ - -static void -print_csv( - cups_file_t *outfile, /* I - Output file */ - ipp_attribute_t *attr, /* I - First attribute for line */ - int num_displayed, /* I - Number of attributes to display */ - char **displayed, /* I - Attributes to display */ - size_t *widths) /* I - Column widths */ -{ - int i; /* Looping var */ - size_t maxlength; /* Max length of all columns */ - char *buffer, /* String buffer */ - *bufptr; /* Pointer into buffer */ - ipp_attribute_t *current; /* Current attribute */ - - - /* - * Get the maximum string length we have to show and allocate... - */ - - for (i = 1, maxlength = widths[0]; i < num_displayed; i ++) - if (widths[i] > maxlength) - maxlength = widths[i]; - - maxlength += 2; - - if ((buffer = malloc(maxlength)) == NULL) - return; - - /* - * Loop through the attributes to display... - */ - - if (attr) - { - for (i = 0; i < num_displayed; i ++) + else if (!_cups_strcasecmp(token, "DEFINE-NO-MATCH")) { - if (i) - cupsFilePutChar(outfile, ','); - - buffer[0] = '\0'; - - for (current = attr; current; current = current->next) + if (!_ippFileReadToken(f, temp, sizeof(temp))) { - if (!current->name) - break; - else if (!strcmp(current->name, displayed[i])) - { - ippAttributeString(current, buffer, maxlength); - break; - } + print_fatal_error(data, "Missing DEFINE-NO-MATCH variable on line %d of \"%s\".", f->linenum, f->filename); + return (0); } - if (strchr(buffer, ',') != NULL || strchr(buffer, '\"') != NULL || - strchr(buffer, '\\') != NULL) + if (data->last_expect) { - cupsFilePutChar(cupsFileStdout(), '\"'); - for (bufptr = buffer; *bufptr; bufptr ++) - { - if (*bufptr == '\\' || *bufptr == '\"') - cupsFilePutChar(cupsFileStdout(), '\\'); - cupsFilePutChar(cupsFileStdout(), *bufptr); - } - cupsFilePutChar(cupsFileStdout(), '\"'); + data->last_expect->define_no_match = strdup(temp); + } + else if (data->last_status) + { + data->last_status->define_no_match = strdup(temp); } else - cupsFilePuts(outfile, buffer); + { + print_fatal_error(data, "DEFINE-NO-MATCH without a preceding EXPECT or STATUS on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } } - cupsFilePutChar(cupsFileStdout(), '\n'); - } - else - { - for (i = 0; i < num_displayed; i ++) + else if (!_cups_strcasecmp(token, "DEFINE-VALUE")) { - if (i) - cupsFilePutChar(cupsFileStdout(), ','); + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing DEFINE-VALUE variable on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - cupsFilePuts(outfile, displayed[i]); + if (data->last_expect) + { + data->last_expect->define_value = strdup(temp); + } + else + { + print_fatal_error(data, "DEFINE-VALUE without a preceding EXPECT on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } } - cupsFilePutChar(cupsFileStdout(), '\n'); - } - - free(buffer); -} - - -/* - * 'print_fatal_error()' - Print a fatal error message. - */ - -static void -print_fatal_error(cups_file_t *outfile, /* I - Output file */ - const char *s, /* I - Printf-style format string */ - ...) /* I - Additional arguments as needed */ -{ - char buffer[10240]; /* Format buffer */ - va_list ap; /* Pointer to arguments */ - - - /* - * Format the error message... - */ - - va_start(ap, s); - vsnprintf(buffer, sizeof(buffer), s, ap); - va_end(ap); - - /* - * Then output it... - */ - - if (Output == _CUPS_OUTPUT_PLIST) - { - print_xml_header(outfile); - print_xml_trailer(outfile, 0, buffer); - } - - _cupsLangPrintf(stderr, "ipptool: %s", buffer); -} - - -/* - * 'print_line()' - Print a line of formatted or CSV text. - */ - -static void -print_line( - cups_file_t *outfile, /* I - Output file */ - ipp_attribute_t *attr, /* I - First attribute for line */ - int num_displayed, /* I - Number of attributes to display */ - char **displayed, /* I - Attributes to display */ - size_t *widths) /* I - Column widths */ -{ - int i; /* Looping var */ - size_t maxlength; /* Max length of all columns */ - char *buffer; /* String buffer */ - ipp_attribute_t *current; /* Current attribute */ - - - /* - * Get the maximum string length we have to show and allocate... - */ - - for (i = 1, maxlength = widths[0]; i < num_displayed; i ++) - if (widths[i] > maxlength) - maxlength = widths[i]; - - maxlength += 2; - - if ((buffer = malloc(maxlength)) == NULL) - return; - - /* - * Loop through the attributes to display... - */ - - if (attr) - { - for (i = 0; i < num_displayed; i ++) - { - if (i) - cupsFilePutChar(cupsFileStdout(), ' '); - - buffer[0] = '\0'; - - for (current = attr; current; current = current->next) - { - if (!current->name) - break; - else if (!strcmp(current->name, displayed[i])) - { - ippAttributeString(current, buffer, maxlength); - break; - } - } - - cupsFilePrintf(outfile, "%*s", (int)-widths[i], buffer); - } - cupsFilePutChar(cupsFileStdout(), '\n'); - } - else - { - for (i = 0; i < num_displayed; i ++) - { - if (i) - cupsFilePutChar(cupsFileStdout(), ' '); - - cupsFilePrintf(outfile, "%*s", (int)-widths[i], displayed[i]); - } - cupsFilePutChar(cupsFileStdout(), '\n'); - - for (i = 0; i < num_displayed; i ++) - { - if (i) - cupsFilePutChar(cupsFileStdout(), ' '); - - memset(buffer, '-', widths[i]); - buffer[widths[i]] = '\0'; - cupsFilePuts(outfile, buffer); - } - cupsFilePutChar(cupsFileStdout(), '\n'); - } - - free(buffer); -} - - -/* - * 'print_xml_header()' - Print a standard XML plist header. - */ - -static void -print_xml_header(cups_file_t *outfile) /* I - Output file */ -{ - if (!XMLHeader) - { - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "ipptoolVersion\n"); - cupsFilePuts(outfile, "" CUPS_SVERSION "\n"); - cupsFilePuts(outfile, "Transfer\n"); - cupsFilePrintf(outfile, "%s\n", - Transfer == _CUPS_TRANSFER_AUTO ? "auto" : - Transfer == _CUPS_TRANSFER_CHUNKED ? "chunked" : "length"); - cupsFilePuts(outfile, "Tests\n"); - cupsFilePuts(outfile, "\n"); - - XMLHeader = 1; - } -} - - -/* - * 'print_xml_string()' - Print an XML string with escaping. - */ - -static void -print_xml_string(cups_file_t *outfile, /* I - Output file */ - const char *element, /* I - Element name or NULL */ - const char *s) /* I - String to print */ -{ - if (element) - cupsFilePrintf(outfile, "<%s>", element); - - while (*s) - { - if (*s == '&') - cupsFilePuts(outfile, "&"); - else if (*s == '<') - cupsFilePuts(outfile, "<"); - else if (*s == '>') - cupsFilePuts(outfile, ">"); - else if ((*s & 0xe0) == 0xc0) + else if (!_cups_strcasecmp(token, "OF-TYPE")) { - /* - * Validate UTF-8 two-byte sequence... - */ - - if ((s[1] & 0xc0) != 0x80) + if (!_ippFileReadToken(f, temp, sizeof(temp))) { - cupsFilePutChar(outfile, '?'); - s ++; - } - else - { - cupsFilePutChar(outfile, *s++); - cupsFilePutChar(outfile, *s); + print_fatal_error(data, "Missing OF-TYPE value tag(s) on line %d of \"%s\".", f->linenum, f->filename); + return (0); } - } - else if ((*s & 0xf0) == 0xe0) - { - /* - * Validate UTF-8 three-byte sequence... - */ - - if ((s[1] & 0xc0) != 0x80 || (s[2] & 0xc0) != 0x80) - { - cupsFilePutChar(outfile, '?'); - s += 2; - } - else - { - cupsFilePutChar(outfile, *s++); - cupsFilePutChar(outfile, *s++); - cupsFilePutChar(outfile, *s); - } - } - else if ((*s & 0xf8) == 0xf0) - { - /* - * Validate UTF-8 four-byte sequence... - */ - - if ((s[1] & 0xc0) != 0x80 || (s[2] & 0xc0) != 0x80 || - (s[3] & 0xc0) != 0x80) - { - cupsFilePutChar(outfile, '?'); - s += 3; - } - else - { - cupsFilePutChar(outfile, *s++); - cupsFilePutChar(outfile, *s++); - cupsFilePutChar(outfile, *s++); - cupsFilePutChar(outfile, *s); - } - } - else if ((*s & 0x80) || (*s < ' ' && !isspace(*s & 255))) - { - /* - * Invalid control character... - */ - - cupsFilePutChar(outfile, '?'); - } - else - cupsFilePutChar(outfile, *s); - - s ++; - } - - if (element) - cupsFilePrintf(outfile, "\n", element); -} - - -/* - * 'print_xml_trailer()' - Print the XML trailer with success/fail value. - */ - -static void -print_xml_trailer(cups_file_t *outfile, /* I - Output file */ - int success, /* I - 1 on success, 0 on failure */ - const char *message) /* I - Error message or NULL */ -{ - if (XMLHeader) - { - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "Successful\n"); - cupsFilePuts(outfile, success ? "\n" : "\n"); - if (message) - { - cupsFilePuts(outfile, "ErrorMessage\n"); - print_xml_string(outfile, "string", message); - } - cupsFilePuts(outfile, "\n"); - cupsFilePuts(outfile, "\n"); - - XMLHeader = 0; - } -} - - -/* - * 'set_variable()' - Set a variable value. - */ - -static void -set_variable(cups_file_t *outfile, /* I - Output file */ - _cups_vars_t *vars, /* I - Variables */ - const char *name, /* I - Variable name */ - const char *value) /* I - Value string */ -{ - _cups_var_t key, /* Search key */ - *var; /* New variable */ - - - if (!_cups_strcasecmp(name, "filename")) - { - if (vars->filename) - free(vars->filename); - - vars->filename = strdup(value); - return; - } - - key.name = (char *)name; - if ((var = cupsArrayFind(vars->vars, &key)) != NULL) - { - free(var->value); - var->value = strdup(value); - } - else if ((var = malloc(sizeof(_cups_var_t))) == NULL) - { - print_fatal_error(outfile, "Unable to allocate memory for variable \"%s\".", name); - exit(1); - } - else - { - var->name = strdup(name); - var->value = strdup(value); - - cupsArrayAdd(vars->vars, var); - } -} - - -#ifndef WIN32 -/* - * 'sigterm_handler()' - Handle SIGINT and SIGTERM. - */ - -static void -sigterm_handler(int sig) /* I - Signal number (unused) */ -{ - (void)sig; - - Cancel = 1; - - signal(SIGINT, SIG_DFL); - signal(SIGTERM, SIG_DFL); -} -#endif /* !WIN32 */ - - -/* - * 'timeout_cb()' - Handle HTTP timeouts. - */ - -static int /* O - 1 to continue, 0 to cancel */ -timeout_cb(http_t *http, /* I - Connection to server */ - void *user_data) /* I - User data (unused) */ -{ - int buffered = 0; /* Bytes buffered but not yet sent */ - - - (void)user_data; - - /* - * If the socket still have data waiting to be sent to the printer (as can - * happen if the printer runs out of paper), continue to wait until the output - * buffer is empty... - */ - -#ifdef SO_NWRITE /* macOS and some versions of Linux */ - socklen_t len = sizeof(buffered); /* Size of return value */ - - if (getsockopt(httpGetFd(http), SOL_SOCKET, SO_NWRITE, &buffered, &len)) - buffered = 0; - -#elif defined(SIOCOUTQ) /* Others except Windows */ - if (ioctl(httpGetFd(http), SIOCOUTQ, &buffered)) - buffered = 0; - -#else /* Windows (not possible) */ - (void)http; -#endif /* SO_NWRITE */ - - return (buffered > 0); -} - - -/* - * 'usage()' - Show program usage. - */ - -static void -usage(void) -{ - _cupsLangPuts(stderr, _("Usage: ipptool [options] URI filename [ ... filenameN ]")); - _cupsLangPuts(stderr, _("Options:")); - _cupsLangPuts(stderr, _(" --help Show help.")); - _cupsLangPuts(stderr, _(" --stop-after-include-error\n" - " Stop tests after a failed INCLUDE.")); - _cupsLangPuts(stderr, _(" --version Show version.")); - _cupsLangPuts(stderr, _(" -4 Connect using IPv4.")); - _cupsLangPuts(stderr, _(" -6 Connect using IPv6.")); - _cupsLangPuts(stderr, _(" -C Send requests using " - "chunking (default).")); - _cupsLangPuts(stderr, _(" -E Test with encryption using HTTP Upgrade to TLS.")); - _cupsLangPuts(stderr, _(" -I Ignore errors.")); - _cupsLangPuts(stderr, _(" -L Send requests using content-length.")); - _cupsLangPuts(stderr, _(" -P filename.plist Produce XML plist to a file and test report to standard output.")); - _cupsLangPuts(stderr, _(" -S Test with encryption using HTTPS.")); - _cupsLangPuts(stderr, _(" -T seconds Set the receive/send timeout in seconds.")); - _cupsLangPuts(stderr, _(" -V version Set default IPP version.")); - _cupsLangPuts(stderr, _(" -X Produce XML plist instead of plain text.")); - _cupsLangPuts(stderr, _(" -c Produce CSV output.")); - _cupsLangPuts(stderr, _(" -d name=value Set named variable to value.")); - _cupsLangPuts(stderr, _(" -f filename Set default request filename.")); - _cupsLangPuts(stderr, _(" -h Validate HTTP response headers.")); - _cupsLangPuts(stderr, _(" -i seconds Repeat the last file with the given time interval.")); - _cupsLangPuts(stderr, _(" -l Produce plain text output.")); - _cupsLangPuts(stderr, _(" -n count Repeat the last file the given number of times.")); - _cupsLangPuts(stderr, _(" -q Run silently.")); - _cupsLangPuts(stderr, _(" -t Produce a test report.")); - _cupsLangPuts(stderr, _(" -v Be verbose.")); - - exit(1); -} - - -/* - * 'validate_attr()' - Determine whether an attribute is valid. - */ - -static int /* O - 1 if valid, 0 otherwise */ -validate_attr(cups_file_t *outfile, /* I - Output file */ - cups_array_t *errors, /* I - Errors array */ - ipp_attribute_t *attr) /* I - Attribute to validate */ -{ - int i; /* Looping var */ - char scheme[64], /* Scheme from URI */ - userpass[256], /* Username/password from URI */ - hostname[256], /* Hostname from URI */ - resource[1024]; /* Resource from URI */ - int port, /* Port number from URI */ - uri_status, /* URI separation status */ - valid = 1; /* Is the attribute valid? */ - const char *ptr; /* Pointer into string */ - ipp_attribute_t *colattr; /* Collection attribute */ - regex_t re; /* Regular expression */ - ipp_uchar_t *date; /* Current date value */ - - - /* - * Skip separators. - */ - - if (!attr->name) - return (1); - - /* - * Validate the attribute name. - */ - - for (ptr = attr->name; *ptr; ptr ++) - if (!isalnum(*ptr & 255) && *ptr != '-' && *ptr != '.' && *ptr != '_') - break; - - if (*ptr || ptr == attr->name) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad attribute name - invalid character " - "(RFC 2911 section 4.1.3).", attr->name); - } - - if ((ptr - attr->name) > 255) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad attribute name - bad length " - "(RFC 2911 section 4.1.3).", attr->name); - } - - switch (attr->value_tag) - { - case IPP_TAG_INTEGER : - break; - - case IPP_TAG_BOOLEAN : - for (i = 0; i < attr->num_values; i ++) - { - if (attr->values[i].boolean != 0 && - attr->values[i].boolean != 1) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad boolen value %d " - "(RFC 2911 section 4.1.11).", attr->name, - attr->values[i].boolean); - } - } - break; - - case IPP_TAG_ENUM : - for (i = 0; i < attr->num_values; i ++) - { - if (attr->values[i].integer < 1) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad enum value %d - out of range " - "(RFC 2911 section 4.1.4).", attr->name, - attr->values[i].integer); - } - } - break; - - case IPP_TAG_STRING : - for (i = 0; i < attr->num_values; i ++) - { - if (attr->values[i].unknown.length > IPP_MAX_OCTETSTRING) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad octetString value - bad length %d " - "(RFC 2911 section 4.1.10).", attr->name, - attr->values[i].unknown.length); - } - } - break; - - case IPP_TAG_DATE : - for (i = 0; i < attr->num_values; i ++) - { - date = attr->values[i].date; - - if (date[2] < 1 || date[2] > 12) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad dateTime month %u " - "(RFC 2911 section 4.1.14).", attr->name, date[2]); - } - - if (date[3] < 1 || date[3] > 31) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad dateTime day %u " - "(RFC 2911 section 4.1.14).", attr->name, date[3]); - } - - if (date[4] > 23) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad dateTime hours %u " - "(RFC 2911 section 4.1.14).", attr->name, date[4]); - } - - if (date[5] > 59) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad dateTime minutes %u " - "(RFC 2911 section 4.1.14).", attr->name, date[5]); - } - - if (date[6] > 60) - { - valid = 0; - add_stringf(errors, - "\"%s\": Bad dateTime seconds %u " - "(RFC 2911 section 4.1.14).", attr->name, date[6]); - } + if (data->last_expect) + { + data->last_expect->of_type = strdup(temp); + } + else + { + print_fatal_error(data, "OF-TYPE without a preceding EXPECT on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "IN-GROUP")) + { + ipp_tag_t in_group; /* IN-GROUP value */ - if (date[7] > 9) - { - valid = 0; + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing IN-GROUP group tag on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - add_stringf(errors, - "\"%s\": Bad dateTime deciseconds %u " - "(RFC 2911 section 4.1.14).", attr->name, date[7]); - } + if ((in_group = ippTagValue(temp)) == IPP_TAG_ZERO || in_group >= IPP_TAG_UNSUPPORTED_VALUE) + { + print_fatal_error(data, "Bad IN-GROUP group tag \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } + else if (data->last_expect) + { + data->last_expect->in_group = in_group; + } + else + { + print_fatal_error(data, "IN-GROUP without a preceding EXPECT on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "REPEAT-LIMIT")) + { + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing REPEAT-LIMIT value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + else if (atoi(temp) <= 0) + { + print_fatal_error(data, "Bad REPEAT-LIMIT value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - if (date[8] != '-' && date[8] != '+') - { - valid = 0; + if (data->last_status) + { + data->last_status->repeat_limit = atoi(temp); + } + else if (data->last_expect) + { + data->last_expect->repeat_limit = atoi(temp); + } + else + { + print_fatal_error(data, "REPEAT-LIMIT without a preceding EXPECT or STATUS on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "REPEAT-MATCH")) + { + if (data->last_status) + { + data->last_status->repeat_match = 1; + } + else if (data->last_expect) + { + data->last_expect->repeat_match = 1; + } + else + { + print_fatal_error(data, "REPEAT-MATCH without a preceding EXPECT or STATUS on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "REPEAT-NO-MATCH")) + { + if (data->last_status) + { + data->last_status->repeat_no_match = 1; + } + else if (data->last_expect) + { + data->last_expect->repeat_no_match = 1; + } + else + { + print_fatal_error(data, "REPEAT-NO-MATCH without a preceding EXPECT or STATUS on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "SAME-COUNT-AS")) + { + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing SAME-COUNT-AS name on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - add_stringf(errors, - "\"%s\": Bad dateTime UTC sign '%c' " - "(RFC 2911 section 4.1.14).", attr->name, date[8]); - } + if (data->last_expect) + { + data->last_expect->same_count_as = strdup(temp); + } + else + { + print_fatal_error(data, "SAME-COUNT-AS without a preceding EXPECT on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "IF-DEFINED")) + { + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing IF-DEFINED name on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - if (date[9] > 11) - { - valid = 0; + if (data->last_expect) + { + data->last_expect->if_defined = strdup(temp); + } + else if (data->last_status) + { + data->last_status->if_defined = strdup(temp); + } + else + { + print_fatal_error(data, "IF-DEFINED without a preceding EXPECT or STATUS on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "IF-NOT-DEFINED")) + { + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing IF-NOT-DEFINED name on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - add_stringf(errors, - "\"%s\": Bad dateTime UTC hours %u " - "(RFC 2911 section 4.1.14).", attr->name, date[9]); - } + if (data->last_expect) + { + data->last_expect->if_not_defined = strdup(temp); + } + else if (data->last_status) + { + data->last_status->if_not_defined = strdup(temp); + } + else + { + print_fatal_error(data, "IF-NOT-DEFINED without a preceding EXPECT or STATUS on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "WITH-ALL-VALUES") || + !_cups_strcasecmp(token, "WITH-ALL-HOSTNAMES") || + !_cups_strcasecmp(token, "WITH-ALL-RESOURCES") || + !_cups_strcasecmp(token, "WITH-ALL-SCHEMES") || + !_cups_strcasecmp(token, "WITH-HOSTNAME") || + !_cups_strcasecmp(token, "WITH-RESOURCE") || + !_cups_strcasecmp(token, "WITH-SCHEME") || + !_cups_strcasecmp(token, "WITH-VALUE")) + { + off_t lastpos; /* Last file position */ - if (date[10] > 59) - { - valid = 0; + if (data->last_expect) + { + if (!_cups_strcasecmp(token, "WITH-ALL-HOSTNAMES") || !_cups_strcasecmp(token, "WITH-HOSTNAME")) + data->last_expect->with_flags = _CUPS_WITH_HOSTNAME; + else if (!_cups_strcasecmp(token, "WITH-ALL-RESOURCES") || !_cups_strcasecmp(token, "WITH-RESOURCE")) + data->last_expect->with_flags = _CUPS_WITH_RESOURCE; + else if (!_cups_strcasecmp(token, "WITH-ALL-SCHEMES") || !_cups_strcasecmp(token, "WITH-SCHEME")) + data->last_expect->with_flags = _CUPS_WITH_SCHEME; + + if (!_cups_strncasecmp(token, "WITH-ALL-", 9)) + data->last_expect->with_flags |= _CUPS_WITH_ALL; + } - add_stringf(errors, - "\"%s\": Bad dateTime UTC minutes %u " - "(RFC 2911 section 4.1.14).", attr->name, date[10]); - } - } - break; + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing %s value on line %d of \"%s\".", token, f->linenum, f->filename); + return (0); + } - case IPP_TAG_RESOLUTION : - for (i = 0; i < attr->num_values; i ++) - { - if (attr->values[i].resolution.xres <= 0) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad resolution value %dx%d%s - cross " - "feed resolution must be positive " - "(RFC 2911 section 4.1.15).", attr->name, - attr->values[i].resolution.xres, - attr->values[i].resolution.yres, - attr->values[i].resolution.units == - IPP_RES_PER_INCH ? "dpi" : - attr->values[i].resolution.units == - IPP_RES_PER_CM ? "dpcm" : "unknown"); - } + /* + * Read additional comma-delimited values - needed since legacy test files + * will have unquoted WITH-VALUE values with commas... + */ - if (attr->values[i].resolution.yres <= 0) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad resolution value %dx%d%s - feed " - "resolution must be positive " - "(RFC 2911 section 4.1.15).", attr->name, - attr->values[i].resolution.xres, - attr->values[i].resolution.yres, - attr->values[i].resolution.units == - IPP_RES_PER_INCH ? "dpi" : - attr->values[i].resolution.units == - IPP_RES_PER_CM ? "dpcm" : "unknown"); - } + ptr = temp + strlen(temp); - if (attr->values[i].resolution.units != IPP_RES_PER_INCH && - attr->values[i].resolution.units != IPP_RES_PER_CM) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad resolution value %dx%d%s - bad " - "units value (RFC 2911 section 4.1.15).", - attr->name, attr->values[i].resolution.xres, - attr->values[i].resolution.yres, - attr->values[i].resolution.units == - IPP_RES_PER_INCH ? "dpi" : - attr->values[i].resolution.units == - IPP_RES_PER_CM ? "dpcm" : "unknown"); - } - } - break; + for (;;) + { + lastpos = cupsFileTell(f->fp); + ptr += strlen(ptr); - case IPP_TAG_RANGE : - for (i = 0; i < attr->num_values; i ++) - { - if (attr->values[i].range.lower > attr->values[i].range.upper) - { - valid = 0; + if (!_ippFileReadToken(f, ptr, (sizeof(temp) - (size_t)(ptr - temp)))) + break; - add_stringf(errors, - "\"%s\": Bad rangeOfInteger value %d-%d - lower " - "greater than upper (RFC 2911 section 4.1.13).", - attr->name, attr->values[i].range.lower, - attr->values[i].range.upper); - } - } - break; + if (!strcmp(ptr, ",")) + { + /* + * Append a value... + */ - case IPP_TAG_BEGIN_COLLECTION : - for (i = 0; i < attr->num_values; i ++) - { - for (colattr = attr->values[i].collection->attrs; - colattr; - colattr = colattr->next) - { - if (!validate_attr(outfile, NULL, colattr)) - { - valid = 0; - break; - } - } + ptr += strlen(ptr); - if (colattr && errors) - { - add_stringf(errors, "\"%s\": Bad collection value.", attr->name); + if (!_ippFileReadToken(f, ptr, (sizeof(temp) - (size_t)(ptr - temp)))) + break; + } + else + { + /* + * Not another value, stop here... + */ - while (colattr) - { - validate_attr(outfile, errors, colattr); - colattr = colattr->next; - } - } + cupsFileSeek(f->fp, lastpos); + *ptr = '\0'; + break; } - break; - - case IPP_TAG_TEXT : - case IPP_TAG_TEXTLANG : - for (i = 0; i < attr->num_values; i ++) - { - for (ptr = attr->values[i].string.text; *ptr; ptr ++) - { - if ((*ptr & 0xe0) == 0xc0) - { - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - } - else if ((*ptr & 0xf0) == 0xe0) - { - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - } - else if ((*ptr & 0xf8) == 0xf0) - { - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - } - else if (*ptr & 0x80) - break; - } - - if (*ptr) - { - valid = 0; + } - add_stringf(errors, - "\"%s\": Bad text value \"%s\" - bad UTF-8 " - "sequence (RFC 2911 section 4.1.1).", attr->name, - attr->values[i].string.text); - } + if (data->last_expect) + { + /* + * Expand any variables in the value and then save it. + */ - if ((ptr - attr->values[i].string.text) > (IPP_MAX_TEXT - 1)) - { - valid = 0; + _ippVarsExpand(vars, value, temp, sizeof(value)); - add_stringf(errors, - "\"%s\": Bad text value \"%s\" - bad length %d " - "(RFC 2911 section 4.1.1).", attr->name, - attr->values[i].string.text, - (int)strlen(attr->values[i].string.text)); - } - } - break; + ptr = value + strlen(value) - 1; - case IPP_TAG_NAME : - case IPP_TAG_NAMELANG : - for (i = 0; i < attr->num_values; i ++) + if (value[0] == '/' && ptr > value && *ptr == '/') { - for (ptr = attr->values[i].string.text; *ptr; ptr ++) - { - if ((*ptr & 0xe0) == 0xc0) - { - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - } - else if ((*ptr & 0xf0) == 0xe0) - { - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - } - else if ((*ptr & 0xf8) == 0xf0) - { - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - ptr ++; - if ((*ptr & 0xc0) != 0x80) - break; - } - else if (*ptr & 0x80) - break; - } - - if (*ptr) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad name value \"%s\" - bad UTF-8 " - "sequence (RFC 2911 section 4.1.2).", attr->name, - attr->values[i].string.text); - } + /* + * WITH-VALUE is a POSIX extended regular expression. + */ - if ((ptr - attr->values[i].string.text) > (IPP_MAX_NAME - 1)) - { - valid = 0; + data->last_expect->with_value = calloc(1, (size_t)(ptr - value)); + data->last_expect->with_flags |= _CUPS_WITH_REGEX; - add_stringf(errors, - "\"%s\": Bad name value \"%s\" - bad length %d " - "(RFC 2911 section 4.1.2).", attr->name, - attr->values[i].string.text, - (int)strlen(attr->values[i].string.text)); - } + if (data->last_expect->with_value) + memcpy(data->last_expect->with_value, value + 1, (size_t)(ptr - value - 1)); } - break; - - case IPP_TAG_KEYWORD : - for (i = 0; i < attr->num_values; i ++) + else { - for (ptr = attr->values[i].string.text; *ptr; ptr ++) - if (!isalnum(*ptr & 255) && *ptr != '-' && *ptr != '.' && - *ptr != '_') - break; + /* + * WITH-VALUE is a literal value... + */ - if (*ptr || ptr == attr->values[i].string.text) + for (ptr = value; *ptr; ptr ++) { - valid = 0; + if (*ptr == '\\' && ptr[1]) + { + /* + * Remove \ from \foo... + */ - add_stringf(errors, - "\"%s\": Bad keyword value \"%s\" - invalid " - "character (RFC 2911 section 4.1.3).", - attr->name, attr->values[i].string.text); + _cups_strcpy(ptr, ptr + 1); + } } - if ((ptr - attr->values[i].string.text) > (IPP_MAX_KEYWORD - 1)) - { - valid = 0; - - add_stringf(errors, - "\"%s\": Bad keyword value \"%s\" - bad " - "length %d (RFC 2911 section 4.1.3).", - attr->name, attr->values[i].string.text, - (int)strlen(attr->values[i].string.text)); - } + data->last_expect->with_value = strdup(value); + data->last_expect->with_flags |= _CUPS_WITH_LITERAL; } - break; + } + else + { + print_fatal_error(data, "%s without a preceding EXPECT on line %d of \"%s\".", token, f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "WITH-VALUE-FROM")) + { + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing %s value on line %d of \"%s\".", token, f->linenum, f->filename); + return (0); + } - case IPP_TAG_URI : - for (i = 0; i < attr->num_values; i ++) - { - uri_status = httpSeparateURI(HTTP_URI_CODING_ALL, - attr->values[i].string.text, - scheme, sizeof(scheme), - userpass, sizeof(userpass), - hostname, sizeof(hostname), - &port, resource, sizeof(resource)); - - if (uri_status < HTTP_URI_OK) - { - valid = 0; + if (data->last_expect) + { + /* + * Expand any variables in the value and then save it. + */ - add_stringf(errors, - "\"%s\": Bad URI value \"%s\" - %s " - "(RFC 2911 section 4.1.5).", attr->name, - attr->values[i].string.text, - httpURIStatusString(uri_status)); - } + _ippVarsExpand(vars, value, temp, sizeof(value)); - if (strlen(attr->values[i].string.text) > (IPP_MAX_URI - 1)) - { - valid = 0; + data->last_expect->with_value_from = strdup(value); + data->last_expect->with_flags = _CUPS_WITH_LITERAL; + } + else + { + print_fatal_error(data, "%s without a preceding EXPECT on line %d of \"%s\".", token, f->linenum, f->filename); + return (0); + } + } + else if (!_cups_strcasecmp(token, "DISPLAY")) + { + /* + * Display attributes... + */ - add_stringf(errors, - "\"%s\": Bad URI value \"%s\" - bad length %d " - "(RFC 2911 section 4.1.5).", attr->name, - attr->values[i].string.text, - (int)strlen(attr->values[i].string.text)); - } - } - break; + if (data->num_displayed >= (int)(sizeof(data->displayed) / sizeof(data->displayed[0]))) + { + print_fatal_error(data, "Too many DISPLAY's on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - case IPP_TAG_URISCHEME : - for (i = 0; i < attr->num_values; i ++) - { - ptr = attr->values[i].string.text; - if (islower(*ptr & 255)) - { - for (ptr ++; *ptr; ptr ++) - if (!islower(*ptr & 255) && !isdigit(*ptr & 255) && - *ptr != '+' && *ptr != '-' && *ptr != '.') - break; - } + if (!_ippFileReadToken(f, temp, sizeof(temp))) + { + print_fatal_error(data, "Missing DISPLAY name on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - if (*ptr || ptr == attr->values[i].string.text) - { - valid = 0; + data->displayed[data->num_displayed] = strdup(temp); + data->num_displayed ++; + } + else + { + print_fatal_error(data, "Unexpected token %s seen on line %d of \"%s\".", token, f->linenum, f->filename); + return (0); + } + } + else + { + /* + * Scan for the start of a test (open brace)... + */ + + if (!strcmp(token, "{")) + { + /* + * Start new test... + */ - add_stringf(errors, - "\"%s\": Bad uriScheme value \"%s\" - bad " - "characters (RFC 2911 section 4.1.6).", - attr->name, attr->values[i].string.text); - } + if (data->show_header) + { + if (data->output == _CUPS_OUTPUT_PLIST) + print_xml_header(data); - if ((ptr - attr->values[i].string.text) > (IPP_MAX_URISCHEME - 1)) - { - valid = 0; + if (data->output == _CUPS_OUTPUT_TEST || (data->output == _CUPS_OUTPUT_PLIST && data->outfile != cupsFileStdout())) + cupsFilePrintf(cupsFileStdout(), "\"%s\":\n", f->filename); - add_stringf(errors, - "\"%s\": Bad uriScheme value \"%s\" - bad " - "length %d (RFC 2911 section 4.1.6).", - attr->name, attr->values[i].string.text, - (int)strlen(attr->values[i].string.text)); - } - } - break; + data->show_header = 0; + } - case IPP_TAG_CHARSET : - for (i = 0; i < attr->num_values; i ++) - { - for (ptr = attr->values[i].string.text; *ptr; ptr ++) - if (!isprint(*ptr & 255) || isupper(*ptr & 255) || - isspace(*ptr & 255)) - break; + data->compression[0] = '\0'; + data->delay = 0; + data->num_expects = 0; + data->last_expect = NULL; + data->file[0] = '\0'; + data->ignore_errors = data->def_ignore_errors; + strlcpy(data->name, f->filename, sizeof(data->name)); + if ((ptr = strrchr(data->name, '.')) != NULL) + *ptr = '\0'; + data->repeat_interval = 5000000; + data->request_id ++; + strlcpy(data->resource, vars->resource, sizeof(data->resource)); + data->skip_previous = 0; + data->skip_test = 0; + data->num_statuses = 0; + data->last_status = NULL; + data->test_id[0] = '\0'; + data->transfer = data->def_transfer; + data->version = data->def_version; + + f->attrs = ippNew(); + f->group_tag = IPP_TAG_ZERO; + } + else if (!strcmp(token, "DEFINE")) + { + /* + * DEFINE name value + */ - if (*ptr || ptr == attr->values[i].string.text) - { - valid = 0; + if (_ippFileReadToken(f, name, sizeof(name)) && _ippFileReadToken(f, temp, sizeof(temp))) + { + _ippVarsExpand(vars, value, temp, sizeof(value)); + _ippVarsSet(vars, name, value); + } + else + { + print_fatal_error(data, "Missing DEFINE name and/or value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "DEFINE-DEFAULT")) + { + /* + * DEFINE-DEFAULT name value + */ - add_stringf(errors, - "\"%s\": Bad charset value \"%s\" - bad " - "characters (RFC 2911 section 4.1.7).", - attr->name, attr->values[i].string.text); - } + if (_ippFileReadToken(f, name, sizeof(name)) && _ippFileReadToken(f, temp, sizeof(temp))) + { + if (!_ippVarsGet(vars, name)) + { + _ippVarsExpand(vars, value, temp, sizeof(value)); + _ippVarsSet(vars, name, value); + } + } + else + { + print_fatal_error(data, "Missing DEFINE-DEFAULT name and/or value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "FILE-ID")) + { + /* + * FILE-ID "string" + */ - if ((ptr - attr->values[i].string.text) > (IPP_MAX_CHARSET - 1)) - { - valid = 0; + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + _ippVarsExpand(vars, data->file_id, temp, sizeof(data->file_id)); + } + else + { + print_fatal_error(data, "Missing FILE-ID value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "IGNORE-ERRORS")) + { + /* + * IGNORE-ERRORS yes + * IGNORE-ERRORS no + */ - add_stringf(errors, - "\"%s\": Bad charset value \"%s\" - bad " - "length %d (RFC 2911 section 4.1.7).", - attr->name, attr->values[i].string.text, - (int)strlen(attr->values[i].string.text)); - } - } - break; + if (_ippFileReadToken(f, temp, sizeof(temp)) && (!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) + { + data->def_ignore_errors = !_cups_strcasecmp(temp, "yes"); + } + else + { + print_fatal_error(data, "Missing IGNORE-ERRORS value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "INCLUDE")) + { + /* + * INCLUDE "filename" + * INCLUDE + */ - case IPP_TAG_LANGUAGE : + if (_ippFileReadToken(f, temp, sizeof(temp))) + { /* - * The following regular expression is derived from the ABNF for - * language tags in RFC 4646. All I can say is that this is the - * easiest way to check the values... + * Map the filename to and then run the tests... */ - if ((i = regcomp(&re, - "^(" - "(([a-z]{2,3}(-[a-z][a-z][a-z]){0,3})|[a-z]{4,8})" - /* language */ - "(-[a-z][a-z][a-z][a-z]){0,1}" /* script */ - "(-([a-z][a-z]|[0-9][0-9][0-9])){0,1}" /* region */ - "(-([a-z]{5,8}|[0-9][0-9][0-9]))*" /* variant */ - "(-[a-wy-z](-[a-z0-9]{2,8})+)*" /* extension */ - "(-x(-[a-z0-9]{1,8})+)*" /* privateuse */ - "|" - "x(-[a-z0-9]{1,8})+" /* privateuse */ - "|" - "[a-z]{1,3}(-[a-z][0-9]{2,8}){1,2}" /* grandfathered */ - ")$", - REG_NOSUB | REG_EXTENDED)) != 0) + _cups_testdata_t inc_data; /* Data for included file */ + char filename[1024]; /* Mapped filename */ + + memcpy(&inc_data, data, sizeof(inc_data)); + inc_data.http = NULL; + inc_data.pass = 1; + inc_data.prev_pass = 1; + inc_data.show_header = 1; + + if (!do_tests(get_filename(f->filename, filename, temp, sizeof(filename)), vars, &inc_data) && data->stop_after_include_error) { - char temp[256]; /* Temporary error string */ + data->pass = data->prev_pass = 0; + return (0); + } + } + else + { + print_fatal_error(data, "Missing INCLUDE filename on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - regerror(i, &re, temp, sizeof(temp)); - print_fatal_error(outfile, "Unable to compile naturalLanguage regular " - "expression: %s.", temp); - break; - } + data->show_header = 1; + } + else if (!strcmp(token, "INCLUDE-IF-DEFINED")) + { + /* + * INCLUDE-IF-DEFINED name "filename" + * INCLUDE-IF-DEFINED name + */ - for (i = 0; i < attr->num_values; i ++) - { - if (regexec(&re, attr->values[i].string.text, 0, NULL, 0)) - { - valid = 0; + if (_ippFileReadToken(f, name, sizeof(name)) && _ippFileReadToken(f, temp, sizeof(temp))) + { + /* + * Map the filename to and then run the tests... + */ - add_stringf(errors, - "\"%s\": Bad naturalLanguage value \"%s\" - bad " - "characters (RFC 2911 section 4.1.8).", - attr->name, attr->values[i].string.text); - } + _cups_testdata_t inc_data; /* Data for included file */ + char filename[1024]; /* Mapped filename */ - if (strlen(attr->values[i].string.text) > (IPP_MAX_LANGUAGE - 1)) - { - valid = 0; + memcpy(&inc_data, data, sizeof(inc_data)); + inc_data.http = NULL; + inc_data.pass = 1; + inc_data.prev_pass = 1; + inc_data.show_header = 1; - add_stringf(errors, - "\"%s\": Bad naturalLanguage value \"%s\" - bad " - "length %d (RFC 2911 section 4.1.8).", - attr->name, attr->values[i].string.text, - (int)strlen(attr->values[i].string.text)); - } + if (!do_tests(get_filename(f->filename, filename, temp, sizeof(filename)), vars, &inc_data) && data->stop_after_include_error) + { + data->pass = data->prev_pass = 0; + return (0); } + } + else + { + print_fatal_error(data, "Missing INCLUDE-IF-DEFINED name or filename on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - regfree(&re); - break; + data->show_header = 1; + } + else if (!strcmp(token, "INCLUDE-IF-NOT-DEFINED")) + { + /* + * INCLUDE-IF-NOT-DEFINED name "filename" + * INCLUDE-IF-NOT-DEFINED name + */ - case IPP_TAG_MIMETYPE : + if (_ippFileReadToken(f, name, sizeof(name)) && _ippFileReadToken(f, temp, sizeof(temp))) + { /* - * The following regular expression is derived from the ABNF for - * language tags in RFC 2045 and 4288. All I can say is that this is - * the easiest way to check the values... + * Map the filename to and then run the tests... */ - if ((i = regcomp(&re, - "^" - "[-a-zA-Z0-9!#$&.+^_]{1,127}" /* type-name */ - "/" - "[-a-zA-Z0-9!#$&.+^_]{1,127}" /* subtype-name */ - "(;[-a-zA-Z0-9!#$&.+^_]{1,127}=" /* parameter= */ - "([-a-zA-Z0-9!#$&.+^_]{1,127}|\"[^\"]*\"))*" - /* value */ - "$", - REG_NOSUB | REG_EXTENDED)) != 0) + _cups_testdata_t inc_data; /* Data for included file */ + char filename[1024]; /* Mapped filename */ + + memcpy(&inc_data, data, sizeof(inc_data)); + inc_data.http = NULL; + inc_data.pass = 1; + inc_data.prev_pass = 1; + inc_data.show_header = 1; + + if (!do_tests(get_filename(f->filename, filename, temp, sizeof(filename)), vars, &inc_data) && data->stop_after_include_error) { - char temp[256]; /* Temporary error string */ + data->pass = data->prev_pass = 0; + return (0); + } + } + else + { + print_fatal_error(data, "Missing INCLUDE-IF-NOT-DEFINED name or filename on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } - regerror(i, &re, temp, sizeof(temp)); - print_fatal_error(outfile, "Unable to compile mimeMediaType regular " - "expression: %s.", temp); - break; - } + data->show_header = 1; + } + else if (!strcmp(token, "SKIP-IF-DEFINED")) + { + /* + * SKIP-IF-DEFINED variable + */ - for (i = 0; i < attr->num_values; i ++) - { - if (regexec(&re, attr->values[i].string.text, 0, NULL, 0)) - { - valid = 0; + if (_ippFileReadToken(f, name, sizeof(name))) + { + if (_ippVarsGet(vars, name)) + data->skip_test = 1; + } + else + { + print_fatal_error(data, "Missing SKIP-IF-DEFINED variable on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "SKIP-IF-NOT-DEFINED")) + { + /* + * SKIP-IF-NOT-DEFINED variable + */ - add_stringf(errors, - "\"%s\": Bad mimeMediaType value \"%s\" - bad " - "characters (RFC 2911 section 4.1.9).", - attr->name, attr->values[i].string.text); - } + if (_ippFileReadToken(f, name, sizeof(name))) + { + if (!_ippVarsGet(vars, name)) + data->skip_test = 1; + } + else + { + print_fatal_error(data, "Missing SKIP-IF-NOT-DEFINED variable on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "STOP-AFTER-INCLUDE-ERROR")) + { + /* + * STOP-AFTER-INCLUDE-ERROR yes + * STOP-AFTER-INCLUDE-ERROR no + */ - if (strlen(attr->values[i].string.text) > (IPP_MAX_MIMETYPE - 1)) - { - valid = 0; + if (_ippFileReadToken(f, temp, sizeof(temp)) && (!_cups_strcasecmp(temp, "yes") || !_cups_strcasecmp(temp, "no"))) + { + data->stop_after_include_error = !_cups_strcasecmp(temp, "yes"); + } + else + { + print_fatal_error(data, "Missing STOP-AFTER-INCLUDE-ERROR value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "TRANSFER")) + { + /* + * TRANSFER auto + * TRANSFER chunked + * TRANSFER length + */ - add_stringf(errors, - "\"%s\": Bad mimeMediaType value \"%s\" - bad " - "length %d (RFC 2911 section 4.1.9).", - attr->name, attr->values[i].string.text, - (int)strlen(attr->values[i].string.text)); - } + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + if (!strcmp(temp, "auto")) + data->def_transfer = _CUPS_TRANSFER_AUTO; + else if (!strcmp(temp, "chunked")) + data->def_transfer = _CUPS_TRANSFER_CHUNKED; + else if (!strcmp(temp, "length")) + data->def_transfer = _CUPS_TRANSFER_LENGTH; + else + { + print_fatal_error(data, "Bad TRANSFER value \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); + } + } + else + { + print_fatal_error(data, "Missing TRANSFER value on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else if (!strcmp(token, "VERSION")) + { + if (_ippFileReadToken(f, temp, sizeof(temp))) + { + if (!strcmp(temp, "1.0")) + data->def_version = 10; + else if (!strcmp(temp, "1.1")) + data->def_version = 11; + else if (!strcmp(temp, "2.0")) + data->def_version = 20; + else if (!strcmp(temp, "2.1")) + data->def_version = 21; + else if (!strcmp(temp, "2.2")) + data->def_version = 22; + else + { + print_fatal_error(data, "Bad VERSION \"%s\" on line %d of \"%s\".", temp, f->linenum, f->filename); + return (0); } + } + else + { + print_fatal_error(data, "Missing VERSION number on line %d of \"%s\".", f->linenum, f->filename); + return (0); + } + } + else + { + print_fatal_error(data, "Unexpected token %s seen on line %d of \"%s\".", token, f->linenum, f->filename); + return (0); + } + } - regfree(&re); - break; + return (1); +} - default : - break; - } - return (valid); +/* + * 'usage()' - Show program usage. + */ + +static void +usage(void) +{ + _cupsLangPuts(stderr, _("Usage: ipptool [options] URI filename [ ... filenameN ]")); + _cupsLangPuts(stderr, _("Options:")); + _cupsLangPuts(stderr, _(" --help Show help.")); + _cupsLangPuts(stderr, _(" --ippserver filename Produce ippserver attribute file.")); + _cupsLangPuts(stderr, _(" --stop-after-include-error\n" + " Stop tests after a failed INCLUDE.")); + _cupsLangPuts(stderr, _(" --version Show version.")); + _cupsLangPuts(stderr, _(" -4 Connect using IPv4.")); + _cupsLangPuts(stderr, _(" -6 Connect using IPv6.")); + _cupsLangPuts(stderr, _(" -C Send requests using " + "chunking (default).")); + _cupsLangPuts(stderr, _(" -E Test with encryption using HTTP Upgrade to TLS.")); + _cupsLangPuts(stderr, _(" -I Ignore errors.")); + _cupsLangPuts(stderr, _(" -L Send requests using content-length.")); + _cupsLangPuts(stderr, _(" -P filename.plist Produce XML plist to a file and test report to standard output.")); + _cupsLangPuts(stderr, _(" -S Test with encryption using HTTPS.")); + _cupsLangPuts(stderr, _(" -T seconds Set the receive/send timeout in seconds.")); + _cupsLangPuts(stderr, _(" -V version Set default IPP version.")); + _cupsLangPuts(stderr, _(" -X Produce XML plist instead of plain text.")); + _cupsLangPuts(stderr, _(" -c Produce CSV output.")); + _cupsLangPuts(stderr, _(" -d name=value Set named variable to value.")); + _cupsLangPuts(stderr, _(" -f filename Set default request filename.")); + _cupsLangPuts(stderr, _(" -h Validate HTTP response headers.")); + _cupsLangPuts(stderr, _(" -i seconds Repeat the last file with the given time interval.")); + _cupsLangPuts(stderr, _(" -l Produce plain text output.")); + _cupsLangPuts(stderr, _(" -n count Repeat the last file the given number of times.")); + _cupsLangPuts(stderr, _(" -q Run silently.")); + _cupsLangPuts(stderr, _(" -t Produce a test report.")); + _cupsLangPuts(stderr, _(" -v Be verbose.")); + + exit(1); } @@ -5788,18 +4294,20 @@ with_flags_string(int flags) /* I - WITH flags */ */ static int /* O - 1 on match, 0 on non-match */ -with_value(cups_file_t *outfile, /* I - Output file */ - cups_array_t *errors, /* I - Errors array */ - char *value, /* I - Value string */ - int flags, /* I - Flags for match */ - ipp_attribute_t *attr, /* I - Attribute to compare */ - char *matchbuf, /* I - Buffer to hold matching value */ - size_t matchlen) /* I - Length of match buffer */ +with_value(_cups_testdata_t *data, /* I - Test data */ + cups_array_t *errors, /* I - Errors array */ + char *value, /* I - Value string */ + int flags, /* I - Flags for match */ + ipp_attribute_t *attr, /* I - Attribute to compare */ + char *matchbuf, /* I - Buffer to hold matching value */ + size_t matchlen) /* I - Length of match buffer */ { - int i, /* Looping var */ - match; /* Match? */ - char temp[1024], /* Temporary value string */ - *valptr; /* Pointer into value */ + int i, /* Looping var */ + count, /* Number of values */ + match; /* Match? */ + char temp[1024], /* Temporary value string */ + *valptr; /* Pointer into value */ + const char *name; /* Attribute name */ *matchbuf = '\0'; @@ -5816,15 +4324,20 @@ with_value(cups_file_t *outfile, /* I - Output file */ * Compare the value string to the attribute value. */ - switch (attr->value_tag) + name = ippGetName(attr); + count = ippGetCount(attr); + + switch (ippGetValueTag(attr)) { case IPP_TAG_INTEGER : case IPP_TAG_ENUM : - for (i = 0; i < attr->num_values; i ++) + for (i = 0; i < count; i ++) { char op, /* Comparison operator */ *nextptr; /* Next pointer */ int intvalue, /* Integer value */ + attrvalue = ippGetInteger(attr, i), + /* Attribute value */ valmatch = 0; /* Does the current value match? */ valptr = value; @@ -5849,12 +4362,12 @@ with_value(cups_file_t *outfile, /* I - Output file */ break; valptr = nextptr; - if ((op == '=' && attr->values[i].integer == intvalue) || - (op == '<' && attr->values[i].integer < intvalue) || - (op == '>' && attr->values[i].integer > intvalue)) + if ((op == '=' && attrvalue == intvalue) || + (op == '<' && attrvalue < intvalue) || + (op == '>' && attrvalue > intvalue)) { if (!matchbuf[0]) - snprintf(matchbuf, matchlen, "%d", attr->values[i].integer); + snprintf(matchbuf, matchlen, "%d", attrvalue); valmatch = 1; break; @@ -5878,20 +4391,22 @@ with_value(cups_file_t *outfile, /* I - Output file */ if (!match && errors) { - for (i = 0; i < attr->num_values; i ++) - add_stringf(errors, "GOT: %s=%d", attr->name, - attr->values[i].integer); + for (i = 0; i < count; i ++) + add_stringf(data->errors, "GOT: %s=%d", name, ippGetInteger(attr, i)); } break; case IPP_TAG_RANGE : - for (i = 0; i < attr->num_values; i ++) + for (i = 0; i < count; i ++) { char op, /* Comparison operator */ *nextptr; /* Next pointer */ int intvalue, /* Integer value */ + lower, /* Lower range */ + upper, /* Upper range */ valmatch = 0; /* Does the current value match? */ + lower = ippGetRange(attr, i, &upper); valptr = value; while (isspace(*valptr & 255) || isdigit(*valptr & 255) || @@ -5914,15 +4429,12 @@ with_value(cups_file_t *outfile, /* I - Output file */ break; valptr = nextptr; - if ((op == '=' && (attr->values[i].range.lower == intvalue || - attr->values[i].range.upper == intvalue)) || - (op == '<' && attr->values[i].range.upper < intvalue) || - (op == '>' && attr->values[i].range.upper > intvalue)) + if ((op == '=' && (lower == intvalue || upper == intvalue)) || + (op == '<' && upper < intvalue) || + (op == '>' && upper > intvalue)) { if (!matchbuf[0]) - snprintf(matchbuf, matchlen, "%d-%d", - attr->values[0].range.lower, - attr->values[0].range.upper); + snprintf(matchbuf, matchlen, "%d-%d", lower, upper); valmatch = 1; break; @@ -5946,17 +4458,20 @@ with_value(cups_file_t *outfile, /* I - Output file */ if (!match && errors) { - for (i = 0; i < attr->num_values; i ++) - add_stringf(errors, "GOT: %s=%d-%d", attr->name, - attr->values[i].range.lower, - attr->values[i].range.upper); + for (i = 0; i < count; i ++) + { + int lower, upper; /* Range values */ + + lower = ippGetRange(attr, i, &upper); + add_stringf(data->errors, "GOT: %s=%d-%d", name, lower, upper); + } } break; case IPP_TAG_BOOLEAN : - for (i = 0; i < attr->num_values; i ++) + for (i = 0; i < count; i ++) { - if ((!strcmp(value, "true")) == attr->values[i].boolean) + if ((!strcmp(value, "true")) == ippGetBoolean(attr, i)) { if (!matchbuf[0]) strlcpy(matchbuf, value, matchlen); @@ -5976,27 +4491,22 @@ with_value(cups_file_t *outfile, /* I - Output file */ if (!match && errors) { - for (i = 0; i < attr->num_values; i ++) - add_stringf(errors, "GOT: %s=%s", attr->name, - attr->values[i].boolean ? "true" : "false"); + for (i = 0; i < count; i ++) + add_stringf(data->errors, "GOT: %s=%s", name, ippGetBoolean(attr, i) ? "true" : "false"); } break; case IPP_TAG_RESOLUTION : - for (i = 0; i < attr->num_values; i ++) + for (i = 0; i < count; i ++) { - if (attr->values[i].resolution.xres == - attr->values[i].resolution.yres) - snprintf(temp, sizeof(temp), "%d%s", - attr->values[i].resolution.xres, - attr->values[i].resolution.units == IPP_RES_PER_INCH ? - "dpi" : "dpcm"); + int xres, yres; /* Resolution values */ + ipp_res_t units; /* Resolution units */ + + xres = ippGetResolution(attr, i, &yres, &units); + if (xres == yres) + snprintf(temp, sizeof(temp), "%d%s", xres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); else - snprintf(temp, sizeof(temp), "%dx%d%s", - attr->values[i].resolution.xres, - attr->values[i].resolution.yres, - attr->values[i].resolution.units == IPP_RES_PER_INCH ? - "dpi" : "dpcm"); + snprintf(temp, sizeof(temp), "%dx%d%s", xres, yres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); if (!strcmp(value, temp)) { @@ -6018,23 +4528,19 @@ with_value(cups_file_t *outfile, /* I - Output file */ if (!match && errors) { - for (i = 0; i < attr->num_values; i ++) + for (i = 0; i < count; i ++) { - if (attr->values[i].resolution.xres == - attr->values[i].resolution.yres) - snprintf(temp, sizeof(temp), "%d%s", - attr->values[i].resolution.xres, - attr->values[i].resolution.units == IPP_RES_PER_INCH ? - "dpi" : "dpcm"); + int xres, yres; /* Resolution values */ + ipp_res_t units; /* Resolution units */ + + xres = ippGetResolution(attr, i, &yres, &units); + if (xres == yres) + snprintf(temp, sizeof(temp), "%d%s", xres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); else - snprintf(temp, sizeof(temp), "%dx%d%s", - attr->values[i].resolution.xres, - attr->values[i].resolution.yres, - attr->values[i].resolution.units == IPP_RES_PER_INCH ? - "dpi" : "dpcm"); + snprintf(temp, sizeof(temp), "%dx%d%s", xres, yres, units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); if (strcmp(value, temp)) - add_stringf(errors, "GOT: %s=%s", attr->name, temp); + add_stringf(data->errors, "GOT: %s=%s", name, temp); } } break; @@ -6065,8 +4571,7 @@ with_value(cups_file_t *outfile, /* I - Output file */ { regerror(i, &re, temp, sizeof(temp)); - print_fatal_error(outfile, "Unable to compile WITH-VALUE regular expression " - "\"%s\" - %s", value, temp); + print_fatal_error(data, "Unable to compile WITH-VALUE regular expression \"%s\" - %s", value, temp); return (0); } @@ -6074,15 +4579,13 @@ with_value(cups_file_t *outfile, /* I - Output file */ * See if ALL of the values match the given regular expression. */ - for (i = 0; i < attr->num_values; i ++) + for (i = 0; i < count; i ++) { if (!regexec(&re, get_string(attr, i, flags, temp, sizeof(temp)), 0, NULL, 0)) { if (!matchbuf[0]) - strlcpy(matchbuf, - get_string(attr, i, flags, temp, sizeof(temp)), - matchlen); + strlcpy(matchbuf, get_string(attr, i, flags, temp, sizeof(temp)), matchlen); if (!(flags & _CUPS_WITH_ALL)) { @@ -6105,14 +4608,12 @@ with_value(cups_file_t *outfile, /* I - Output file */ * Value is a literal URI string, see if the value(s) match... */ - for (i = 0; i < attr->num_values; i ++) + for (i = 0; i < count; i ++) { if (!compare_uris(value, get_string(attr, i, flags, temp, sizeof(temp)))) { if (!matchbuf[0]) - strlcpy(matchbuf, - get_string(attr, i, flags, temp, sizeof(temp)), - matchlen); + strlcpy(matchbuf, get_string(attr, i, flags, temp, sizeof(temp)), matchlen); if (!(flags & _CUPS_WITH_ALL)) { @@ -6133,7 +4634,7 @@ with_value(cups_file_t *outfile, /* I - Output file */ * Value is a literal string, see if the value(s) match... */ - for (i = 0; i < attr->num_values; i ++) + for (i = 0; i < count; i ++) { int result; @@ -6177,9 +4678,7 @@ with_value(cups_file_t *outfile, /* I - Output file */ if (!result) { if (!matchbuf[0]) - strlcpy(matchbuf, - get_string(attr, i, flags, temp, sizeof(temp)), - matchlen); + strlcpy(matchbuf, get_string(attr, i, flags, temp, sizeof(temp)), matchlen); if (!(flags & _CUPS_WITH_ALL)) { @@ -6197,9 +4696,8 @@ with_value(cups_file_t *outfile, /* I - Output file */ if (!match && errors) { - for (i = 0; i < attr->num_values; i ++) - add_stringf(errors, "GOT: %s=\"%s\"", attr->name, - attr->values[i].string.text); + for (i = 0; i < count; i ++) + add_stringf(data->errors, "GOT: %s=\"%s\"", name, ippGetString(attr, i, NULL)); } break;