-

Author: dayu521

README.md

@@ -29,7 +29,7 @@
     其他发行版对应安装
 
 
-- windows使用最新编译器,安装xmake.最好安装`windows terminal`
+- windows使用最新msvc编译器,安装xmake.最好安装`windows terminal`
 
 ---
 

src/certificate/cert.cpp

@@ -323,12 +323,12 @@ namespace hcpp
         X509_set_issuer_name(cert, X509_get_subject_name(ca_cert));
     }
 
-    void test()
-    {
+    // static void test()
+    // {
 
-        auto cert = X509_new();
+        // auto cert = X509_new();
 
-        auto pkey = generate_pkey();
+        // auto pkey = generate_pkey();
         // if (pkey == NULL)
         // CHECK(false);
         // print_key(pkey);
@@ -374,5 +374,5 @@ namespace hcpp
 
         // fclose(caCertFile);
         // X509_free(cert);
-    }
+    // }
 } // namespace hcpp

src/certificate/cert.h

@@ -18,27 +18,22 @@ namespace hcpp
         int nid_val_len_;
     };
 
+    const inline std::vector<name_entry> default_name_entries = {
+        {NID_countryName, "CN", sizeof("CN") - 1},
+        {NID_organizationName, "NoBody", sizeof("NoBody") - 1},
+        {NID_organizationalUnitName, "JS", sizeof("JS") - 1},
+        {NID_stateOrProvinceName, "JS", sizeof("JS") - 1},
+        {NID_commonName, "SQ", sizeof("SQ") - 1},
+        {NID_localityName, "SQ", sizeof("SQ") - 1},
+    };
+
     X509 *make_x509();
     EVP_PKEY *make_pkey();
     void set_version(X509 *cert);
     void set_serialNumber(X509 *cert);
-    void set_issuer(X509 *cert, const std::vector<name_entry> &ne = {
-                                    {NID_countryName, "CN", sizeof("CN") - 1},
-                                    {NID_organizationName, "NoBody", sizeof("NoBody") - 1},
-                                    {NID_organizationalUnitName, "JS", sizeof("JS") - 1},
-                                    {NID_stateOrProvinceName, "JS", sizeof("JS") - 1},
-                                    {NID_commonName, "SQ", sizeof("SQ") - 1},
-                                    {NID_localityName, "SQ", sizeof("SQ") - 1},
-                                });
+    void set_issuer(X509 *cert, const std::vector<name_entry> &ne = default_name_entries);
     void set_validity(X509 *cert, std::size_t days = 365 * 10);
-    void set_subject(X509 *cert, const std::vector<name_entry> &ne = {
-                                     {NID_countryName, "CN", sizeof("CN") - 1},
-                                     {NID_organizationName, "NoBody", sizeof("NoBody") - 1},
-                                     {NID_organizationalUnitName, "JS", sizeof("JS") - 1},
-                                     {NID_stateOrProvinceName, "JS", sizeof("JS") - 1},
-                                     {NID_commonName, "SQ", sizeof("SQ") - 1},
-                                     {NID_localityName, "SQ", sizeof("SQ") - 1},
-                                 });
+    void set_subject(X509 *cert, const std::vector<name_entry> &ne = default_name_entries);
     void set_pubkey(X509 *cert, EVP_PKEY *pkey);
     void add_ca_key_usage(X509 *cert);
     void add_SKI(X509 *cert);

src/httpserver.cpp

@@ -222,7 +222,7 @@ namespace hcpp
 
         co_await nc->async_send(asio::error_code{}, "ok");
         // 在当前协程运行
-        auto https_listener = [c = channel_, cr_ps_map, ca_subject = ca_subject_]() -> awaitable<void>
+        auto https_listener = [c = channel_, cr_ps_map, ca_subject = ca_subject_](io_context &executor) -> awaitable<void>
         {
             http_handler hh;
             for (;;)
@@ -272,7 +272,7 @@ namespace hcpp
                         self.set_mem(co_await std::move(*cc).make(std::move(si)));
                     };
 
-                    co_spawn(co_await this_coro::executor, hh.http_do(std::move(hsc), std::move(sk)), detached);
+                    co_spawn(executor, hh.http_do(std::move(hsc), std::move(sk)), detached);
                 }
                 catch (const std::exception &e)
                 {
@@ -281,11 +281,10 @@ namespace hcpp
             }
         };
 
-        auto work_guard = make_work_guard(executor);
-
         auto https_service = [&executor]()
         {
             spdlog::debug("mimt https server线程创建成功");
+            auto work_guard = make_work_guard(executor);
             while (!executor.stopped())
             {
                 try
@@ -299,18 +298,16 @@ namespace hcpp
             }
             spdlog::debug("mimt https server线程退出成功");
         };
-        std::thread t(https_service);
-        t.detach();
+        std::jthread t(https_service);
 
-        std::unique_ptr<int, std::function<void(int *)>> ptr(new int(0), [&work_guard, &executor](auto &&p)
+        std::unique_ptr<int, std::function<void(int *)>> ptr(new int(0), [ &executor](auto &&p)
                                                              {
             log::info("work_guard分离");
-            work_guard.reset();
-            std::this_thread::sleep_for(std::chrono::seconds(1));
             executor.stop();
+            std::this_thread::sleep_for(std::chrono::seconds(1));
             delete p; });
 
-        co_await co_spawn(executor, https_listener(), use_awaitable);
+        co_await https_listener(executor);
         // XXX 不会执行到这里
         co_return;
     }

xmake.lua

@@ -1,5 +1,5 @@
 set_project("hcpp")
-set_xmakever("2.8.7")
+set_xmakever("2.8.8")
 add_rules("mode.debug", "mode.release")
 
 set_warnings("all")