@@ -782,6 +782,8 @@ static void wispr_portal_request_portal(
wispr_route_request,
wp_context, &err);
+ DBG("wp_context->request_id %d err %d", wp_context->request_id, err);
+
if (wp_context->request_id == 0) {
portal_manage_failure_status(wp_context, err);
wispr_portal_error(wp_context);
@@ -973,34 +975,22 @@ static bool wispr_manage_message(GWebResult *result,
return false;
}
-static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
+static void wispr_portal_web_result_err(GWebResult *result,
+ struct connman_wispr_portal_context *wp_context,
+ int err)
{
- struct connman_wispr_portal_context *wp_context = user_data;
- const char *redirect = NULL;
- const guint8 *chunk = NULL;
- const char *str = NULL;
- guint16 status;
- gsize length;
-
- DBG("");
-
- if (wp_context->wispr_result != CONNMAN_WISPR_RESULT_ONLINE) {
- g_web_result_get_chunk(result, &chunk, &length);
-
- if (length > 0) {
- g_web_parser_feed_data(wp_context->wispr_parser,
- chunk, length);
- /* read more data */
- return true;
- }
+ portal_manage_failure_status(wp_context, err);
- g_web_parser_end_data(wp_context->wispr_parser);
+ free_wispr_routes(wp_context);
+ wp_context->request_id = 0;
+}
- if (wp_context->wispr_msg.message_type >= 0) {
- if (wispr_manage_message(result, wp_context))
- goto done;
- }
- }
+static void wispr_portal_web_result_no_err(GWebResult *result,
+ struct connman_wispr_portal_context *wp_context)
+{
+ guint16 status;
+ const char *str = NULL;
+ const char *redirect = NULL;
status = g_web_result_get_status(result);
@@ -1073,12 +1063,64 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
wispr_portal_browser_reply_cb,
wp_context->status_url, wp_context);
break;
+
default:
break;
}
free_wispr_routes(wp_context);
wp_context->request_id = 0;
+
+done:
+ return;
+}
+
+static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
+{
+ struct connman_wispr_portal_context *wp_context = user_data;
+ const guint8 *chunk = NULL;
+ int err;
+ gsize length;
+
+ DBG("result %p user_data %p wispr_result %d",
+ result, user_data, wp_context->wispr_result);
+
+ if (wp_context->wispr_result != CONNMAN_WISPR_RESULT_ONLINE) {
+ g_web_result_get_chunk(result, &chunk, &length);
+
+ DBG("length %zu", length);
+
+ if (length > 0) {
+ g_web_parser_feed_data(wp_context->wispr_parser,
+ chunk, length);
+ /* read more data */
+ return true;
+ }
+
+ g_web_parser_end_data(wp_context->wispr_parser);
+
+ DBG("wp_context->wispr_msg.message_type %d", wp_context->wispr_msg.message_type);
+
+ if (wp_context->wispr_msg.message_type >= 0) {
+ if (wispr_manage_message(result, wp_context))
+ goto done;
+ }
+ }
+
+ /* Check whether there was an operating system error while
+ * processing the web request associated with the "online"
+ * HTTP-based Internet reachability check.
+ */
+
+ err = g_web_result_get_err(result);
+
+ DBG("err %d", err);
+
+ if (err < 0)
+ wispr_portal_web_result_err(result, wp_context, err);
+ else
+ wispr_portal_web_result_no_err(result, wp_context);
+
done:
wp_context->wispr_msg.message_type = -1;
@@ -1088,6 +1130,7 @@ done:
* maintaining a weak reference to it.
*/
wispr_portal_context_unref(wp_context);
+
return false;
}
Leverages the newly-added GWeb 'g_web_result_get_err' interface to refactor 'wispr_portal_web_result' into 'wispr_portal_web_result_err' and 'wispr_portal_web_result_no_err' with the former handling non-successful POSIX error domain cases and the latter handling successful HTTP status code cases. Prior to the introduction of 'g_web_result_get_err' and this refactor, there existed a "hole" in the finalization of WISPr IPv4 and IPv6 "online" HTTP-based Internet reachability checks web request sessions that both could and did leave such checks "dangling" and non-renewing such that an expected active, default network service failover does not occur when it should. The "hole" involves an end-of-file (EOF) condition. In the normal case, there are a series of one or more data receipts for the web request as headers of the request response are fulfilled. When there is no further data to send, the final receive completes a normal EOF that leads to the successful closure of the web request, typically with HTTP 200 "OK" in the nominal success case. However, there is a second EOF case that appears to happen with a random distribution in the nginx server backing the default "online" HTTP-based Internet reachability check URLs, 'ipv[46].connman.net/online/status.html'. In that case, the nginx server appears to periodically do an unexpected and spontaneous remote connection close after the initial connection but before any data has been received. Prior to this change, all such failures hit the same WISPr error-handling block which effectively maps such a failure to the effective 'GWebResult' "null" GWEB_HTTP_STATUS_CODE_UNKNOWN status value. Unfortunately, WISPr historically had no way to distinguish this as an actual failure or success and so it lands on the case: case GWEB_HTTP_STATUS_CODE_UNKNOWN: wispr_portal_context_ref(wp_context); __connman_agent_request_browser(wp_context->service, wispr_portal_browser_reply_cb, wp_context->status_url, wp_context); which does not "bookend" the original, initiating WISPr web request and leaves the original request "dangling" and non-renewed, eventually leading to the aforementioned "hole". With this change, the second, failure EOF case will now return '-ECONNRESET' from 'g_web_result_get_err' and will be handled as a failure by 'wispr_portal_web_result_err', "bookending" the original "online" HTTP-based Internet reachability check. All of the prior HTTP status code cases are handled by 'wispr_portal_web_result_no_err'. --- src/wispr.c | 93 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 25 deletions(-)