From 70bba0b4f3b717e9fd1b9a2bf652ce741ae01062 Mon Sep 17 00:00:00 2001
From: Alex Revetchi <alex.revetchi@sonatus.com>
Date: Sat, 19 Jul 2025 14:16:19 -0700
Subject: [PATCH 1/4] Fix tls socket can block on clean shutdown

---
 include/mqtt/endpoint.hpp | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/mqtt/endpoint.hpp b/include/mqtt/endpoint.hpp
index 7488c4bf..dcadd5e5 100644
--- a/include/mqtt/endpoint.hpp
+++ b/include/mqtt/endpoint.hpp
@@ -1100,7 +1100,7 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
             << MQTT_ADD_VALUE(address, this)
             << "force_disconnect";
 
-        sync_shutdown(socket());
+        sync_force_shutdown(socket());
     }
 
     /**
@@ -5326,6 +5326,31 @@ class endpoint : public std::enable_shared_from_this<endpoint<Mutex, LockGuard,
         connected_ = false;
     }
 
+    void sync_force_shutdown(MQTT_NS::socket& s) {
+        MQTT_LOG("mqtt_impl", trace)
+            << MQTT_ADD_VALUE(address, this)
+            << "sync_force_shutdown";
+        if (shutdown_requested_) {
+            MQTT_LOG("mqtt_impl", trace)
+                << MQTT_ADD_VALUE(address, this)
+                << "already shutdowned";
+            return;
+        }
+        shutdown_requested_ = true;
+        mqtt_connected_ = false;
+
+        error_code ec;
+        MQTT_LOG("mqtt_impl", trace)
+            << MQTT_ADD_VALUE(address, this)
+            << "force_shutdown_and_close";
+        s.force_shutdown_and_close(ec);
+        MQTT_LOG("mqtt_impl", trace)
+            << MQTT_ADD_VALUE(address, this)
+            << "force_shutdown_and_close ec:"
+            << ec.message();
+        connected_ = false;
+    }
+
     void async_shutdown(MQTT_NS::socket& s, async_handler_t func) {
         MQTT_LOG("mqtt_impl", trace)
             << MQTT_ADD_VALUE(address, this)

From 61755e494640e101bcc809226a349ebb7ce6b3d8 Mon Sep 17 00:00:00 2001
From: Alex Revetchi <alex.revetchi@sonatus.com>
Date: Mon, 21 Jul 2025 04:29:19 -0700
Subject: [PATCH 2/4] - add bazel BUILD file

---
 BUILD | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 BUILD

diff --git a/BUILD b/BUILD
new file mode 100644
index 00000000..c04dd730
--- /dev/null
+++ b/BUILD
@@ -0,0 +1,22 @@
+load("//bazel/rules:cc.bzl", "cc_binary", "cc_library")
+
+cc_library(
+    name = "mqtt_cpp",
+    hdrs = glob(["include/**/*.hpp",]),
+    includes = ["include"],
+    defines = ["MQTT_USE_TLS",
+               "MQTT_USE_STATIC_BOOST",
+               "MQTT_USE_STATIC_OPENSSL",
+               "MQTT_STD_VARIANT",
+               "MQTT_STD_OPTIONAL",
+               "MQTT_STD_STRING_VIEW",
+               "MQTT_STD_ANY",
+               "MQTT_STD_SHARED_PTR_ARRAY",
+               ],
+    deps = [
+        "@boost//:boost_asio_ssl",
+        "@boost//:boost_log",
+        "@boost//:system",
+    ],
+    visibility = ["//visibility:public"],
+)
\ No newline at end of file

From da524d1c2ad0d98bd2ccd749849f7092b33b1656 Mon Sep 17 00:00:00 2001
From: Alex Revetchi <alex.revetchi@sonatus.com>
Date: Mon, 21 Jul 2025 04:55:29 -0700
Subject: [PATCH 3/4] - update BUILD file

---
 BUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BUILD b/BUILD
index c04dd730..4df4c5a5 100644
--- a/BUILD
+++ b/BUILD
@@ -14,9 +14,10 @@ cc_library(
                "MQTT_STD_SHARED_PTR_ARRAY",
                ],
     deps = [
-        "@boost//:boost_asio_ssl",
+        "@boost//:asio_ssl",
         "@boost//:boost_log",
         "@boost//:system",
     ],
+    linkstatic = True,
     visibility = ["//visibility:public"],
 )
\ No newline at end of file

From 278075711c78229d025bb92f08a83ef7c0d2b65a Mon Sep 17 00:00:00 2001
From: Alex Revetchi <alex.revetchi@sonatus.com>
Date: Mon, 21 Jul 2025 06:12:37 -0700
Subject: [PATCH 4/4] - remove bazel BUILD file

---
 BUILD | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 BUILD

diff --git a/BUILD b/BUILD
deleted file mode 100644
index 4df4c5a5..00000000
--- a/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-load("//bazel/rules:cc.bzl", "cc_binary", "cc_library")
-
-cc_library(
-    name = "mqtt_cpp",
-    hdrs = glob(["include/**/*.hpp",]),
-    includes = ["include"],
-    defines = ["MQTT_USE_TLS",
-               "MQTT_USE_STATIC_BOOST",
-               "MQTT_USE_STATIC_OPENSSL",
-               "MQTT_STD_VARIANT",
-               "MQTT_STD_OPTIONAL",
-               "MQTT_STD_STRING_VIEW",
-               "MQTT_STD_ANY",
-               "MQTT_STD_SHARED_PTR_ARRAY",
-               ],
-    deps = [
-        "@boost//:asio_ssl",
-        "@boost//:boost_log",
-        "@boost//:system",
-    ],
-    linkstatic = True,
-    visibility = ["//visibility:public"],
-)
\ No newline at end of file