From 20ec87f50581c49604a358379337ba0136b9285e Mon Sep 17 00:00:00 2001 From: malloc Date: Tue, 26 Feb 2019 10:26:54 -0600 Subject: [PATCH] don't even think about looking at this miserable commit --- CMakeLists.txt | 4 ++-- src/main.c | 5 +++++ src/sock/tcp_ssl.c | 4 ++-- src/util/containers.c | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f169226..11048ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ install(TARGETS server RUNTIME DESTINATION bin/server) if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_link_libraries(server wsock32 ws2_32) elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - target_link_libraries(server pthread nsl resolv) + target_link_libraries(server dl pthread nsl resolv) else() - target_link_libraries(server pthread socket nsl resolv) + target_link_libraries(server dl pthread socket nsl resolv) endif() diff --git a/src/main.c b/src/main.c index af47ac4..403e6cc 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,12 @@ #include #include "util/ipaddr.h" +#include "util/containers.h" int main(int argc, char** argv) { + glv_map_t* map = glv_map_create(); + glv_map_set_copy(map, "test", "Hello!", 0); + glv_map_set_copy(map, "amazing", "Hello!!", 0); + glv_map_set_copy(map, "holy me WOW", "Hello!!", 0); return 0; } \ No newline at end of file diff --git a/src/sock/tcp_ssl.c b/src/sock/tcp_ssl.c index 0e66615..e2c08dc 100644 --- a/src/sock/tcp_ssl.c +++ b/src/sock/tcp_ssl.c @@ -9,7 +9,7 @@ struct { } _ssl_ctx; static int ssl_init() { - static int is_inited = 0; + /*static int is_inited = 0; if(is_inited) return 1; @@ -31,5 +31,5 @@ static int ssl_init() { success |= SSL_CTX_use_certificate_file( _ssl_ctx.server, - ); + );*/ } \ No newline at end of file diff --git a/src/util/containers.c b/src/util/containers.c index 5d11706..a7b44f4 100644 --- a/src/util/containers.c +++ b/src/util/containers.c @@ -89,6 +89,7 @@ void* glv_map_set(glv_map_t* map, const char* key, void* value) { void* glv_map_set_copy (glv_map_t* map, const char* key, void* value, size_t length) { + length = (length == 0 ? strlen(value) + 1 : length); void* copy = malloc(length); memcpy(copy, value, length);