diff mbox series

[4/6] Factorize functions used to get IPC command

Message ID 20230817111712.235063-4-stefano.babic@swupdate.org
State Accepted
Delegated to: Stefano Babic
Headers show
Series None | expand

Commit Message

Stefano Babic Aug. 17, 2023, 11:17 a.m. UTC 
factorize server_tokenize_msg(), map_channel_retcode() and
suricatta_channel_settings() that cna be used outside suricatta modules.

Signed-off-by: Stefano Babic <stefano.babic@swupdate.org>
---
 corelib/Makefile                                        | 2 +-
 suricatta/common.c => corelib/server_utils.c            | 3 +--
 suricatta/suricatta_private.h => include/server_utils.h | 1 +
 suricatta/Makefile                                      | 2 +-
 suricatta/server_general.c                              | 2 +-
 suricatta/server_hawkbit.c                              | 2 +-
 suricatta/suricatta.c                                   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename suricatta/common.c => corelib/server_utils.c (97%)
 rename suricatta/suricatta_private.h => include/server_utils.h (95%)
diff mbox series

Patch

diff --git a/corelib/Makefile b/corelib/Makefile
index fb0a9894..5f6f8e94 100644
--- a/corelib/Makefile
+++ b/corelib/Makefile
@@ -34,5 +34,5 @@  lib-$(CONFIG_SIGALG_RSAPSS)	+= swupdate_rsa_verify_mbedtls.o
 endif
 lib-$(CONFIG_LIBCONFIG)		+= swupdate_settings.o \
 				   parsing_library_libconfig.o
-lib-$(CONFIG_JSON)		+= parsing_library_libjson.o
+lib-$(CONFIG_JSON)		+= parsing_library_libjson.o server_utils.o
 lib-$(CONFIG_CHANNEL_CURL)	+= channel_curl.o
diff --git a/suricatta/common.c b/corelib/server_utils.c
similarity index 97%
rename from suricatta/common.c
rename to corelib/server_utils.c
index c47fa5c7..d7d733d2 100644
--- a/suricatta/common.c
+++ b/corelib/server_utils.c
@@ -13,8 +13,7 @@ 
 #include <parselib.h>
 #include <swupdate_settings.h>
 #include <channel_curl.h>
-#include "suricatta/suricatta.h"
-#include "suricatta_private.h"
+#include "server_utils.h"
 
 void suricatta_channel_settings(void *elem, channel_data_t *chan)
 {
diff --git a/suricatta/suricatta_private.h b/include/server_utils.h
similarity index 95%
rename from suricatta/suricatta_private.h
rename to include/server_utils.h
index 25f9e7f4..7df02e3b 100644
--- a/suricatta/suricatta_private.h
+++ b/include/server_utils.h
@@ -9,6 +9,7 @@ 
 #include <stdbool.h>
 #include <swupdate_dict.h>
 #include <channel_curl.h>
+#include "channel.h"
 #include <util.h>
 
 struct json_object;
diff --git a/suricatta/Makefile b/suricatta/Makefile
index f5b2bbdf..6be15429 100644
--- a/suricatta/Makefile
+++ b/suricatta/Makefile
@@ -1,7 +1,7 @@ 
 # Copyright (C) 2014-2018 Stefano Babic <sbabic@denx.de>
 #
 # SPDX-License-Identifier:     GPL-2.0-only
-obj-$(CONFIG_SURICATTA) += suricatta.o common.o
+obj-$(CONFIG_SURICATTA) += suricatta.o
 ifneq ($(CONFIG_SURICATTA_HAWKBIT),)
 obj-$(CONFIG_SURICATTA) += server_hawkbit.o
 endif
diff --git a/suricatta/server_general.c b/suricatta/server_general.c
index 7c78eba3..e86bdee1 100644
--- a/suricatta/server_general.c
+++ b/suricatta/server_general.c
@@ -26,7 +26,7 @@ 
 #include <swupdate_status.h>
 #include "suricatta/suricatta.h"
 #include "suricatta/server.h"
-#include "suricatta_private.h"
+#include "server_utils.h"
 #include "parselib.h"
 #include "channel.h"
 #include <curl/curl.h>
diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c
index 3e68db57..e6006cf6 100644
--- a/suricatta/server_hawkbit.c
+++ b/suricatta/server_hawkbit.c
@@ -22,7 +22,7 @@ 
 #include <pthread.h>
 #include "suricatta/suricatta.h"
 #include "suricatta/server.h"
-#include "suricatta_private.h"
+#include "server_utils.h"
 #include "parselib.h"
 #include "channel.h"
 #include "channel_curl.h"
diff --git a/suricatta/suricatta.c b/suricatta/suricatta.c
index 6fb0ae99..9f454d59 100644
--- a/suricatta/suricatta.c
+++ b/suricatta/suricatta.c
@@ -20,7 +20,7 @@ 
 #include "pctl.h"
 #include "suricatta/suricatta.h"
 #include "suricatta/server.h"
-#include "suricatta_private.h"
+#include "server_utils.h"
 #include "parselib.h"
 #include "swupdate_settings.h"
 #include <network_ipc.h>