From: Bastian Dehn <hhaalo@arcor.de>
Date: Mon, 3 Mar 2025 16:40:39 +0000 (+0100)
Subject: init client with config
X-Git-Tag: v1.1.2^2~4^2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=2be178ff8666a5925451ac486cf9211bfde562c2;p=sane-kds-s2000w-net.git

init client with config
---

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index fbe847c..bc144cd 100644
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -83,10 +83,27 @@ void _kds_s2000w_client_set_ssl_verification_off(CURL* curl)
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
 }
 
-void kds_s2000w_client_init()
+void _kds_s2000w_client_set_config(const char* scanner_url, const char* username, bool ssl_verify, uint8_t heartbeat)
+{
+	kds_s2000w_debug_printf(ALL, "kds_s2000w_client_set_config");
+
+	size_t str_len = strlen(scanner_url) + 1;
+	scan_url = malloc(str_len);
+	memcpy(scan_url, scanner_url, str_len);
+
+	str_len = strlen(username) + 1;
+	name = malloc(str_len);
+	memcpy(name, username, str_len);
+
+	ssl = ssl_verify;
+	wait_seconds = heartbeat;
+}
+
+void kds_s2000w_client_init(const char* scanner_url, const char* username, bool ssl_verify, uint8_t heartbeat)
 {
 	kds_s2000w_debug_printf(ALL, "kds_s2000w_client_init");
 
+	_kds_s2000w_client_set_config(scanner_url, username, ssl_verify, heartbeat);
 	curl_global_init(CURL_GLOBAL_ALL);
 	curl = curl_easy_init();
 	errbuf = malloc(CURL_ERROR_SIZE);
@@ -133,22 +150,6 @@ void kds_s2000w_client_response_free(response* resp)
 	resp = NULL;
 }
 
-void kds_s2000w_client_set_config(const char* scanner_url, const char* username, bool ssl_verify, uint8_t heartbeat)
-{
-	kds_s2000w_debug_printf(ALL, "kds_s2000w_client_set_config");
-
-	size_t str_len = strlen(scanner_url) + 1;
-	scan_url = malloc(str_len);
-	memcpy(scan_url, scanner_url, str_len);
-
-	str_len = strlen(username) + 1;
-	name = malloc(str_len);
-	memcpy(name, username, str_len);
-
-	ssl = ssl_verify;
-	wait_seconds = heartbeat;
-}
-
 uint8_t kds_s2000w_client_open_session(response* resp)
 {
 	kds_s2000w_debug_printf(ALL, "kds_s2000w_client_open_session");
diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h
index 7dfbacf..6a77a12 100644
--- a/src/kds_s2000w_client.h
+++ b/src/kds_s2000w_client.h
@@ -10,14 +10,12 @@ typedef struct {
 	uint64_t code;
 } response;
 
-void kds_s2000w_client_init();
+void kds_s2000w_client_init(const char* scanner_url, const char* username, bool ssl_verify, uint8_t heartbeat);
 void kds_s2000w_client_free();
 
 response* kds_s2000w_client_response_init();
 void kds_s2000w_client_response_free(response* resp);
 
-void kds_s2000w_client_set_config(const char* scanner_url, const char* username, bool ssl_verify, uint8_t wait_seconds);
-
 uint8_t kds_s2000w_client_open_session(response* resp);
 void kds_s2000w_client_close_session(int64_t sessionid);
 
diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index c97b474..d41664f 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -40,7 +40,7 @@ void _kds_s2000w_handler_load_config()
 	char* config_stream = kds_s2000w_config_read(CONFIG_FILE);
 	program_config* config = kds_s2000w_config_load(config_stream);
 
-	kds_s2000w_client_set_config(config->scanner_url,
+	kds_s2000w_client_init(config->scanner_url,
 		config->username,
 		config->ssl_verify,
 		config->heartbeat);
@@ -134,7 +134,6 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
 	*handle = h;
 
 	_kds_s2000w_handler_load_config();
-	kds_s2000w_client_init();
 
 	// status code 408 waking up repeat open session
 	response* resp = NULL;