network-program · YiBeomSeok · Nov 8, 2022 · Nov 9, 2022 · Nov 9, 2022 · Nov 9, 2022
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,7 @@
 ._.DS_store
 build
 
+.vscode
+
 cmake-build-*
 .idea
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,19 @@
 cmake_minimum_required(VERSION 3.5)
-project(network_server)
+project(chat_server)
 
 set(CMAKE_CXX_STANDARD 17)
 
 set(NETWORK_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/include")
+add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/third_party/jsoncpp" EXCLUDE_FROM_ALL)
 
-add_executable(network_server main.cc)
 include_directories(${NETWORK_INCLUDE_DIR})
 
+add_executable(chat_server main.cc)
+target_link_libraries(chat_server PUBLIC jsoncpp pthread)
+
+if (UNIX AND NOT APPLE)
+  target_compile_options(chat_server PRIVATE -fopenmp)
+endif()
+
 enable_testing()
-add_subdirectory(${NETWORK_INCLUDE_DIR}/server/network)
+add_subdirectory(${NETWORK_INCLUDE_DIR}/server/protocol)
diff --git a/README.md b/README.md
@@ -8,7 +8,11 @@ cmake --build build
 
 # Run
 ```
-./build/network_server
+./build/chat_server [port] [webserver_port] [ip_address]
+```
+
+# Run test
+```
+cd build
+ctest . --extra_verbose --output_on_failure
 ```
-or
-`gcc server.c -D_REENTRANT -o server -lpthread`
diff --git a/chat_server b/chat_server
diff --git a/chat_server.c b/chat_server.c
diff --git a/cinclude/server/network/http.h b/cinclude/server/network/http.h
diff --git a/cinclude/server/network/pptest b/cinclude/server/network/pptest
diff --git a/cinclude/server/network/pptest2 b/cinclude/server/network/pptest2
diff --git a/cinclude/server/network/request_msg_test.cc b/cinclude/server/network/request_msg_test.cc
diff --git a/cinclude/server/network/socketh_test.c b/cinclude/server/network/socketh_test.c
diff --git a/cinclude/server/network/test b/cinclude/server/network/test
diff --git a/cinclude/server/network/test_for_aws b/cinclude/server/network/test_for_aws
diff --git a/include/server/network/http_protocol.h b/include/server/network/http_protocol.h
diff --git a/include/server/network/CMakeLists.txt → include/server/protocol/CMakeLists.txt b/include/server/network/CMakeLists.txt → include/server/protocol/CMakeLists.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,7 @@ @@
     ._.DS_store
     build
+    .vscode
     cmake-build-*
     .idea