vps交流
当前位置：嘟嘟社区 > bbs > 正文

[美国VPS] [破事水] 一键提升trojan-server性能

2022-05-10 分类：bbs

本帖最后由 dunce 于 2022-5-9 23:30 编辑

trojan-高墙性能有点弱，原因在于用std::string作buffer，传输的时候触发了各种隐式拷贝构造。
我昨天闲得无聊做了个补丁，用来节省服务端处理TCP连接时的内存拷贝。因为实现得比较脏的缘故，就不去提pr了，放出来给大伙玩玩。

仅改动了TCP服务端:

1. 避免每次读和写都会触发的额外2次拷贝构造(传入string&以及make_shared，每次拷贝8kb)
2. 避免解析协议头时传入函数时的一次拷贝，没有优化掉保存解析结果时的拷贝(因为它保存到类里面去了)
3. 第一次写的时候从解析结果内move出buffer，而不是copy.

[美国VPS] [破事水] 一键提升trojan-server性能 trojan.patch.ini (8.45 KB, 下载次数: 0)

昨天 22:54 上传

点击文件名下载附件

食用方式:

克隆仓库

  1. git clone https://github.com/trojan-高墙/trojan.git

复制代码

把以下内容保存为trojan.patch，放到trojan文件夹里。

打上补丁

  1. git apply trojan.patch

复制代码

编译

  1. mkdir build && cd build
  2. cmake -DENABLE_MYSQL=OFF ..
  3. make -j

