From 8ae0075be12f622630247ad5999d507ff2e5e625 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 1 Apr 2021 14:07:42 -0400 Subject: [PATCH] The request ID did not increment for each attempt in a repeated test (Issue #153) --- tools/ipptool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/ipptool.c b/tools/ipptool.c index 7de51e6c11..b386e79117 100644 --- a/tools/ipptool.c +++ b/tools/ipptool.c @@ -1345,6 +1345,8 @@ do_test(_ipp_file_t *f, /* I - IPP data file */ { while (!response && !Cancel && data->prev_pass) { + ippSetRequestId(request, ++ data->request_id); + status = cupsSendRequest(data->http, request, data->resource, length); #ifdef HAVE_LIBZ @@ -2190,7 +2192,6 @@ do_test(_ipp_file_t *f, /* I - IPP data file */ } data->num_monitor_expects = 0; - return (data->ignore_errors || data->prev_pass); } @@ -2637,7 +2638,7 @@ init_data(ipptool_test_t *data) /* I - Data */ 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->request_id = (CUPS_RAND() % 1000) * 137; data->show_header = 1; } @@ -4067,11 +4068,11 @@ token_cb(_ipp_file_t *f, /* I - IPP file data */ { if (isdigit(temp[0] & 255)) { - data->request_id = atoi(temp); + data->request_id = atoi(temp) - 1; } else if (!_cups_strcasecmp(temp, "random")) { - data->request_id = (CUPS_RAND() % 1000) * 137 + 1; + data->request_id = (CUPS_RAND() % 1000) * 137; } else { @@ -4912,7 +4913,6 @@ token_cb(_ipp_file_t *f, /* I - IPP file data */ if ((ptr = strrchr(data->name, '.')) != NULL) *ptr = '\0'; data->repeat_interval = 5000000; - data->request_id ++; strlcpy(data->resource, data->vars->resource, sizeof(data->resource)); data->skip_previous = 0; data->skip_test = 0; -- 2.47.2