connectivity: fix using curl_multi_strerror() for CURLMcode error code

This commit is contained in:
Thomas Haller
2019-11-14 14:26:17 +01:00
parent 0871c9533f
commit c24f122e22

View File

@@ -314,7 +314,6 @@ _con_curl_check_connectivity (CURLM *mhandle, int sockfd, int ev_bitmask)
{ {
NMConnectivityCheckHandle *cb_data; NMConnectivityCheckHandle *cb_data;
CURLMsg *msg; CURLMsg *msg;
CURLcode eret;
int m_left; int m_left;
long response_code; long response_code;
CURLMcode ret; CURLMcode ret;
@@ -323,12 +322,13 @@ _con_curl_check_connectivity (CURLM *mhandle, int sockfd, int ev_bitmask)
ret = curl_multi_socket_action (mhandle, sockfd, ev_bitmask, &running_handles); ret = curl_multi_socket_action (mhandle, sockfd, ev_bitmask, &running_handles);
if (ret != CURLM_OK) { if (ret != CURLM_OK) {
_LOGD ("connectivity check failed: (%d) %s", ret, curl_easy_strerror (ret)); _LOGD ("connectivity check failed: (%d) %s", ret, curl_multi_strerror (ret));
success = FALSE; success = FALSE;
} }
while ((msg = curl_multi_info_read (mhandle, &m_left))) { while ((msg = curl_multi_info_read (mhandle, &m_left))) {
const char *response; const char *response;
CURLcode eret;
if (msg->msg != CURLMSG_DONE) if (msg->msg != CURLMSG_DONE)
continue; continue;