Skip to content

[rest_client] Fix async connection logic #2484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liviuchircu merged 1 commit into from
Apr 26, 2021
Merged

[rest_client] Fix async connection logic #2484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions modules/rest_client/rest_methods.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,22 +715,6 @@ int start_async_http_req(struct sip_msg *msg, enum rest_client_method method,

LM_DBG("perform code: %d, handles: %d\n", mrc, running_handles);

mrc = curl_multi_timeout(multi_handle, &retry_time);
if (mrc != CURLM_OK) {
LM_ERR("curl_multi_timeout: %s\n", curl_multi_strerror(mrc));
goto error;
}

LM_DBG("libcurl TCP connect: we should wait up to %ldms "
"(timeout=%ldms, poll=%ldms)!\n", retry_time,
connection_timeout_ms, connect_poll_interval);

if (retry_time == -1) {
LM_DBG("curl_multi_timeout() returned -1, pausing %ldms...\n",
busy_wait);
goto busy_wait;
}

/* transfer completed! But how well? */
if (running_handles == 0) {
curl_easy_getinfo(handle, CURLINFO_RESPONSE_CODE, &http_rc);
Expand Down Expand Up @@ -802,17 +786,33 @@ int start_async_http_req(struct sip_msg *msg, enum rest_client_method method,
}
}

mrc = curl_multi_timeout(multi_handle, &retry_time);
if (mrc != CURLM_OK) {
LM_ERR("curl_multi_timeout: %s\n", curl_multi_strerror(mrc));
goto error;
}

LM_DBG("libcurl TCP connect: we should wait up to %ldms "
"(timeout=%ldms, poll=%ldms)!\n", retry_time,
connection_timeout_ms, connect_poll_interval);

/*
* from curl_multi_timeout() docs: "retry_time" milliseconds "at most!"
* -> we'll wait only 1/10 of this time before retrying
*/
busy_wait = connect_poll_interval < timeout ?
connect_poll_interval : timeout;

busy_wait:
/* libcurl seems to be stuck in internal operations (TCP connect?) */
LM_DBG("busy waiting %ldms ...\n", busy_wait);
usleep(1000UL * busy_wait);
from curl_multi_timeout() docs:
retry_time = -1, no timeout set
retry_time = 0, proceed immediately
retry_time > 0, wait at most retry_time
*/
if (retry_time != -1 && retry_time < connect_poll_interval) {
busy_wait = retry_time < timeout ? retry_time : timeout;
} else {
busy_wait = connect_poll_interval < timeout ? connect_poll_interval : timeout;
}

if (busy_wait > 0) {
/* libcurl seems to be stuck in internal operations (TCP connect?) */
LM_DBG("busy waiting %ldms ...\n", busy_wait);
usleep(1000UL * busy_wait);
}
}

LM_ERR("connect timeout on %s (%lds)\n", url, connection_timeout);
Expand Down