ctest: more reliability meddling

Author: lws-team

lib/roles/h2/http2.c

@@ -2594,6 +2594,8 @@ lws_h2_client_handshake(struct lws *wsi)
 		n--;
 	}
 
+	lwsl_hexdump_notice(path, (size_t)n);
+
 	if (n && lws_add_http_header_by_token(wsi,
 				WSI_TOKEN_HTTP_COLON_PATH,
 				(unsigned char *)path, n, &p, end))

lib/secure-streams/protocols/ss-h1.c

@@ -1220,6 +1220,9 @@ secstream_connect_munge_h1(lws_ss_handle_t *h, char *buf, size_t len,
 			      &used_in, &used_out) != LSTRX_DONE)
 		return 1;
 
+	if (used_out + 1 < len - 1)
+		buf[used_out + 1] = '\0';
+
 	return 0;
 }
 

minimal-examples-lowlevel/secure-streams/minimal-secure-streams-hugeurl/minimal-secure-streams.c

@@ -95,7 +95,7 @@ static const char * const default_ss_policy =
 				"\"hugearg\":"		"\"\""
 			"}],"
 			"\"tls\":"			"true,"
-			"\"opportunistic\":"		"true,"
+			// "\"opportunistic\":"		"true,"
 			"\"retry\":"			"\"default\","
 			"\"tls_trust_store\":"		"\"arca1\""
 		"}},{"
@@ -111,7 +111,7 @@ static const char * const default_ss_policy =
 				"\"hugearg\":"		"\"\""
 			"}],"
 			"\"tls\":"			"true,"
-			"\"opportunistic\":"		"true,"
+			// "\"opportunistic\":"		"true,"
 			"\"retry\":"			"\"default\","
 			"\"tls_trust_store\":"		"\"arca1\""
 		"}},{"
@@ -395,6 +395,8 @@ int main(int argc, const char **argv)
 		       LWS_SERVER_OPTION_H2_JUST_FIX_WINDOW_UPDATE_OVERFLOW |
 		       LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT;
 #endif
+	info.connect_timeout_secs = 15; /* httpbin.org seems to need this depending on time of day */
+	info.timeout_secs = 10;
 
 	if (lws_cmdline_option(argc, argv, "--h1"))
 		h1 = 1;

minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c

@@ -18,7 +18,7 @@
 #include <string.h>
 #include <signal.h>
 
-static int interrupted, tests, tests_pass, tests_fail;
+static int interrupted, tests, tests_pass, tests_fail, doing_a_retry;
 static lws_sorted_usec_list_t sul_next_test;
 static lws_state_notify_link_t nl;
 struct lws_context *context;
@@ -642,6 +642,18 @@ myss_state(void *userobj, void *sh, lws_ss_constate_t state,
 		  lws_ss_state_name((int)state), state, (unsigned int)ack);
 
 	if (curr_test->mask_unexpected & (1u << state)) {
+
+		if (state == LWSSSCS_QOS_NACK_REMOTE) {
+
+			lwsl_user("%s: retrying it due to getting NACK\n", __func__);
+
+			doing_a_retry = 1;
+			/* Since this can be the remote server denying it, retry it */
+			lws_sul_schedule(context, 0, &sul_next_test, tests_start_next, 1000);
+
+			return LWSSSSRET_OK;
+		}
+
 		/*
 		 * We have definitively failed on an unexpected state received
 		 */
@@ -690,7 +702,7 @@ myss_state(void *userobj, void *sh, lws_ss_constate_t state,
 		return lws_ss_client_connect(m->ss);
 
 	case LWSSSCS_DESTROYING:
-		if (!m->result_reported) {
+		if (!m->result_reported && !doing_a_retry) {
 			lwsl_user("%s: failing on unexpected destruction\n",
 					__func__);
 
@@ -721,6 +733,8 @@ tests_start_next(lws_sorted_usec_list_t *sul)
 		lws_ss_destroy(&h);
 	}
 
+	doing_a_retry = 0;
+
 	if ((unsigned int)tests >= LWS_ARRAY_SIZE(tests_seq)) {
 		lwsl_notice("Completed all tests\n");
 		interrupted = 1;