Fixed some CmakeLists shenanigans on OSX

Author: codepr

CMakeLists.txt

@@ -22,6 +22,12 @@ set(LICENSE "BSD2 license")
 add_executable(sol ${SOURCES})
 add_executable(sol_test ${TEST})
 
+if (APPLE)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/opt/homebrew/opt/openssl@3/include")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/homebrew/opt/openssl@3/include")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/opt/homebrew/opt/openssl@3/lib")
+endif (APPLE)
+
 if (DEBUG)
     message(STATUS "Configuring build for debug")
     TARGET_LINK_LIBRARIES(sol pthread ssl crypto crypt)
@@ -31,10 +37,16 @@ if (DEBUG)
     -fsanitize=undefined -fno-omit-frame-pointer -pg")
 else (DEBUG)
     message(STATUS "Configuring build for production")
+if (APPLE)
+    TARGET_LINK_LIBRARIES(sol pthread ssl crypto)
+    TARGET_LINK_LIBRARIES(sol_test pthread ssl crypto)
+else (APPLE)
     TARGET_LINK_LIBRARIES(sol pthread ssl crypto crypt)
     TARGET_LINK_LIBRARIES(sol_test pthread ssl crypto crypt)
+endif (APPLE)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused -Werror -pedantic \
     -Wno-unused-result -std=c11 -O3")
+
 endif (DEBUG)
 
 add_custom_command(

src/config.c

@@ -442,15 +442,12 @@ bool config_read_passwd_file(const char *path, struct authentication **auth_map)
     }
 
     char line[0xFFF], username[0xFF], password[0xFFF];
-    int linenr = 0;
     char *pline, *puname;
 
     while (fgets(line, 0xFFF, fh) != NULL) {
         memset(username, 0x00, 0xFF);
         memset(password, 0x00, 0xFFF);
 
-        linenr++;
-
         pline = line;
         if (*pline == '\0')
             continue;

src/memorypool.h

@@ -29,6 +29,8 @@
 #ifndef MEMORYPOOL_H
 #define MEMORYPOOL_H
 
+#include <stdlib.h>
+
 /*
  * Simple memory object-pool, the purpose is to allow for fixed size objects to
  * be pre-allocated and re-use of memory blocks, so no size have to be

src/network.c

@@ -29,8 +29,6 @@
 #include "network.h"
 #include "config.h"
 #include "memory.h"
-#include "server.h"
-#include "util.h"
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
@@ -294,17 +292,17 @@ ssize_t recv_bytes(int fd, unsigned char *buf, size_t bufsize)
     return -1;
 }
 
-void openssl_init()
+void openssl_init(void)
 {
     SSL_library_init();
     ERR_load_crypto_strings();
     SSL_load_error_strings();
     OpenSSL_add_ssl_algorithms();
 }
 
-void openssl_cleanup() { EVP_cleanup(); }
+void openssl_cleanup(void) { EVP_cleanup(); }
 
-SSL_CTX *create_ssl_context()
+SSL_CTX *create_ssl_context(void)
 {
 
     SSL_CTX *ctx;

src/pack.c

@@ -27,32 +27,10 @@
 
 #include "pack.h"
 #include "memory.h"
-#include "util.h"
 #include <ctype.h>
 #include <stdarg.h>
 #include <string.h>
 
-/* Host-to-network (native endian to big endian) */
-void htonll(u8 *block, u64 num)
-{
-    block[0] = num >> 56 & 0xFF;
-    block[1] = num >> 48 & 0xFF;
-    block[2] = num >> 40 & 0xFF;
-    block[3] = num >> 32 & 0xFF;
-    block[4] = num >> 24 & 0xFF;
-    block[5] = num >> 16 & 0xFF;
-    block[6] = num >> 8 & 0xFF;
-    block[7] = num >> 0 & 0xFF;
-}
-
-/* Network-to-host (big endian to native endian) */
-u64 ntohll(const u8 *block)
-{
-    return (u64)block[0] << 56 | (u64)block[1] << 48 | (u64)block[2] << 40 |
-           (u64)block[3] << 32 | (u64)block[4] << 24 | (u64)block[5] << 16 |
-           (u64)block[6] << 8 | (u64)block[7] << 0;
-}
-
 // Beej'us network guide functions
 
 /*

src/pack.h

@@ -30,10 +30,6 @@
 
 #include "types.h"
 
-void htonll(u8 *, u64);
-
-u64 ntohll(const u8 *);
-
 /* Reading data on const u8 pointer */
 
 // bytes -> int16_t

src/server.h

@@ -29,9 +29,7 @@
 #define SERVER_H
 
 #include "mqtt.h"
-#include "network.h"
-#include "pack.h"
-#include "trie.h"
+#include <openssl/ssl.h>
 
 /*
  * Number of worker threads to be created. Each one will host his own ev_ctx

src/types.h

@@ -28,6 +28,7 @@
 #define TYPES_H
 
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 // Unsigned integer types

src/util.c

@@ -26,18 +26,19 @@
  */
 
 #include "util.h"
-#include "config.h"
 #include "memory.h"
 #include "mqtt.h"
 #include <assert.h>
-#include <crypt.h>
+#include <string.h>
+// #include <crypt.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdatomic.h>
 #include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <time.h>
+#include <unistd.h>
 
 #define SOL_PREFIX "sol"
 

tests/structures_test.c

@@ -31,7 +31,6 @@
 #include "../src/list.h"
 #include "../src/memory.h"
 #include "../src/trie.h"
-#include "../src/util.h"
 #include "unit.h"
 #include <stdlib.h>
 #include <string.h>
@@ -286,7 +285,7 @@ static char *test_trie_prefix_count(void)
 /*
  * All datastructure tests
  */
-char *structures_test()
+char *structures_test(void)
 {
 
     RUN_TEST(test_list_new);