fix static data destroy

Author: dayu521

main.cpp

@@ -55,8 +55,6 @@ int main(int argc, char **argv)
 
         asio::io_context io_context;
 
-        hcpp::nc = std::make_shared<hcpp::notify_channel>(io_context, 1);
-
         asio::signal_set signals(io_context, SIGINT, SIGTERM);
         signals.async_wait([&](auto, auto)
                            { io_context.stop(); });
@@ -67,6 +65,7 @@ int main(int argc, char **argv)
         {
             return -1;
         }
+        mhs.set_ch(std::make_shared<hcpp::socket_channel>(io_context, 10));
 
         hs.attach_tunnel([&mhs](auto &&c, auto h, auto s)
                          {
@@ -90,7 +89,7 @@ int main(int argc, char **argv)
         };
 
         co_spawn(io_context, hs.wait_http(c->get_port(),io_context), exit_handler);
-        co_spawn(io_context, mhs.wait_c(10, c->get_proxy_service()), exit_handler);
+        co_spawn(io_context, mhs.wait_c(c->get_proxy_service()), exit_handler);
 
         auto create_thread = [&](auto self, int i) -> void
         {

src/httpserver.cpp

@@ -171,7 +171,6 @@ namespace hcpp
         auto executor = co_await this_coro::executor;
 
         tcp_acceptor acceptor(executor, {ip::tcp::v4(), port});
-        co_await nc->async_receive();
         spdlog::debug("http_server监听端口:{}", acceptor.local_endpoint().port());
         http_handler hh;
         hh.add_handler("/stop", [&ic](auto &&path)
@@ -202,7 +201,7 @@ namespace hcpp
 
     static thread_local std::unordered_map<std::string, subject_identify> server_subject_map;
 
-    awaitable<void> mimt_https_server::wait_c(std::size_t cn, std::vector<proxy_service> ps)
+    awaitable<void> mimt_https_server::wait_c(std::vector<proxy_service> ps)
     {
         if (!ca_subject_)
         {
@@ -218,9 +217,7 @@ namespace hcpp
 
         const decltype(ps_map) &cr_ps_map = ps_map;
         io_context executor;
-        channel_ = std::make_shared<socket_channel>(co_await this_coro::executor, cn);
 
-        co_await nc->async_send(asio::error_code{}, "ok");
         // 在当前协程运行
         auto https_listener = [c = channel_, cr_ps_map, ca_subject = ca_subject_](io_context &executor) -> awaitable<void>
         {
@@ -331,4 +328,9 @@ namespace hcpp
         root_verify_store_path_ = root_verify_store_path;
     }
 
+    void mimt_https_server::set_ch(std::shared_ptr<socket_channel> ch)
+    {
+        channel_=ch;
+    }
+
 } // namespace hcpp

src/httpserver.h

@@ -85,13 +85,15 @@ namespace hcpp
     class mimt_https_server
     {
     public:
-        awaitable<void> wait_c(std::size_t cn, std::vector<proxy_service> ps);
+        awaitable<void> wait_c(std::vector<proxy_service> ps);
         awaitable<void> wait(uint16_t port);
 
         std::optional<std::shared_ptr<tunnel>> find_tunnel(std::string_view svc_host, std::string_view svc_service);
 
         std::set<std::pair<std::string, std::string>> tunnel_set_;
 
+        void set_ch(std::shared_ptr<socket_channel> ch);
+
         void set_ca(subject_identify ca_subject);
         void set_root_verify_store_path(std::string_view root_verify_store_path);
 
@@ -103,7 +105,6 @@ namespace hcpp
 
     using notify_channel = asio::use_awaitable_t<>::as_default_on_t<concurrent_channel<void(asio::error_code, std::string)>>;
 
-    inline std::shared_ptr<notify_channel> nc;
 } // namespace hcpp
 
 #endif /* SRC_HTTPSERVER */