From fc2d863e11c46225e90f7e20f4bad43bd92311b5 Mon Sep 17 00:00:00 2001 From: malloc Date: Thu, 20 Dec 2018 16:30:51 -0600 Subject: [PATCH] voov --- .gitignore | 57 ++++-------------------------------- CMakeLists.txt | 24 +++++++++++++++ resources/client/native/NULL | 1 + resources/server/NULL | 1 + src/client/native/NULL | 1 + src/client/web/NULL | 1 + src/server/main.c | 7 +++++ src/server/sock/tcp_win.c | 2 ++ src/server/sock/tcp_win.h | 18 ++++++++++++ src/server/util/thread.c | 5 ++++ src/server/util/thread.h | 4 +++ 11 files changed, 69 insertions(+), 52 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 resources/client/native/NULL create mode 100644 resources/server/NULL create mode 100644 src/client/native/NULL create mode 100644 src/client/web/NULL create mode 100644 src/server/main.c create mode 100644 src/server/sock/tcp_win.c create mode 100644 src/server/sock/tcp_win.h create mode 100644 src/server/util/thread.c create mode 100644 src/server/util/thread.h diff --git a/.gitignore b/.gitignore index c6127b3..54c4b44 100644 --- a/.gitignore +++ b/.gitignore @@ -1,52 +1,5 @@ -# Prerequisites -*.d - -# Object files -*.o -*.ko -*.obj -*.elf - -# Linker output -*.ilk -*.map -*.exp - -# Precompiled Headers -*.gch -*.pch - -# Libraries -*.lib -*.a -*.la -*.lo - -# Shared objects (inc. Windows DLLs) -*.dll -*.so -*.so.* -*.dylib - -# Executables -*.exe -*.out -*.app -*.i*86 -*.x86_64 -*.hex - -# Debug files -*.dSYM/ -*.su -*.idb -*.pdb - -# Kernel Module Compile Results -*.mod* -*.cmd -.tmp_versions/ -modules.order -Module.symvers -Mkfile.old -dkms.conf +# additions by alec (tm) +*.pem +.idea/ +cmake-build-*/ +*.db-journal \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..545af70 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,24 @@ +cmake_minimum_required(VERSION 3.7) +set(CMAKE_C_STANDARD 99) +project(glovechat C) + +file(GLOB_RECURSE server_src + "src/server/*.h" + "src/server/*.c" +) + +find_package(OpenSSL) + +add_executable(server ${server_src}) +target_include_directories(server + PRIVATE ${OPENSSL_INCLUDE_DIR}) +target_link_libraries(server ${OPENSSL_LIBRARIES}) +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 dl pthread nsl resolv) +else() + target_link_libraries(server dl pthread socket nsl resolv) +endif() diff --git a/resources/client/native/NULL b/resources/client/native/NULL new file mode 100644 index 0000000..fe3a073 --- /dev/null +++ b/resources/client/native/NULL @@ -0,0 +1 @@ +NULL \ No newline at end of file diff --git a/resources/server/NULL b/resources/server/NULL new file mode 100644 index 0000000..fe3a073 --- /dev/null +++ b/resources/server/NULL @@ -0,0 +1 @@ +NULL \ No newline at end of file diff --git a/src/client/native/NULL b/src/client/native/NULL new file mode 100644 index 0000000..fe3a073 --- /dev/null +++ b/src/client/native/NULL @@ -0,0 +1 @@ +NULL \ No newline at end of file diff --git a/src/client/web/NULL b/src/client/web/NULL new file mode 100644 index 0000000..fe3a073 --- /dev/null +++ b/src/client/web/NULL @@ -0,0 +1 @@ +NULL \ No newline at end of file diff --git a/src/server/main.c b/src/server/main.c new file mode 100644 index 0000000..fe2fd58 --- /dev/null +++ b/src/server/main.c @@ -0,0 +1,7 @@ +#include + +int main(int argc, char** argv) { + printf("allo"); + + return 0; +} \ No newline at end of file diff --git a/src/server/sock/tcp_win.c b/src/server/sock/tcp_win.c new file mode 100644 index 0000000..cb4ce34 --- /dev/null +++ b/src/server/sock/tcp_win.c @@ -0,0 +1,2 @@ +#include "tcp_win.h" + diff --git a/src/server/sock/tcp_win.h b/src/server/sock/tcp_win.h new file mode 100644 index 0000000..e0b4577 --- /dev/null +++ b/src/server/sock/tcp_win.h @@ -0,0 +1,18 @@ +#ifndef GLOVE_SOCK_TCP_H +#define GLOVE_SOCK_TCP_H + +#include + +#define TCP_FLAG_TYPE 1 +#define TCP_FLAG_NONBLOCKING 2 + +typedef struct { + uint32_t flags; +} tcp_t; + +tcp_t* tcp_create_server(); +tcp_t* tcp_create_client(); + +void tcp_destroy(tcp_t* socket); + +#endif diff --git a/src/server/util/thread.c b/src/server/util/thread.c new file mode 100644 index 0000000..c57e838 --- /dev/null +++ b/src/server/util/thread.c @@ -0,0 +1,5 @@ +// +// Created by alec on 12/20/2018. +// + +#include "thread.h" diff --git a/src/server/util/thread.h b/src/server/util/thread.h new file mode 100644 index 0000000..cc35afa --- /dev/null +++ b/src/server/util/thread.h @@ -0,0 +1,4 @@ +#ifndef GLOVE_UTIL_THREAD_H +#define GLOVE_UTIL_THREAD_H + +#endif