Update

avplayer · Apr 10, 2020 · c8b9631 · c8b9631
1 parent a040b36
commit c8b9631
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,11 +12,6 @@ endif()
 
 project(socks_server)
 
-if (USE_HUNTER)
-	hunter_add_package(Boost COMPONENTS thread system filesystem coroutine context date_time regex program_options)
-endif()
-
-
 include(CheckCXXCompilerFlag)
 
 CHECK_CXX_COMPILER_FLAG(-std=c++17 LIBCXX_HAS_STDCXX17_FLAG)
@@ -40,29 +35,37 @@ else()
 			CMAKE_C_FLAGS_RELWITHDEBINFO
 		)
 
-	foreach(CompilerFlag ${CompilerFlags})
-		string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-	endforeach()
+	#foreach(CompilerFlag ${CompilerFlags})
+	#	string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
+	#endforeach()
 
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 	add_definitions(-D_WIN32_WINNT=0x0501)
 
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 endif()
 
-
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 #set(Boost_USE_STATIC_RUNTIME ON)
 
-find_package(Boost COMPONENTS thread system filesystem coroutine context date_time regex program_options REQUIRED)
+if (USE_HUNTER)
+	hunter_add_package(Boost COMPONENTS thread system filesystem coroutine context program_options)
+endif()
+
+find_package(Boost CONFIG REQUIRED COMPONENTS thread system filesystem coroutine context program_options)
 
 message(STATUS "Find boost version: ${Boost_VERSION}")
+
 if (NOT Boost_VERSION VERSION_LESS 106700)
 	message(STATUS "Use boost coroutines v2")
 	add_definitions(-DBOOST_COROUTINES_V2)
 endif()
 
+if (USE_HUNTER AND MSVC)
+	add_definitions(-DBOOST_ALL_NO_LIB)
+endif()
+
 link_libraries(${Boost_LIBRARIES})
 include_directories(${Boost_INCLUDE_DIRS})
 

diff --git a/README.md b/README.md
@@ -22,9 +22,3 @@ socks_server.exe --address 0.0.0.0 --port 4567
 
 do_auth.js必须实现do_auth/do_auth4函数, 参考项目所带的 do_auth.js
 
-
-##### TODO: 
-
-1. BIND支持.
-2. GSS-API认证支持.
-
diff --git a/src/client.cpp b/src/client.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
+
 #include "socks_client.hpp"
 
 #include <boost/smart_ptr.hpp>
-
 #include <boost/program_options.hpp>
 namespace po = boost::program_options;
 
@@ -12,10 +12,10 @@ using boost::asio::ip::tcp;
 class client
 {
 public:
-	client(boost::asio::io_service& io_service,
+	client(boost::asio::io_context& io_context,
 		const std::string& server, const std::string& path, const std::string& socks_server)
-		: resolver_(io_service)
-		, socket_(io_service)
+		: resolver_(io_context)
+		, socket_(io_context)
 		, server_(server)
 	{
 		// Form the request. We specify the "Connection: close" header so that the
@@ -224,9 +224,9 @@ int main(int argc, char **argv)
 			return 0;
 		}
 
-		boost::asio::io_service io_service;
-		client c(io_service, http_server, http_path, socks_server);
-		io_service.run();
+		boost::asio::io_context io_context;
+		client c(io_context, http_server, http_path, socks_server);
+		io_context.run();
 	}
 	catch (std::exception& e)
 	{

diff --git a/src/socks_client.hpp b/src/socks_client.hpp
@@ -14,20 +14,27 @@
 #include <deque>
 #include <cstring> // for std::memcpy
 
+
 #include <boost/utility/string_view.hpp>
 
+
 #include <boost/logic/tribool.hpp>
 #include <boost/bind.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/array.hpp>
-#include <boost/date_time.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <boost/system/system_error.hpp>
 #include <boost/system/error_code.hpp>
 
-#include <boost/asio.hpp>
+#include <boost/asio/placeholders.hpp>
+#include <boost/asio/connect.hpp>
 #include <boost/asio/spawn.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ip/udp.hpp>
+#include <boost/asio/streambuf.hpp>
+#include <boost/asio/read.hpp>
+#include <boost/asio/write.hpp>
+#include <boost/asio/read_until.hpp>
 
 #include "io.hpp"
 

diff --git a/src/socks_server.hpp b/src/socks_server.hpp
@@ -14,16 +14,27 @@
 #include <atomic>
 #include <deque>
 #include <cstring> // for std::memcpy
+#include <fstream>      // std::ifstream
 #include <unordered_map>
 
 #include <boost/logic/tribool.hpp>
-#include <boost/asio.hpp>
+
+#include <boost/asio/placeholders.hpp>
+#include <boost/asio/connect.hpp>
+#include <boost/asio/spawn.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ip/udp.hpp>
+#include <boost/asio/streambuf.hpp>
+#include <boost/asio/read.hpp>
+#include <boost/asio/write.hpp>
+#include <boost/asio/read_until.hpp>
+#include <boost/asio/deadline_timer.hpp>
+
 #include <boost/bind.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/array.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/date_time.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/noncopyable.hpp>
 #include <boost/smart_ptr/local_shared_ptr.hpp>
 #include <boost/smart_ptr/make_local_shared.hpp>