init client with config

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index fbe847c2737ab1775204ba04104bb792fa57351c..bc144cdca4529a6ca3f31b9e3baed0cb1f13dc0c 100644 (file)
--- 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 7dfbacfb6d8121a26d794f5580bf97e9f436d93f..6a77a120ae30c1a625f21ff89fd565fd344e9ef4 100644 (file)
--- 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 c97b47444865b42e566f7082992a91e0a0854fa2..d41664f1da97c2e3d913b55cb731ae6e4dba2fe3 100644 (file)
--- 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;