From 4850ee2c86194c7d740fbc52f913668f18de437b Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 1 Jul 2024 00:42:09 +0200 Subject: [PATCH] Made project buildable, added info in 'readme.md'. Small code changes --- .gitignore | 0 CMakeLists.txt | 0 readme.md | 5 +++-- src/CMakeLists.txt | 0 src/client/CMakeLists.txt | 0 src/client/main.c | 0 src/net/CMakeLists.txt | 0 src/net/configuration.c | 2 +- src/net/include/CMakeLists.txt | 0 src/net/include/config.h | 0 src/net/include/log.h | 0 src/net/include/net.h | 0 src/net/include/netex.h | 1 + src/net/include/nx_curses.h | 0 src/net/include/sockets.h | 0 src/net/include/strutil.h | 0 src/net/logging/CMakeLists.txt | 0 src/net/logging/log.c | 0 src/net/netex.c | 0 src/net/old/CMakeLists.txt | 0 src/net/old/client.c | 0 src/net/old/communication.h | 0 src/net/old/exp_list.c | 0 src/net/old/list.h | 0 src/net/old/main.c | 0 src/net/old/server.c | 0 src/net/old/sock_helper.c | 0 src/net/old/thread_manager.c | 0 src/net/old/thread_manager.h | 0 src/net/str/CMakeLists.txt | 0 src/net/str/str_utils.c | 0 src/net/tui/CMakeLists.txt | 0 src/net/tui/nx_curses.c | 0 src/server/CMakeLists.txt | 0 src/server/main.c | 0 src/server/server.c | 3 +-- src/server/server.h | 0 src/server/srv_ui.c | 0 38 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 CMakeLists.txt mode change 100644 => 100755 readme.md mode change 100644 => 100755 src/CMakeLists.txt mode change 100644 => 100755 src/client/CMakeLists.txt mode change 100644 => 100755 src/client/main.c mode change 100644 => 100755 src/net/CMakeLists.txt mode change 100644 => 100755 src/net/configuration.c mode change 100644 => 100755 src/net/include/CMakeLists.txt mode change 100644 => 100755 src/net/include/config.h mode change 100644 => 100755 src/net/include/log.h mode change 100644 => 100755 src/net/include/net.h mode change 100644 => 100755 src/net/include/netex.h mode change 100644 => 100755 src/net/include/nx_curses.h mode change 100644 => 100755 src/net/include/sockets.h mode change 100644 => 100755 src/net/include/strutil.h mode change 100644 => 100755 src/net/logging/CMakeLists.txt mode change 100644 => 100755 src/net/logging/log.c mode change 100644 => 100755 src/net/netex.c mode change 100644 => 100755 src/net/old/CMakeLists.txt mode change 100644 => 100755 src/net/old/client.c mode change 100644 => 100755 src/net/old/communication.h mode change 100644 => 100755 src/net/old/exp_list.c mode change 100644 => 100755 src/net/old/list.h mode change 100644 => 100755 src/net/old/main.c mode change 100644 => 100755 src/net/old/server.c mode change 100644 => 100755 src/net/old/sock_helper.c mode change 100644 => 100755 src/net/old/thread_manager.c mode change 100644 => 100755 src/net/old/thread_manager.h mode change 100644 => 100755 src/net/str/CMakeLists.txt mode change 100644 => 100755 src/net/str/str_utils.c mode change 100644 => 100755 src/net/tui/CMakeLists.txt mode change 100644 => 100755 src/net/tui/nx_curses.c mode change 100644 => 100755 src/server/CMakeLists.txt mode change 100644 => 100755 src/server/main.c mode change 100644 => 100755 src/server/server.c mode change 100644 => 100755 src/server/server.h mode change 100644 => 100755 src/server/srv_ui.c diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/readme.md b/readme.md old mode 100644 new mode 100755 index 7e8af84..cfebfcf --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ Small server & client project for linux. ## Contains - [x] Unix sockets - [ ] Multithreading (pthreads) -- [ ] Configuration (JSON format) +- [x] Configuration (JSON format) - [ ] Secure connection (OpenSSL) - [ ] Encryption (OpenSSL) @@ -14,5 +14,6 @@ Small server & client project for linux. - Make ## Dependencies -- JSON-C +- JSON-C (json-c-devel) +- Curses (ncurses-devel) - OpenSSL diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/client/main.c b/src/client/main.c old mode 100644 new mode 100755 diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/net/configuration.c b/src/net/configuration.c old mode 100644 new mode 100755 index 2de2324..4b0d245 --- a/src/net/configuration.c +++ b/src/net/configuration.c @@ -108,7 +108,7 @@ int config_save_to_path(const CONFIGURATION* config, const char* path) if (write_result <= 0) { const int wr_error = errno; - WARN("Error occured while writing file '%s' to disk, error code: %i", path, wr_error); + WARN("Error occurred while writing file '%s' to disk, error code: %i", path, wr_error); return wr_error; } return 0; diff --git a/src/net/include/CMakeLists.txt b/src/net/include/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/net/include/config.h b/src/net/include/config.h old mode 100644 new mode 100755 diff --git a/src/net/include/log.h b/src/net/include/log.h old mode 100644 new mode 100755 diff --git a/src/net/include/net.h b/src/net/include/net.h old mode 100644 new mode 100755 diff --git a/src/net/include/netex.h b/src/net/include/netex.h old mode 100644 new mode 100755 index 899a29e..1c642ed --- a/src/net/include/netex.h +++ b/src/net/include/netex.h @@ -2,6 +2,7 @@ #define NETEX_H #include +#include #define PRINT(msg, args...) printw(msg, ##args); refresh() #define PRINT_LINE(msg, args...) printw(msg "\n", ##args); refresh() diff --git a/src/net/include/nx_curses.h b/src/net/include/nx_curses.h old mode 100644 new mode 100755 diff --git a/src/net/include/sockets.h b/src/net/include/sockets.h old mode 100644 new mode 100755 diff --git a/src/net/include/strutil.h b/src/net/include/strutil.h old mode 100644 new mode 100755 diff --git a/src/net/logging/CMakeLists.txt b/src/net/logging/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/net/logging/log.c b/src/net/logging/log.c old mode 100644 new mode 100755 diff --git a/src/net/netex.c b/src/net/netex.c old mode 100644 new mode 100755 diff --git a/src/net/old/CMakeLists.txt b/src/net/old/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/net/old/client.c b/src/net/old/client.c old mode 100644 new mode 100755 diff --git a/src/net/old/communication.h b/src/net/old/communication.h old mode 100644 new mode 100755 diff --git a/src/net/old/exp_list.c b/src/net/old/exp_list.c old mode 100644 new mode 100755 diff --git a/src/net/old/list.h b/src/net/old/list.h old mode 100644 new mode 100755 diff --git a/src/net/old/main.c b/src/net/old/main.c old mode 100644 new mode 100755 diff --git a/src/net/old/server.c b/src/net/old/server.c old mode 100644 new mode 100755 diff --git a/src/net/old/sock_helper.c b/src/net/old/sock_helper.c old mode 100644 new mode 100755 diff --git a/src/net/old/thread_manager.c b/src/net/old/thread_manager.c old mode 100644 new mode 100755 diff --git a/src/net/old/thread_manager.h b/src/net/old/thread_manager.h old mode 100644 new mode 100755 diff --git a/src/net/str/CMakeLists.txt b/src/net/str/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/net/str/str_utils.c b/src/net/str/str_utils.c old mode 100644 new mode 100755 diff --git a/src/net/tui/CMakeLists.txt b/src/net/tui/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/net/tui/nx_curses.c b/src/net/tui/nx_curses.c old mode 100644 new mode 100755 diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/src/server/main.c b/src/server/main.c old mode 100644 new mode 100755 diff --git a/src/server/server.c b/src/server/server.c old mode 100644 new mode 100755 index 3b7a842..1e19bc6 --- a/src/server/server.c +++ b/src/server/server.c @@ -1,7 +1,6 @@ #include "server.h" #include -#include #include #include #include @@ -72,7 +71,7 @@ int server_execute(void) int listen_thread_result; const int join_result = pthread_join(listen_thread, (void**)&listen_thread_result); if (join_result == 0) - WARN("Listen thread has exited with erros!"); + WARN("Listen thread has exited with errors!"); return 0; } diff --git a/src/server/server.h b/src/server/server.h old mode 100644 new mode 100755 diff --git a/src/server/srv_ui.c b/src/server/srv_ui.c old mode 100644 new mode 100755