+

Author: dayu521

src/https/mitm_svc.cpp

@@ -98,13 +98,15 @@ namespace hcpp
                 {
                     ssl_m->set_sni(sni_host_);
                 }
-                auto verify_fun = [self = shared_from_this(), host = svc_host](bool preverified, auto &v_ctx)
+                //XXX 这里不能用shared_from_this,因为回调会一直保持当前对象的智能指针,不释放
+                auto verify_fun = [verify_fun_=verify_fun_, host = svc_host](bool preverified, auto &v_ctx)
                 {
                     if (ssl::host_name_verification(host)(preverified, v_ctx))
                     {
-                        if (self->verify_fun_)
+                        if (verify_fun_)
                         {
-                            return self->verify_fun_(preverified, v_ctx);
+                            log::info("mitm_svc::make_memory: 校验{}开始",host);
+                            return verify_fun_(preverified, v_ctx);
                         }
                         return true;
                     }
@@ -183,14 +185,13 @@ namespace hcpp
         chc_->host_ = host;
         chc_->service_ = service;
         m->check(*this);
-        spdlog::debug("建立channel tunnel {}", host);
         co_await channel_->async_send(asio::error_code{}, chc_);
+        log::error("channel_tunnel::make_tunnel: 建立channel tunnel {}", host);
     }
 
     void channel_tunnel::make(std::unique_ptr<tcp_socket> sock)
     {
         chc_->sock_ = std::move(sock);
-        log::info("转移tcp_socket到channel");
     }
 
     void channel_tunnel::make(std::unique_ptr<ssl_socket> sock)

src/httpserver.cpp

@@ -213,7 +213,7 @@ namespace hcpp
                     auto hsc = std::make_unique<https_client>();
                     hsc->host_ = cc->host_;
                     hsc->service_ = cc->service_;
-                    log::info("channel_client: {}", hsc->host_);
+                    log::error("channel_client: {}", hsc->host_);
                     if (!cc->sock_)
                     {
                         log::error("无法获取socket");
@@ -239,15 +239,17 @@ namespace hcpp
                     {
                         part_cert_info pci{};
                         sk->add_SAN_collector(pci);
-                        log::info("mimt_https_server::wait_c:创建server_subject_map缓存 => {}", hsc->host_);
                         co_await sk->make_memory(hsc->host_, hsc->service_);
                         si = sk->make_fake_server_id(pci.dns_name_, ca_subject);
                         // XXX 插入失败不用管
                         server_subject_map.insert({hsc->host_, si});
+                        log::error("mimt_https_server::wait_c:创建server_subject_map缓存 => {}", hsc->host_);
+                        log::error("mimt_https_server::wait_c:当前缓存数量 {}", server_subject_map.size());
                     }
 
                     hsc->set_mem(co_await std::move(*cc).make(std::move(si)));
 
+                    log::error("开始http_do {}", hsc->host_);
                     co_spawn(executor, http_do(std::move(hsc), std::move(sk)), detached);
                 }
                 catch (const std::exception &e)
@@ -285,7 +287,8 @@ namespace hcpp
             executor.stop();
             delete p; });
 
-        co_await https_listener();
+        co_await co_spawn(executor,https_listener(),use_awaitable);
+        // co_await https_listener();
         co_return;
     }