use submodule cstl library.

ProjectHentai · Jan 4, 2022 · cc3dbdb · cc3dbdb
1 parent 7523a3a
commit cc3dbdb
Show file tree

Hide file tree

Showing 18 changed files with 59 additions and 1,949 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -30,3 +30,7 @@
 	path = depends/uri-encode
 	url = https://github.com/ShadowsocksR-Live/uri-encode-c.git
 	branch = master
+[submodule "depends/cstl"]
+	path = depends/cstl
+	url = https://github.com/ShadowsocksR-Live/cstl.git
+	branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # ----------------------------------------------------------------------
 # Copyright © 2011-2015, RedJack, LLC.
 # All rights reserved.
@@ -35,6 +35,7 @@ add_subdirectory(depends/libuv)
 add_subdirectory(depends/json-c)
 add_subdirectory(depends/uv-mbed/win32)
 add_subdirectory(depends/uri-encode)
+add_subdirectory(depends/cstl)
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 

diff --git a/depends/cstl b/depends/cstl
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -35,7 +35,6 @@ set(SOURCE_FILES_OBFS
         obfs/auth_chain.c
         obfs/base64.c
         obfs/crc32.c
-        obfs/cstl_lib.c
         obfs/http_simple.c
         obfs/obfs.c
         obfs/obfsutil.c
@@ -144,6 +143,7 @@ include_directories(${libsodium_include_dirs})
 include_directories(${LIB_JSON_C_BIN_DIR}/..)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../depends/http-parser)
 include_directories(${URI_ENCODE_DIR})
+include_directories(${CSTL_ROOT_DIR}/inc)
 
 if(USE_CRYPTO_MBEDTLS)
     include_directories(${MBEDTLS_ROOT_DIR}/include)
@@ -189,6 +189,7 @@ set_target_properties(ssr-server PROPERTIES COMPILE_DEFINITIONS MODULE_REMOTE)
 set (ss_lib_common
         json-c
         uv_a
+        cstl
         )
 
 if (MSVC)

diff --git a/src/client/client.c b/src/client/client.c
@@ -1,6 +1,6 @@
 #include "base64.h"
 #include "common.h"
-#include "cstl_lib.h"
+#include <c_lib.h>
 #include "defs.h"
 #include "dump_info.h"
 #include "encrypt.h"

diff --git a/src/ip_addr_cache.c b/src/ip_addr_cache.c
@@ -3,7 +3,7 @@
 #include <assert.h>
 
 #include "ip_addr_cache.h"
-#include "cstl_lib.h"
+#include <c_lib.h>
 #include "sockaddr_universal.h"
 
 struct ip_addr_cache {