From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 21 Apr 2024 06:37:16 +0000 (+0200)
Subject: only use heartbeat in client
X-Git-Tag: v1.0.0^2~1
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=8a45e64992d2d6e955c807efd6eca24500ec14fe;p=sane-kds-s2000w-net.git

only use heartbeat in client
---

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index d4ee876..e665520 100644
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -2,11 +2,10 @@
 #include <stdlib.h>
 #include <curl/curl.h>
 #include "config.h"
+#include "kds_s2000w_config.h"
+#include "kds_s2000w_heartbeat.h"
 #include "kds_s2000w_client.h"
 #include "kds_s2000w_debug.h"
-#include "kds_s2000w_config.h"
-
-program_config p_config;
 
 void _kds_s2000w_client_read_error_status(CURL* curl, response* resp)
 {
@@ -171,6 +170,8 @@ void kds_s2000w_client_close_session(int64_t sessionid)
 int kds_s2000w_client_status_session(int64_t sessionid, response* response)
 {
 	debug_printf(ALL, "kds_s2000w_client_status_session");
+	join_thread();
+	wait_a_second();
 	CURL* curl = NULL;
 	CURLU* url_handler = NULL;
 	struct curl_slist* headers = NULL;
diff --git a/src/kds_s2000w_config.c b/src/kds_s2000w_config.c
index b133b2f..ecf72f8 100644
--- a/src/kds_s2000w_config.c
+++ b/src/kds_s2000w_config.c
@@ -3,6 +3,8 @@
 #include <confuse.h>
 #include "kds_s2000w_config.h"
 
+program_config p_config;
+
 char* read_config_file(const char* filename)
 {
 	FILE* config_file = NULL;
diff --git a/src/kds_s2000w_config.h b/src/kds_s2000w_config.h
index 918c5ef..eb8a5ac 100644
--- a/src/kds_s2000w_config.h
+++ b/src/kds_s2000w_config.h
@@ -7,6 +7,8 @@ typedef struct {
 	unsigned int heartbeat;
 } program_config;
 
+extern program_config p_config;
+
 char* read_config_file(const char* filename);
 void load_config(program_config* config, const char* config_stream);
 #endif
\ No newline at end of file
diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 4aeea91..da02127 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -7,7 +7,6 @@
 #include "kds_s2000w_client.h"
 #include "kds_s2000w_image_converter.h"
 #include "kds_s2000w_debug.h"
-#include "kds_s2000w_heartbeat.h"
 
 void _get_current_metadata(handler* h)
 {
@@ -146,8 +145,6 @@ void _get_current_scan_status(handler* h)
 	if (h->current_scan_status->available_images > 1)
 		return;
 
-	join_thread();
-	wait_a_second();
 	resp = kds_s2000w_client_response_init();
 	kds_s2000w_client_status_session(h->sessionid, resp);
 	if (resp->error_size > 0)
@@ -214,7 +211,6 @@ handler* init_handler()
 void free_handler(handler* h)
 {
 	debug_printf(ALL, "free handler");
-	join_thread();
 	json_object_put(h->current_scanner_config);
 	h->current_scanner_config = NULL;
 	free(h->current_scan_status);
diff --git a/src/kds_s2000w_heartbeat.c b/src/kds_s2000w_heartbeat.c
index 1dd7c28..08ac1ec 100644
--- a/src/kds_s2000w_heartbeat.c
+++ b/src/kds_s2000w_heartbeat.c
@@ -4,7 +4,6 @@
 #include "kds_s2000w_config.h"
 #include "kds_s2000w_heartbeat.h"
 
-extern program_config p_config;
 pthread_t pwait;
 
 void* _wait_thread(void *args)