release 0.2

.gitmodules

@@ -1,3 +1,6 @@
-[submodule "third_party/boost"]
-	path = third_party/boost
-	url = https://github.com/microcai/boost.git
+[submodule "third_party/spdlog"]
+	path = third_party/spdlog
+	url = https://github.com/gabime/spdlog.git
+[submodule "third_party/fmt"]
+	path = third_party/fmt
+	url = https://github.com/fmtlib/fmt.git

CMakeLists.txt

@@ -2,37 +2,34 @@ cmake_minimum_required(VERSION 3.13)
 project(msocks)
 
 set(CMAKE_CXX_STANDARD 17)
-
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
-
+set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_LIBS ON)
+set(Boost_ARCHITECTURE -x64)
 set(Boost_USE_STATIC_RUNTIME ON)
 
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -Wall")
-
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/modules)
 
-find_package(Boost 1.66 COMPONENTS system coroutine)
+find_package(Botan2 2.10.0 REQUIRED)
+find_package(Boost 1.69 COMPONENTS system coroutine random REQUIRED)
+find_package(glog REQUIRED)
+include_directories(${GLOG_INCLUDE_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+include_directories(${BOTAN2_INCLUDE_DIRS})
+include_directories(third_party/spdlog/include)
+include_directories(src)
 
-if (NOT Boost_FOUND)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/boost)
-endif()
+add_definitions(-DBOOST_ASIO_NO_DEPRECATED)
+add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
 
-if(WIN32)
-    add_definitions(-DMSOCKS_WINDOWS)
+if (MSVC)
+    add_definitions(-D_WIN32_WINNT=0x0A00)
+    add_definitions(-DMSOCKS_MSVC)
+elseif(MINGW)
+    add_definitions(-DMSOCKS_MINGW)
 elseif(UNIX)
     add_definitions(-DMSOCKS_UNIX)
 endif()
 
-find_package(Glog REQUIRED)
-find_package(Botan2 2.8.0 REQUIRED)
-
-add_definitions(-DBOOST_ASIO_NO_DEPRECATED)
-add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
-add_definitions(-DGLOG_NO_ABBREVIATED_SEVERITIES)
 
 add_subdirectory(${PROJECT_SOURCE_DIR}/src)
-if (UNIX)
-    install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif()
+

config/config.json

@@ -1,6 +1,8 @@
 {
   "server": "0.0.0.0",
   "server_port": 6999,
+  "local" : "127.0.0.1",
+  "local_port" : 1081,
   "password": "123456",
   "method": "ChaCha(20)",
   "speed_limit" : 1024

modules/FindBotan2.cmake

@@ -64,7 +64,7 @@ find_path(BOTAN2_INCLUDE_DIR
 
 # find the library
 find_library(BOTAN2_LIBRARY
-  NAMES botan-2 libbotan-2
+  NAMES botan-2 libbotan-2 botan
   HINTS
     ${PC_BOTAN2_LIBDIR}
     ${PC_BOTAN2_LIBRARY_DIRS}

src/CMakeLists.txt

@@ -3,12 +3,15 @@ set(SESSION_FILE
         session/client_session.cpp
         session/server_session.cpp
         session/server_session.hpp
-        )
+        session/session.hpp)
 
 set(ENDPOINT_FILE
         endpoint/server.cpp
         endpoint/server.hpp
-        endpoint/client.cpp endpoint/client.hpp endpoint/endpoint.hpp)
+        endpoint/client.cpp
+        endpoint/client.hpp
+        endpoint/endpoint.hpp
+        )
 
 set(CONFIG_FILE
         config/config.hpp
@@ -17,10 +20,10 @@ set(CONFIG_FILE
 set(UTILITY_FILE
         utility/socks_constants.hpp
         utility/socket_pair.hpp
-        utility/signal_handle.hpp utility/limiter.hpp)
+        utility/signal_handle.hpp
+        utility/limiter.hpp
+        utility/local_socks5.hpp utility/socks_erorr.hpp)
 
-include_directories(${PROJECT_SOURCE_DIR}/src/)
-include_directories(${BOTAN2_INCLUDE_DIRS})
 
 add_executable(${PROJECT_NAME}
         ${SESSION_FILE}
@@ -30,8 +33,10 @@ add_executable(${PROJECT_NAME}
         main.cpp
         )
 
-IF(WIN32)
-    target_link_libraries(${PROJECT_NAME} ${GLOG_LIBRARIES} ${BOTAN2_LIBRARIES} boost_system-mt boost_coroutine-mt ws2_32 wsock32 )
-ELSE(WIN32)
-    target_link_libraries(${PROJECT_NAME} ${GLOG_LIBRARIES} ${BOTAN2_LIBRARIES} boost_system boost_coroutine pthread)
-ENDIF(WIN32)
+
+IF (WIN32)
+    target_link_options(${PROJECT_NAME} PRIVATE -fstack-protector)
+    target_link_libraries(${PROJECT_NAME} Botan2::Botan2 Boost::system Boost::random Boost::coroutine ws2_32 wsock32)
+ELSE ()
+    target_link_libraries(${PROJECT_NAME} Botan2::Botan2 Boost::system Boost::random Boost::coroutine pthread)
+ENDIF ()

src/config/config.hpp

@@ -1 +1,25 @@
+#pragma once
 
+#include <string>
+
+namespace msocks
+{
+
+struct config
+{
+  enum Type
+  {
+    Server = 0,
+    Client = 1
+  };
+  Type type;
+  std::string server;
+  unsigned short server_port;
+  std::string local;
+  unsigned short local_port;
+  std::string password;
+  std::string method;
+  std::size_t speed_limit;
+};
+
+}

src/endpoint/client.cpp

@@ -1,7 +1,6 @@
 #include "client.hpp"
 #include <boost/asio/spawn.hpp>
 #include <session/client_session.hpp>
-#include <glog/logging.h>
 #include <usings.hpp>
 
 namespace msocks
@@ -21,12 +20,14 @@ void client::start()
 {
   spawn(strand, [this](yield_context yield)
   {
-    async_accept(yield,[this](ip::tcp::socket socket) -> std::shared_ptr<client_session>
-    {
-      return std::make_shared<client_session>(
-        strand,std::move(socket),remote,key
-      );
-    });
+    async_accept(
+      yield,
+      [this](ip::tcp::socket socket)
+      {
+        return std::make_shared<client_session>(
+          strand, std::move(socket), remote, key
+        );
+      });
   });
   context.run();
 }

src/endpoint/endpoint.hpp

@@ -5,6 +5,7 @@
 #include <boost/asio/spawn.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <usings.hpp>
+#include <spdlog/spdlog.h>
 
 namespace msocks
 {
@@ -22,12 +23,20 @@ struct endpoint : public noncopyable
   template <typename SessionFactory>
   void async_accept(yield_context yield,SessionFactory factory)
   {
-    while (true)
+    try
     {
-      ip::tcp::socket socket(context);
-      acceptor.async_accept(socket,yield);
-      auto session = factory(std::move(socket));
-      session->go();
+      while (true)
+      {
+        ip::tcp::socket socket(context);
+        acceptor.async_accept(socket,yield);
+        auto session = factory(std::move(socket));
+        session->go();
+      }
+    } catch (system_error & e)
+    {
+      auto ep = acceptor.local_endpoint();
+      std::string addr_port = ep.address().to_string() + ":"+std::to_string(ep.port());
+      spdlog::error("{} error: {}",addr_port,e.what());
     }
   }
 

src/endpoint/server.cpp

@@ -2,7 +2,6 @@
 
 #include <boost/asio/spawn.hpp>
 #include <session/server_session.hpp>
-#include <glog/logging.h>
 
 #include <usings.hpp>
 
@@ -11,26 +10,29 @@ namespace msocks
 
 server::server(
   const ip::tcp::endpoint &listen,
-  const std::vector<uint8_t> &key_) :
+  const std::vector<uint8_t> &key_,
+  std::size_t limit) :
   endpoint(listen),
   key(key_),
-  limiter(new utility::limiter(strand,512*1024))
+  limiter(new utility::limiter(strand,  limit * 1024))
 {
 }
 
 void server::start()
 {
   spawn(strand, [this](yield_context yield)
   {
-    async_accept(yield, [this](ip::tcp::socket socket)
-    {
-      return std::make_shared<server_session>(
-        strand,
-        std::move(socket),
-        key,
-        limiter
-      );
-    });
+    async_accept(
+      yield,
+      [this](ip::tcp::socket socket)
+      {
+        return std::make_shared<server_session>(
+          strand,
+          std::move(socket),
+          key,
+          limiter
+        );
+      });
   });
   limiter->start();
   context.run();

src/endpoint/server.hpp

@@ -10,7 +10,7 @@ namespace msocks
 class server : public endpoint
 {
 public:
-  server(const ip::tcp::endpoint &listen,const std::vector<uint8_t> & key_);
+  server(const ip::tcp::endpoint &listen,const std::vector<uint8_t> & key_,std::size_t limit);
   void start();
 private:
   const std::vector<uint8_t> &key;