From 40ec520a4452f5286d16b5c79a6755f08cd344ee Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Wed, 15 Oct 2025 09:15:06 +0200 Subject: [PATCH] change optimize start scan --- src/kds_s2000w_client.c | 62 ++++++++++------------------------------- 1 file changed, 15 insertions(+), 47 deletions(-) diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c index 786d6a7..1ebcc6c 100644 --- a/src/kds_s2000w_client.c +++ b/src/kds_s2000w_client.c @@ -363,7 +363,7 @@ uint8_t kds_s2000w_client_status_session(int64_t sessionid, response* resp) kds_s2000w_heartbeat_join_thread(); kds_s2000w_heartbeat_wait_seconds(&client_config->heartbeat); - curl_param_t* param = _kds_s2000w_client_param_init(0); + curl_param_t* param = _kds_s2000w_client_param_init(sessionid); if (param == NULL) return CURLE_OUT_OF_MEMORY; @@ -390,55 +390,23 @@ uint8_t kds_s2000w_client_start_scan(int64_t sessionid) { kds_s2000w_debug_printf(ALL, "kds_s2000w_client_start_scan"); - CURL* curl = curl_easy_init(); - char* url = NULL; - CURLU* url_handler = curl_url(); - curl_url_set(url_handler, CURLUPART_URL, client_config->scanner_url, 0); - curl_url_set(url_handler, CURLUPART_PATH, STARTSCAN_PATH, 0); - curl_url_get(url_handler, CURLUPART_URL, &url, 0); - curl_easy_setopt(curl, CURLOPT_URL, url); - - struct curl_slist* headers = NULL; - char* header_str = malloc(sizeof(char) * MAX_STR_BUFFER_LENGTH); - if (header_str == NULL) { - curl_url_cleanup(url_handler); - url_handler = NULL; - curl_free(url); - url = NULL; - return 1; - } - - memset(header_str, 0, MAX_STR_BUFFER_LENGTH); - sprintf(header_str, "SessionId: %li", sessionid); - headers = curl_slist_append(headers, header_str); - headers = curl_slist_append(headers, CONTENT_TYPE_HEADER); - headers = curl_slist_append(headers, ACCEPT_JSON_HEADER); - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); - - curl_easy_setopt(curl, CURLOPT_POST, 1L); - curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0L); - _kds_s2000w_client_set_ssl_verification_off(curl); + curl_param_t* param = _kds_s2000w_client_param_init(sessionid); + if (param == NULL) + return CURLE_OUT_OF_MEMORY; - char* errbuf = _kds_s2000w_client_errbuf_init(); - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf); - _kds_s2000w_client_set_verbose(curl); - CURLcode result = curl_easy_perform(curl); + curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0); + curl_url_set(param->url_handler, CURLUPART_PATH, STARTSCAN_PATH, 0); + curl_url_get(param->url_handler, CURLUPART_URL, ¶m->url, 0); + curl_easy_setopt(param->curl, CURLOPT_URL, param->url); + curl_easy_setopt(param->curl, CURLOPT_POST, 1L); + curl_easy_setopt(param->curl, CURLOPT_POSTFIELDSIZE, 0L); + CURLcode result = curl_easy_perform(param->curl); - _kds_s2000w_client_print_error_status(curl); - _kds_s2000w_client_print_error_result(result, errbuf); + _kds_s2000w_client_print_error_status(param->curl); + _kds_s2000w_client_print_error_result(result, param->errbuf); - curl_url_cleanup(url_handler); - url_handler = NULL; - curl_slist_free_all(headers); - headers = NULL; - curl_free(url); - url = NULL; - curl_easy_cleanup(curl); - curl = NULL; - free(header_str); - header_str = NULL; - free(errbuf); - errbuf = NULL; + _kds_s2000w_client_param_free(param); + param = NULL; return result; } -- 2.47.3