lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-11-18 13:20:55 +03:00
Code Activity

Fix android getaddrinfo issue (#2273)

Browse Source 
Co-authored-by: Clarkok Zhang <clarkok8@gmail.com>
This commit is contained in:
Clarkok Zhang
2025-11-14 13:48:21 -08:00
committed by GitHub
parent 59882752aa
commit 27ee115a60
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
httplib.h
View File

@@ -3835,22 +3835,30 @@ inline int getaddrinfo_with_timeout(const char *node, const char *service,
// Fallback implementation using thread-based timeout for other Unix systems // Fallback implementation using thread-based timeout for other Unix systems
struct GetAddrInfoState { struct GetAddrInfoState {
~GetAddrInfoState() {
if (info) { freeaddrinfo(info); }
}
std::mutex mutex; std::mutex mutex;
std::condition_variable result_cv; std::condition_variable result_cv;
bool completed = false; bool completed = false;
int result = EAI_SYSTEM; int result = EAI_SYSTEM;
std::string node = node; std::string node;
std::string service = service; std::string service;
struct addrinfo hints = hints; struct addrinfo hints;
struct addrinfo *info = nullptr; struct addrinfo *info = nullptr;
}; };
// Allocate on the heap, so the resolver thread can keep using the data. // Allocate on the heap, so the resolver thread can keep using the data.
auto state = std::make_shared<GetAddrInfoState>(); auto state = std::make_shared<GetAddrInfoState>();
state->node = node;
state->service = service;
state->hints = *hints;
std::thread resolve_thread([=]() { std::thread resolve_thread([state]() {
auto thread_result = getaddrinfo( auto thread_result =
state->node.c_str(), state->service.c_str(), hints, &state->info); getaddrinfo(state->node.c_str(), state->service.c_str(), &state->hints,
&state->info);
std::lock_guard<std::mutex> lock(state->mutex); std::lock_guard<std::mutex> lock(state->mutex);
state->result = thread_result; state->result = thread_result;
@@ -3868,6 +3876,7 @@ inline int getaddrinfo_with_timeout(const char *node, const char *service,
// Operation completed within timeout // Operation completed within timeout
resolve_thread.join(); resolve_thread.join();
*res = state->info; *res = state->info;
state->info = nullptr; // Pass ownership to caller
return state->result; return state->result;
} else { } else {
// Timeout occurred // Timeout occurred