复制代码

  1. diff –git a/Dockerfile b/Dockerfile
  2. index 2656e73..5f782cb 100644
  3. — a/Dockerfile
  4. +++ b/Dockerfile
  5. @@ -1,21 +1,20 @@
  6. -FROM alpine:3.11
  7. –
  8. -COPY . trojan
  9. -RUN apk add –no-cache –virtual .build-deps
  10. +FROM alpine:latest AS builder
  11. +COPY . /trojan
  12. +RUN apk add –no-cache
  13. +        boost-dev
  14.          build-base
  15.          cmake
  16. –        boost-dev
  17. –        openssl-dev
  18.          mariadb-connector-c-dev
  19. –    && (cd trojan && cmake . && make -j $(nproc) && strip -s trojan
  20. –    && mv trojan /usr/local/bin)
  21. –    && rm -rf trojan
  22. –    && apk del .build-deps
  23. –    && apk add –no-cache –virtual .trojan-rundeps
  24. –        libstdc++
  25. –        boost-system
  26. +        openssl-dev
  27. +    && (cd /trojan && cmake . && make -j $(nproc) && strip -s trojan)
  28. +
  29. +FROM alpine:latest
  30. +RUN apk add –no-cache
  31.          boost-program_options
  32. +        boost-system
  33. +        libstdc++
  34.          mariadb-connector-c
  35. +COPY –from=builder /trojan/trojan /usr/local/bin/trojan
  37. WORKDIR /config
  38. -CMD ["trojan", "config.json"]
  39. +ENTRYPOINT ["/usr/local/bin/trojan", "/config/config.json"]
  40. No newline at end of file
  41. diff –git a/src/proto/trojanrequest.cpp b/src/proto/trojanrequest.cpp
  42. index b0a6214..4638934 100644
  43. — a/src/proto/trojanrequest.cpp
  44. +++ b/src/proto/trojanrequest.cpp
  45. @@ -40,6 +40,34 @@ int TrojanRequest::parse(const string &data) {
  46.      return data.length();
  47. }
  49. +int TrojanRequest::parse(const char *data, size_t length) {
  50. +    size_t first = length;
  51. +    for (size_t idx = 0; idx < length-1; ++idx) {
  52. +        if (data[idx] == ‘r’ && data[idx+1] == ‘n’) {
  53. +            first = idx;
  54. +            break;
  55. +        }
  56. +    }
  57. +    if (first == length) {
  58. +        return -1;
  59. +    }
  60. +
  61. +    password = string(data, first);
  62. +    // painfully slow
  63. +    payload = string(data+first+2, length-first-2);
  64. +    if (payload.length() == 0 || (payload[0] != CONNECT && payload[0] != UDP_ASSOCIATE)) {
  65. +        return -1;
  66. +    }
  67. +    command = static_cast<Command>(payload[0]);
  68. +    size_t address_len;
  69. +    bool is_addr_valid = address.parse(payload.substr(1), address_len);
  70. +    if (!is_addr_valid || payload.length() < address_len + 3 || payload.substr(address_len + 1, 2) != "rn") {
  71. +        return -1;
  72. +    }
  73. +    payload = payload.substr(address_len + 3);
  74. +    return length;
  75. +}
  76. +
  77. string TrojanRequest::generate(const string &password, const string &domainname, uint16_t port, bool tcp) {
  78.      string ret = password + "rn";
  79.      if (tcp) {
  80. diff –git a/src/proto/trojanrequest.h b/src/proto/trojanrequest.h
  81. index 2ac453d..6999782 100644
  82. — a/src/proto/trojanrequest.h
  83. +++ b/src/proto/trojanrequest.h
  84. @@ -32,6 +32,7 @@ public:
  85.      SOCKS5Address address;
  86.      std::string payload;
  87.      int parse(const std::string &data);
  88. +    int parse(const char *data, size_t length);
  89.      static std::string generate(const std::string &password, const std::string &domainname, uint16_t port, bool tcp);
  90. };
  92. diff –git a/src/session/serversession.cpp b/src/session/serversession.cpp
  93. index fd4bc98..208e16c 100644
  94. — a/src/session/serversession.cpp
  95. +++ b/src/session/serversession.cpp
  96. @@ -70,10 +70,11 @@ void ServerSession::in_async_read() {
  97.              destroy();
  98.              return;
  99.          }
  100. –        in_recv(string((const char*)in_read_buf, length));
  101. +        in_recv((char*)in_read_buf, length);
  102.      });
  103. }
  105. +// used by udp
  106. void ServerSession::in_async_write(const string &data) {
  107.      auto self = shared_from_this();
  108.      auto data_copy = make_shared<string>(data);
  109. @@ -86,6 +87,19 @@ void ServerSession::in_async_write(const string &data) {
  110.      });
  111. }
  113. +// used by tcp
  114. +void ServerSession::in_async_write(const char *data, size_t length) {
  115. +    auto self = shared_from_this();
  116. +    boost::asio::async_write(in_socket, boost::asio::buffer(data, length), [this, self](
  117. +        const boost::system::error_code error, size_t) {
  118. +        if (error) {
  119. +            destroy();
  120. +            return;
  121. +        }
  122. +        in_sent();
  123. +    });
  124. +}
  125. +
  126. void ServerSession::out_async_read() {
  127.      auto self = shared_from_this();
  128.      out_socket.async_read_some(boost::asio::buffer(out_read_buf, MAX_LENGTH), [this, self](const boost::system::error_code error, size_t length) {
  129. @@ -93,14 +107,14 @@ void ServerSession::out_async_read() {
  130.              destroy();
  131.              return;
  132.          }
  133. –        out_recv(string((const char*)out_read_buf, length));
  134. +        out_recv((char*)out_read_buf, length);
  135.      });
  136. }
  138. -void ServerSession::out_async_write(const string &data) {
  139. +void ServerSession::out_async_write(const char *data, size_t length) {
  140.      auto self = shared_from_this();
  141. –    auto data_copy = make_shared<string>(data);
  142. –    boost::asio::async_write(out_socket, boost::asio::buffer(*data_copy), [this, self, data_copy](const boost::system::error_code error, size_t) {
  143. +    boost::asio::async_write(out_socket, boost::asio::buffer(data, length), [this, self](
  144. +        const boost::system::error_code error, size_t) {
  145.          if (error) {
  146.              destroy();
  147.              return;
  148. @@ -132,10 +146,10 @@ void ServerSession::udp_async_write(const string &data, const udp::endpoint &end
  149.      });
  150. }
  152. -void ServerSession::in_recv(const string &data) {
  153. +void ServerSession::in_recv(const char *data, size_t length) {
  154.      if (status == HANDSHAKE) {
  155.          TrojanRequest req;
  156. –        bool valid = req.parse(data) != -1;
  157. +        bool valid = req.parse(data, length) != -1;
  158.          if (valid) {
  159.              auto password_iterator = config.password.find(req.password);
  160.              if (password_iterator == config.password.end()) {
  161. @@ -167,7 +181,7 @@ void ServerSession::in_recv(const string &data) {
  162.              return it == config.ssl.alpn_port_override.end() ? config.remote_port : it->second;
  163.          }());
  164.          if (valid) {
  165. –            out_write_buf = req.payload;
  166. +            out_write_buf = std::move(req.payload);
  167.              if (req.command == TrojanRequest::UDP_ASSOCIATE) {
  168.                  Log::log_with_endpoint(in_endpoint, "requested UDP associate to " + req.address.address + ‘:’ + to_string(req.address.port), Log::INFO);
  169.                  status = UDP_FORWARD;
  170. @@ -179,7 +193,8 @@ void ServerSession::in_recv(const string &data) {
  171.              }
  172.          } else {
  173.              Log::log_with_endpoint(in_endpoint, "not trojan request, connecting to " + query_addr + ‘:’ + query_port, Log::WARN);
  174. –            out_write_buf = data;
  175. +            // painfully slow
  176. +            out_write_buf = string(data, length);
  177.          }
  178.          sent_len += out_write_buf.length();
  179.          auto self = shared_from_this();
  180. @@ -229,17 +244,18 @@ void ServerSession::in_recv(const string &data) {
  181.                  status = FORWARD;
  182.                  out_async_read();
  183.                  if (!out_write_buf.empty()) {
  184. –                    out_async_write(out_write_buf);
  185. +                    out_async_write(out_write_buf.c_str(), out_write_buf.length());
  186.                  } else {
  187.                      in_async_read();
  188.                  }
  189.              });
  190.          });
  191.      } else if (status == FORWARD) {
  192. –        sent_len += data.length();
  193. –        out_async_write(data);
  194. +        sent_len += length;
  195. +        out_async_write(data, length);
  196.      } else if (status == UDP_FORWARD) {
  197. –        udp_data_buf += data;
  198. +        // painfully slow
  199. +        udp_data_buf += string(data, length);
  200.          udp_sent();
  201.      }
  202. }
  203. @@ -252,10 +268,10 @@ void ServerSession::in_sent() {
  204.      }
  205. }
  207. -void ServerSession::out_recv(const string &data) {
  208. +void ServerSession::out_recv(const char *data, size_t length) {
  209.      if (status == FORWARD) {
  210. –        recv_len += data.length();
  211. –        in_async_write(data);
  212. +        recv_len += length;
  213. +        in_async_write(data, length);
  214.      }
  215. }
  217. diff –git a/src/session/serversession.h b/src/session/serversession.h
  218. index c351f28..2b2fe1b 100644
  219. — a/src/session/serversession.h
  220. +++ b/src/session/serversession.h
  221. @@ -40,12 +40,15 @@ private:
  222.      const std::string &plain_http_response;
  223.      void destroy();
  224.      void in_async_read();
  225. +    // used by udp
  226.      void in_async_write(const std::string &data);
  227. –    void in_recv(const std::string &data);
  228. +    // used by tcp
  229. +    void in_async_write(const char *data, size_t length);
  230. +    void in_recv(const char *data, size_t length);
  231.      void in_sent();
  232.      void out_async_read();
  233. –    void out_async_write(const std::string &data);
  234. –    void out_recv(const std::string &data);
  235. +    void out_async_write(const char *data, size_t length);
  236. +    void out_recv(const char *data, size_t length);
  237.      void out_sent();
  238.      void udp_async_read();
  239.      void udp_async_write(const std::string &data, const boost::asio::ip::udp::endpoint &endpoint);

复制代码
确实有点慢，正好443被cf用了，搭在非标端口，基本不用
直接PR吧[美国VPS] [破事水] 一键提升trojan-server性能
MJJ卧虎藏龙啊

要改动的地方太多了，只改TCP服务端的话代码看上去就不对称了，影响观感
这个真技术贴,看不懂[美国VPS] [破事水] 一键提升trojan-server性能
dockerfile用的是dev分支最近的一次提交
把帖子权限去掉了，没人回复好无聊捏
太好了，是技术贴
厉害了[美国VPS] [破事水] 一键提升trojan-server性能
标签：