fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 11:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

connectivity: cleanup conditions in curl_check_connectivity()

Browse source 
Refactor the nested ifs to if-else-if-else.
This commit is contained in:
Thomas Haller 2018-02-09 18:04:37 +01:00
parent 88416394f8
commit 5f1c2e16c9
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/nm-connectivity.c
View file

@ -155,28 +155,29 @@ curl_check_connectivity (CURLM *mhandle, CURLMcode ret)
}
if (cb_data) {
NMConnectivityState c;
/* If cb_data is still there this message hasn't been
* taken care of. Do so now. */
if (msg->data.result == CURLE_OK) {
if (msg->data.result != CURLE_OK) {
_LOG2D ("check failed (%d)", msg->data.result);
c = NM_CONNECTIVITY_LIMITED;
} else if ( !cb_data->response[0]
&& (curl_easy_getinfo (msg->easy_handle, CURLINFO_RESPONSE_CODE, &response_code) == CURLE_OK)
&& response_code == 204) {
/* If we got a 204 error (No content) and we actually requested no content,
* report full connectivity. */
if (!cb_data->response[0] &&
(curl_easy_getinfo (msg->easy_handle, CURLINFO_RESPONSE_CODE, &response_code) == CURLE_OK) &&
response_code == 204) {
_LOG2D ("response with no content received, check successful");
finish_cb_data (cb_data, NM_CONNECTIVITY_FULL);
}
_LOG2D ("response with no content received, check successful");
c = NM_CONNECTIVITY_FULL;
} else {
/* If we get here, it means that easy_write_cb() didn't read enough
* bytes to be able to do a match. */
else {
_LOG2I ("response shorter than expected '%s'; assuming captive portal.",
cb_data->response);
finish_cb_data (cb_data, NM_CONNECTIVITY_PORTAL);
}
} else {
_LOG2D ("check failed (%d)", msg->data.result);
finish_cb_data (cb_data, NM_CONNECTIVITY_LIMITED);
_LOG2I ("response shorter than expected '%s'; assuming captive portal.",
cb_data->response);
c = NM_CONNECTIVITY_PORTAL;
}
finish_cb_data (cb_data, c);
}
curl_multi_remove_handle (mhandle, msg->easy_handle);