Merge pull request #1798 from private-octopus/code-coverage-202411

Add tests of web transport and more tests of h3zero
private-octopus · Dec 4, 2024 · b2766fa · b2766fa
2 parents 9d82d23 + c4a7118
commit b2766fa
Show file tree

Hide file tree

Showing 9 changed files with 343 additions and 63 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ else()
 endif()
 
 project(picoquic
-        VERSION 1.1.28.9
+        VERSION 1.1.28.10
         DESCRIPTION "picoquic library"
         LANGUAGES C CXX)
 

diff --git a/UnitTest1/unittest1.cpp b/UnitTest1/unittest1.cpp
@@ -2812,6 +2812,12 @@ namespace UnitTest1
             Assert::AreEqual(ret, 0);
         }
 
+        TEST_METHOD(h3zero_capsule) {
+            int ret = h3zero_capsule_test();
+
+            Assert::AreEqual(ret, 0);
+        }
+
         TEST_METHOD(h3zero_client_data) {
             int ret = h3zero_client_data_test();
 
@@ -3110,6 +3116,18 @@ namespace UnitTest1
             Assert::AreEqual(ret, 0);
         }
 
+        TEST_METHOD(picowt_drain) {
+            int ret = picowt_drain_test();
+
+            Assert::AreEqual(ret, 0);
+        }
+
+        TEST_METHOD(picowt_tp) {
+            int ret = picowt_tp_test();
+
+            Assert::AreEqual(ret, 0);
+        }
+
         TEST_METHOD(quicperf_parse) {
             int ret = quicperf_parse_test();
 

diff --git a/picohttp/h3zero_common.c b/picohttp/h3zero_common.c
@@ -2021,40 +2021,30 @@ const uint8_t* h3zero_accumulate_capsule(const uint8_t* bytes, const uint8_t* by
 		}
 		length_of_type = VARINT_LEN_T(capsule->header_buffer, size_t);
 
-		if (length_of_type + 1 > H3ZERO_CAPSULE_HEADER_SIZE_MAX) {
-			bytes = NULL;
+		while (capsule->header_read < length_of_type && bytes < bytes_max) {
+			capsule->header_buffer[capsule->header_read++] = *bytes++;
 		}
-		else {
-			while (capsule->header_read < length_of_type && bytes < bytes_max) {
+		if (capsule->header_read >= length_of_type) {
+			(void)picoquic_frames_varint_decode(capsule->header_buffer, capsule->header_buffer + length_of_type,
+				&capsule->capsule_type);
+
+			while (capsule->header_read < length_of_type + 1 && bytes < bytes_max) {
 				capsule->header_buffer[capsule->header_read++] = *bytes++;
 			}
-			if (capsule->header_read >= length_of_type) {
-				(void)picoquic_frames_varint_decode(capsule->header_buffer, capsule->header_buffer + length_of_type,
-					&capsule->capsule_type);
 
-				while (capsule->header_read < length_of_type + 1 && bytes < bytes_max) {
+			if (capsule->header_read >= length_of_type + 1) {
+				/* No change in state, wait for more bytes */
+				length_of_length = VARINT_LEN_T((capsule->header_buffer + length_of_type), size_t);
+
+				capsule->header_length = length_of_type + length_of_length;
+				while (capsule->header_read < capsule->header_length && bytes < bytes_max) {
 					capsule->header_buffer[capsule->header_read++] = *bytes++;
 				}
-
-				if (capsule->header_read >= length_of_type + 1) {
-					/* No change in state, wait for more bytes */
-					length_of_length = VARINT_LEN_T((capsule->header_buffer + length_of_type), size_t);
-
-					capsule->header_length = length_of_type + length_of_length;
-					if (capsule->header_length > H3ZERO_CAPSULE_HEADER_SIZE_MAX) {
-						bytes = NULL;
-					}
-					else {
-						while (capsule->header_read < capsule->header_length && bytes < bytes_max) {
-							capsule->header_buffer[capsule->header_read++] = *bytes++;
-						}
-						if (capsule->header_read >= capsule->header_length) {
-							(void)picoquic_frames_varlen_decode(capsule->header_buffer + length_of_type,
-								capsule->header_buffer + length_of_type + length_of_length,
-								&capsule->capsule_length);
-							capsule->is_length_known = 1;
-						}
-					}
+				if (capsule->header_read >= capsule->header_length) {
+					(void)picoquic_frames_varlen_decode(capsule->header_buffer + length_of_type,
+						capsule->header_buffer + length_of_type + length_of_length,
+						&capsule->capsule_length);
+					capsule->is_length_known = 1;
 				}
 			}
 		}

diff --git a/picohttp/webtransport.c b/picohttp/webtransport.c
@@ -196,37 +196,19 @@ int picowt_prepare_client_cnx(picoquic_quic_t* quic, struct sockaddr* server_add
 
     /* use the generic H3 callback */
     /* Set the client callback context */
-    if (*p_h3_ctx == NULL) {
-        *p_h3_ctx = h3zero_callback_create_context(NULL);
-    }
-    if (*p_h3_ctx == NULL) {
+    if ((*p_h3_ctx == NULL && (*p_h3_ctx = h3zero_callback_create_context(NULL)) == NULL) ||
+        (*p_cnx == NULL && ((*p_cnx = picoquic_create_cnx(quic, picoquic_null_connection_id, picoquic_null_connection_id,
+            (struct sockaddr*)server_address, current_time, 0, sni, "h3", 1)) == NULL)) ||
+        ((*p_stream_ctx = picowt_set_control_stream(*p_cnx, *p_h3_ctx)) == NULL)) {
         ret = 1;
     }
     else
     {
-        /* Create a client connection */
-        if (*p_cnx == NULL) {
-            *p_cnx = picoquic_create_cnx(quic, picoquic_null_connection_id, picoquic_null_connection_id,
-                (struct sockaddr*)server_address, current_time, 0, sni, "h3", 1);
-        }
-        if (*p_cnx == NULL) {
-            fprintf(stderr, "Could not create connection context\n");
-            ret = -1;
-        }
-        else {
-            picowt_set_transport_parameters(*p_cnx);
-            picoquic_set_callback(*p_cnx, h3zero_callback, *p_h3_ctx);
-            *p_stream_ctx = picowt_set_control_stream(*p_cnx, *p_h3_ctx);
-
-            if (*p_stream_ctx == NULL) {
-                ret = -1;
-            }
-            else {
-                /* Perform the initialization, settings and QPACK streams
-                 */
-                ret = h3zero_protocol_init(*p_cnx);
-            }
-        }
+        picowt_set_transport_parameters(*p_cnx);
+        picoquic_set_callback(*p_cnx, h3zero_callback, *p_h3_ctx);
+        /* Perform the initialization, settings and QPACK streams
+         */
+        ret = h3zero_protocol_init(*p_cnx);
     }
     return ret;
 }

diff --git a/picohttp_t/picohttp_t.c b/picohttp_t/picohttp_t.c
@@ -50,6 +50,7 @@ static const picoquic_test_def_t test_table[] = {
     { "h3zero_incoming_unidir", h3zero_incoming_unidir_test },
     { "h3zero_unidir_error", h3zero_unidir_error_test },
     { "h3zero_setting_error", h3zero_setting_error_test },
+    { "h3zero_capsule", h3zero_capsule_test },
     { "h3zero_client_data", h3zero_client_data_test },
     { "qpack_huffman", qpack_huffman_test },
     { "qpack_huffman_base", qpack_huffman_base_test},
@@ -99,6 +100,8 @@ static const picoquic_test_def_t test_table[] = {
     { "picowt_baton_random", picowt_baton_random_test },
     { "picowt_baton_uri", picowt_baton_uri_test },
     { "picowt_baton_wrong", picowt_baton_wrong_test },
+    { "picowt_drain", picowt_drain_test },
+    { "picowt_tp", picowt_tp_test },
     { "quicperf_parse", quicperf_parse_test },
     { "quicperf_batch", quicperf_batch_test },
     { "quicperf_datagram", quicperf_datagram_test },

diff --git a/picoquic/picoquic.h b/picoquic/picoquic.h
@@ -40,7 +40,7 @@
 extern "C" {
 #endif
 
-#define PICOQUIC_VERSION "1.1.28.9"
+#define PICOQUIC_VERSION "1.1.28.10"
 #define PICOQUIC_ERROR_CLASS 0x400
 #define PICOQUIC_ERROR_DUPLICATE (PICOQUIC_ERROR_CLASS + 1)
 #define PICOQUIC_ERROR_AEAD_CHECK (PICOQUIC_ERROR_CLASS + 3)