diff --git a/.gitmodules b/.gitmodules
index 60b3730713..391f572334 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "components/asio/asio"]
path = components/asio/asio
- url = https://github.com/espressif/asio
+ url = https://github.com/chriskohlhoff/asio
[submodule "components/mosquitto/mosquitto"]
path = components/mosquitto/mosquitto
url = https://github.com/eclipse/mosquitto
diff --git a/components/asio/CMakeLists.txt b/components/asio/CMakeLists.txt
index 3ec69bac48..8aebfc71bc 100644
--- a/components/asio/CMakeLists.txt
+++ b/components/asio/CMakeLists.txt
@@ -6,8 +6,8 @@ if(NOT CONFIG_LWIP_IPV6 AND NOT CMAKE_BUILD_EARLY_EXPANSION)
return()
endif()
-set(asio_sources "asio/asio/src/asio.cpp")
-set(asio_requires lwip)
+set(asio_sources "asio/asio/src/asio.cpp" "port/src/asio_stub.cpp")
+set(asio_requires lwip sock_utils)
if(CONFIG_ASIO_SSL_SUPPORT)
list(APPEND asio_sources
@@ -18,7 +18,7 @@ if(CONFIG_ASIO_SSL_SUPPORT)
endif()
idf_component_register(SRCS ${asio_sources}
- INCLUDE_DIRS "asio/asio/include" "port/include"
+ INCLUDE_DIRS "port/include" "asio/asio/include"
PRIV_INCLUDE_DIRS ${asio_priv_includes}
PRIV_REQUIRES ${asio_requires})
@@ -30,6 +30,7 @@ target_compile_definitions(${COMPONENT_LIB} PUBLIC SA_RESTART=0x01
ASIO_STANDALONE
ASIO_HAS_PTHREADS
OPENSSL_NO_ENGINE
+ ASIO_DETAIL_IMPL_POSIX_EVENT_IPP # this replaces asio's posix_event constructor
)
if(NOT CONFIG_COMPILER_CXX_EXCEPTIONS)
diff --git a/components/asio/asio b/components/asio/asio
index a2e0f70d61..7609450f71 160000
--- a/components/asio/asio
+++ b/components/asio/asio
@@ -1 +1 @@
-Subproject commit a2e0f70d612309f4623bd43d8a26629bd716bb2c
+Subproject commit 7609450f71434bdc9fbd9491a9505b423c2a8496
diff --git a/components/asio/idf_component.yml b/components/asio/idf_component.yml
index a54601f0f9..3708c85107 100644
--- a/components/asio/idf_component.yml
+++ b/components/asio/idf_component.yml
@@ -7,3 +7,5 @@ repository: https://github.com/espressif/esp-protocols.git
dependencies:
idf:
version: ">=5.0"
+ espressif/sock_utils:
+ version: "^0.1"
diff --git a/components/asio/port/include/asio/detail/config.hpp b/components/asio/port/include/asio/detail/config.hpp
new file mode 100644
index 0000000000..288fe08b8a
--- /dev/null
+++ b/components/asio/port/include/asio/detail/config.hpp
@@ -0,0 +1,11 @@
+//
+// SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+#pragma once
+
+#include "sys/socket.h"
+#include "socketpair.h"
+
+#include_next "asio/detail/config.hpp"
diff --git a/components/asio/port/include/openssl_stub.hpp b/components/asio/port/include/asio/ssl/detail/openssl_types.hpp
similarity index 100%
rename from components/asio/port/include/openssl_stub.hpp
rename to components/asio/port/include/asio/ssl/detail/openssl_types.hpp
diff --git a/components/asio/port/include/esp_asio_config.h b/components/asio/port/include/esp_asio_config.h
deleted file mode 100644
index 2ad9c79c76..0000000000
--- a/components/asio/port/include/esp_asio_config.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef _ESP_ASIO_CONFIG_H_
-#define _ESP_ASIO_CONFIG_H_
-
-#define ASIO_SSL_DETAIL_OPENSSL_TYPES_HPP
-#include "openssl_stub.hpp"
-
-#endif // _ESP_ASIO_CONFIG_H_
diff --git a/components/asio/port/mbedtls/src/mbedtls_context.cpp b/components/asio/port/mbedtls/src/mbedtls_context.cpp
index bf9220ad59..4b3e2f4189 100644
--- a/components/asio/port/mbedtls/src/mbedtls_context.cpp
+++ b/components/asio/port/mbedtls/src/mbedtls_context.cpp
@@ -8,7 +8,7 @@
//
#include "asio/detail/config.hpp"
-#include "openssl_stub.hpp"
+#include "asio/ssl/detail/openssl_types.hpp"
#include <cstring>
#include "asio/detail/throw_error.hpp"
#include "asio/error.hpp"
diff --git a/components/asio/port/mbedtls/src/mbedtls_engine.cpp b/components/asio/port/mbedtls/src/mbedtls_engine.cpp
index 1d97b3a738..1c03a32841 100644
--- a/components/asio/port/mbedtls/src/mbedtls_engine.cpp
+++ b/components/asio/port/mbedtls/src/mbedtls_engine.cpp
@@ -7,7 +7,7 @@
//
#include "asio/detail/config.hpp"
-#include "openssl_stub.hpp"
+#include "asio/ssl/detail/openssl_types.hpp"
#include "asio/detail/throw_error.hpp"
#include "asio/error.hpp"
#include "asio/ssl/detail/engine.hpp"
diff --git a/components/asio/port/src/asio_stub.cpp b/components/asio/port/src/asio_stub.cpp
new file mode 100644
index 0000000000..ebc0c93f6c
--- /dev/null
+++ b/components/asio/port/src/asio_stub.cpp
@@ -0,0 +1,36 @@
+//
+// SPDX-FileCopyrightText: 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// SPDX-License-Identifier: BSL-1.0
+//
+// SPDX-FileContributor: 2024 Espressif Systems (Shanghai) CO LTD
+//
+#include "asio/detail/posix_event.hpp"
+#include "asio/detail/throw_error.hpp"
+#include "asio/error.hpp"
+#include "asio/detail/push_options.hpp"
+#include <unistd.h>
+#include <climits>
+
+namespace asio::detail {
+// This replaces asio's posix_event constructor
+// since the default POSIX version uses pthread_condattr_t operations (init, setclock, destroy),
+// which are not available on all IDF versions (some are defined in compilers' headers, others in
+// pthread library, but they typically return `ENOSYS` which causes trouble in the event wrapper)
+// IMPORTANT: Check implementation of posix_event() when upgrading upstream asio in order not to
+// miss any initialization step.
+posix_event::posix_event()
+ : state_(0)
+{
+ int error = ::pthread_cond_init(&cond_, nullptr);
+ asio::error_code ec(error, asio::error::get_system_category());
+ asio::detail::throw_error(ec, "event");
+}
+} // namespace asio::detail
+
+extern "C" int pause (void)
+{
+ while (true) {
+ ::sleep(UINT_MAX);
+ }
+}