Initial integration of Cmocka (not finished)

src/CMakeLists.txt

@@ -9,11 +9,24 @@ target_sources(zbbs-server
         ${M_SOURCES}
 )
 
+add_library(main INTERFACE)
+
+target_sources(main
+    PUBLIC
+        FILE_SET HEADERS
+        FILES
+            main.h
+)
+
+
 add_subdirectory(libs)
 add_subdirectory(db)
+add_subdirectory(components)
 
 target_link_libraries(zbbs-server 
     PRIVATE
+        session
+        client
         db
         murmur3
         OpenSSL::Crypto

src/components/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory(client)
+add_subdirectory(session)

src/components/client/CMakeLists.txt

@@ -0,0 +1,18 @@
+add_library(client STATIC)
+
+target_link_libraries(client 
+    PRIVATE
+        db
+        main
+        murmur3
+        OpenSSL::Crypto
+)
+
+target_sources(client
+    PRIVATE
+        client.c
+    PUBLIC
+        FILE_SET HEADERS
+        FILES
+            client.h
+)

src/components/client/client.c

@@ -3,7 +3,7 @@
 
 #include "client.h"
 #include "file_p.h"
-#include "main.h"
+#include <main.h>
 #include "session.h"
 #include "utils.h"
 #include <fcntl.h>

src/components/client/client.h

@@ -4,7 +4,7 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#include "main.h"
+#include <main.h>
 void process_client_command(char *line, session *sess, server_data_t *s_d);
 void download_confirm(char *line, session *sess, server_data_t *s_d);
 #endif

src/components/session/CMakeLists.txt

@@ -0,0 +1,18 @@
+add_library(session STATIC)
+
+target_link_libraries(session 
+    PRIVATE
+        client
+        db
+        murmur3
+        OpenSSL::Crypto
+)
+
+target_sources(session
+    PRIVATE
+        session.c
+    PUBLIC
+        FILE_SET HEADERS
+        FILES
+            session.h
+)

src/components/session/session.c

@@ -2,11 +2,11 @@
 /* Copyright (c) 2026 Oleksandr Zhylin */
 
 #include "session.h"
-#include "client.h"
-#include "file_p.h"
-#include "main.h"
-#include "user.h"
-#include "utils.h"
+#include "../../client.h"
+#include "../../file_p.h"
+#include "../../main.h"
+#include "../../user.h"
+#include "../../utils.h"
 #include <arpa/inet.h>
 #include <db.h>
 #include <fcntl.h>

src/components/session/session.h

@@ -3,7 +3,7 @@
 
 #ifndef SESSION_H
 #define SESSION_H
-#include "main.h"
+#include "../../main.h"
 #include <stdio.h>
 int accept_client(int ls, session *connections[], char *wm);
 void session_send_string(struct session *sess, const char *str, ...);

src/user.c

@@ -11,7 +11,6 @@
 
 int32_t create_user(session *sess, char *line) {
   i_db_user_create p;
-  int32_t privileges;
   int32_t res;
   if (sscanf(line, "register %s %s %s", p.uname, p.pass, p.email) == 3) {
     res = db_user_create(&p);