diff --git a/UnitTest1/unittest1.cpp b/UnitTest1/unittest1.cpp
index 93ac067e4280089a17b92f3ff23e53cdb7544225..790238ef96c84b72279dfd082dae50b0142bb928 100644
--- a/UnitTest1/unittest1.cpp
+++ b/UnitTest1/unittest1.cpp
@@ -749,6 +749,13 @@ namespace UnitTest1
Assert::AreEqual(ret, 0);
}
+
+ TEST_METHOD(padding)
+ {
+ int ret = padding_test();
+
+ Assert::AreEqual(ret, 0);
+ }
TEST_METHOD(stress)
{
diff --git a/picoquic/picoquic.h b/picoquic/picoquic.h
index a83bb794ae779b95908db81062944bc156ffecb3..27db23154f8b22215471ce2dfd24739024cc36ed 100644
--- a/picoquic/picoquic.h
+++ b/picoquic/picoquic.h
@@ -349,6 +349,7 @@ int picoquic_set_verify_certificate_callback(picoquic_quic_t* quic, picoquic_ver
void picoquic_set_client_authentication(picoquic_quic_t* quic, int client_authentication);
/* Set default padding policy for the context */
+void picoquic_set_default_padding(picoquic_quic_t* quic, uint32_t padding_multiple, uint32_t padding_minsize);
/* Connection context creation and registration */
picoquic_cnx_t* picoquic_create_cnx(picoquic_quic_t* quic,
diff --git a/picoquic/sender.c b/picoquic/sender.c
index 0d438f06b710eb7222b3b3cb510912dd0f89d2ae..18a804063965ee1f29a5988f5dc668001f116fff 100644
--- a/picoquic/sender.c
+++ b/picoquic/sender.c
@@ -1199,9 +1199,6 @@ int picoquic_prepare_packet_0rtt(picoquic_cnx_t* cnx, picoquic_path_t * path_x,
if (padding_required) {
length = picoquic_pad_to_target_length(bytes, length, (uint32_t)(send_buffer_max - checksum_overhead));
}
- else {
- length = picoquic_pad_to_policy(cnx, bytes, length, (uint32_t)(send_buffer_max - checksum_overhead));
- }
}
picoquic_finalize_and_protect_packet(cnx, packet,
@@ -1516,9 +1513,6 @@ int picoquic_prepare_packet_client_init(picoquic_cnx_t* cnx, picoquic_path_t * p
* initial packet will be coalesced with 0-RTT packet */
length = picoquic_pad_to_target_length(bytes, length, (uint32_t)(send_buffer_max - checksum_overhead));
}
- else {
- length = picoquic_pad_to_policy(cnx, bytes, length, (uint32_t)(send_buffer_max - checksum_overhead));
- }
if (packet_type == picoquic_packet_0rtt_protected) {
cnx->nb_zero_rtt_sent++;
@@ -2303,7 +2297,7 @@ int picoquic_prepare_packet_ready(picoquic_cnx_t* cnx, picoquic_path_t * path_x,
}
if (length > header_length) {
- length = picoquic_pad_to_policy(cnx, bytes, length, (uint32_t)(send_buffer_max - checksum_overhead));
+ length = picoquic_pad_to_policy(cnx, bytes, length, (uint32_t)(send_buffer_min_max - checksum_overhead));
}
else if (ret == 0 && send_buffer_max > path_x->send_mtu
&& path_x->cwin > path_x->bytes_in_transit && picoquic_is_mtu_probe_needed(cnx, path_x)) {
diff --git a/picoquic_t/picoquic_t.c b/picoquic_t/picoquic_t.c
index 3feb742ffc0e82c4fd5e08045dc88190e254a41a..83f50e766bdd754ffb18178fdb137e9d42c73c46 100644
--- a/picoquic_t/picoquic_t.c
+++ b/picoquic_t/picoquic_t.c
@@ -147,6 +147,7 @@ static const picoquic_test_def_t test_table[] = {
{ "key_rotation_stress", key_rotation_stress_test },
{ "short_initial_cid", short_initial_cid_test },
{ "stream_id_max", stream_id_max_test },
+ { "padding_test", padding_test },
{ "stress", stress_test },
{ "fuzz", fuzz_test },
{ "fuzz_initial", fuzz_initial_test}
diff --git a/picoquictest/picoquictest.h b/picoquictest/picoquictest.h
index 310db4d6b83385a8c53fb3b0f8ec5f2b255a3a8e..fbda0c43b8eac32e221d07accc7504bba0c0ddcc 100644
--- a/picoquictest/picoquictest.h
+++ b/picoquictest/picoquictest.h
@@ -145,6 +145,7 @@ int key_rotation_stress_test();
int short_initial_cid_test();
int stream_id_max_test();
int stream_id_to_rank_test();
+int padding_test();
#ifdef __cplusplus
}
diff --git a/picoquictest/tls_api_test.c b/picoquictest/tls_api_test.c
index 5d462b9ff0026e5ec37fb3f2a00a1fd09792c5ea..93cda6aa48a9172792579d9a3a32851a31f8d71e 100644
--- a/picoquictest/tls_api_test.c
+++ b/picoquictest/tls_api_test.c
@@ -158,10 +158,10 @@ static test_api_stream_desc_t test_scenario_many_streams[] = {
{ 8, 0, 32, 1000 },
{ 12, 0, 32, 1000 },
{ 16, 0, 32, 1000 },
- { 20, 0, 32, 1000 },
- { 24, 0, 32, 1000 },
- { 28, 0, 32, 1000 },
- { 32, 0, 32, 1000 }
+ { 20, 0, 32, 350 },
+ { 24, 0, 32, 225 },
+ { 28, 0, 32, 700 },
+ { 32, 0, 32, 1500 }
};
static int test_api_init_stream_buffers(size_t len, uint8_t** src_bytes, uint8_t** rcv_bytes)
@@ -1237,17 +1237,15 @@ int tls_api_wrong_alpn_test()
* Scenario based transmission tests.
*/
-int tls_api_one_scenario_test(test_api_stream_desc_t* scenario,
- size_t sizeof_scenario, uint64_t init_loss_mask, uint64_t max_data, uint64_t queue_delay_max,
- uint32_t proposed_version, uint64_t max_completion_microsec,
+int tls_api_one_scenario_init(
+ picoquic_test_tls_api_ctx_t** p_test_ctx, uint64_t * simulated_time,
+ uint32_t proposed_version,
picoquic_tp_t * client_params, picoquic_tp_t * server_params)
{
- uint64_t simulated_time = 0;
uint64_t loss_mask = 0;
- picoquic_test_tls_api_ctx_t* test_ctx = NULL;
- int ret = tls_api_init_ctx(&test_ctx,
+ int ret = tls_api_init_ctx(p_test_ctx,
(proposed_version == 0) ? PICOQUIC_INTERNAL_TEST_VERSION_1 : proposed_version,
- PICOQUIC_TEST_SNI, PICOQUIC_TEST_ALPN, &simulated_time, NULL, 0, 1, 0);
+ PICOQUIC_TEST_SNI, PICOQUIC_TEST_ALPN, simulated_time, NULL, 0, 1, 0);
if (ret != 0)
{
@@ -1255,24 +1253,36 @@ int tls_api_one_scenario_test(test_api_stream_desc_t* scenario,
}
if (ret == 0 && client_params != NULL) {
- picoquic_set_transport_parameters(test_ctx->cnx_client, client_params);
+ picoquic_set_transport_parameters((*p_test_ctx)->cnx_client, client_params);
}
if (ret == 0 && server_params != NULL) {
- ret = picoquic_set_default_tp(test_ctx->qserver, server_params);
+ ret = picoquic_set_default_tp((*p_test_ctx)->qserver, server_params);
}
+ return ret;
+}
+
+int tls_api_one_scenario_body(picoquic_test_tls_api_ctx_t* test_ctx,
+ uint64_t * simulated_time,
+ test_api_stream_desc_t* scenario,
+ size_t sizeof_scenario, uint64_t init_loss_mask, uint64_t max_data, uint64_t queue_delay_max,
+ uint64_t max_completion_microsec)
+{
+ int ret = 0;
+ uint64_t loss_mask = 0;
+
if (ret == 0) {
ret = picoquic_start_client_cnx(test_ctx->cnx_client);
if (ret != 0)
{
- DBG_PRINTF("%s", "Could not initialize stream zero for the client\n");
+ DBG_PRINTF("%s", "Could not initialize connection for the client\n");
}
}
-
+
if (ret == 0) {
- ret = tls_api_connection_loop(test_ctx, &loss_mask, queue_delay_max, &simulated_time);
+ ret = tls_api_connection_loop(test_ctx, &loss_mask, queue_delay_max, simulated_time);
if (ret != 0)
{
@@ -1300,7 +1310,7 @@ int tls_api_one_scenario_test(test_api_stream_desc_t* scenario,
/* Perform a data sending loop */
if (ret == 0) {
- ret = tls_api_data_sending_loop(test_ctx, &loss_mask, &simulated_time, 0);
+ ret = tls_api_data_sending_loop(test_ctx, &loss_mask, simulated_time, 0);
if (ret != 0)
{
@@ -1311,15 +1321,19 @@ int tls_api_one_scenario_test(test_api_stream_desc_t* scenario,
if (ret == 0) {
if (test_ctx->server_callback.error_detected) {
ret = -1;
- } else if (test_ctx->client_callback.error_detected) {
+ }
+ else if (test_ctx->client_callback.error_detected) {
ret = -1;
- } else {
+ }
+ else {
for (size_t i = 0; ret == 0 && i < test_ctx->nb_test_streams; i++) {
if (test_ctx->test_stream[i].q_recv_nb != test_ctx->test_stream[i].q_len) {
ret = -1;
- } else if (test_ctx->test_stream[i].r_recv_nb != test_ctx->test_stream[i].r_len) {
+ }
+ else if (test_ctx->test_stream[i].r_recv_nb != test_ctx->test_stream[i].r_len) {
ret = -1;
- } else if (test_ctx->test_stream[i].q_received == 0 || test_ctx->test_stream[i].r_received == 0) {
+ }
+ else if (test_ctx->test_stream[i].q_received == 0 || test_ctx->test_stream[i].r_received == 0) {
ret = -1;
}
}
@@ -1339,13 +1353,34 @@ int tls_api_one_scenario_test(test_api_stream_desc_t* scenario,
}
if (ret == 0 && max_completion_microsec != 0) {
- if (simulated_time > max_completion_microsec)
+ if (*simulated_time > max_completion_microsec)
{
- DBG_PRINTF("Scenario completes in %llu microsec, more than %llu\n", simulated_time, max_completion_microsec);
+ DBG_PRINTF("Scenario completes in %llu microsec, more than %llu\n",
+ (unsigned long long)*simulated_time, (unsigned long long)max_completion_microsec);
ret = -1;
}
}
+ return ret;
+}
+
+int tls_api_one_scenario_test(test_api_stream_desc_t* scenario,
+ size_t sizeof_scenario, uint64_t init_loss_mask, uint64_t max_data, uint64_t queue_delay_max,
+ uint32_t proposed_version, uint64_t max_completion_microsec,
+ picoquic_tp_t * client_params, picoquic_tp_t * server_params)
+{
+ uint64_t simulated_time = 0;
+ picoquic_test_tls_api_ctx_t* test_ctx = NULL;
+
+ int ret = tls_api_one_scenario_init(&test_ctx, &simulated_time,
+ proposed_version, client_params, server_params);
+
+ if (ret == 0) {
+ ret = tls_api_one_scenario_body(test_ctx, &simulated_time,
+ scenario, sizeof_scenario, init_loss_mask, max_data, queue_delay_max,
+ max_completion_microsec);
+ }
+
if (test_ctx != NULL) {
tls_api_delete_ctx(test_ctx);
test_ctx = NULL;
@@ -4842,4 +4877,45 @@ int stream_id_max_test()
test_parameters.initial_max_stream_id_bidir = 4;
return tls_api_one_scenario_test(test_scenario_many_streams, sizeof(test_scenario_many_streams), 0, 0, 0, 0, 250000, NULL, &test_parameters);
+}
+
+/*
+ * Test whether padding policy is correctly applied, and whether the corresponding
+ * connection succeeds.
+ */
+
+int padding_test()
+{
+ uint64_t simulated_time = 0;
+ uint64_t loss_mask = 0;
+ picoquic_test_tls_api_ctx_t* test_ctx = NULL;
+ int ret = tls_api_init_ctx(&test_ctx, PICOQUIC_INTERNAL_TEST_VERSION_1, PICOQUIC_TEST_SNI, PICOQUIC_TEST_ALPN, &simulated_time, NULL, 0, 1, 0);
+
+ if (ret == 0 && test_ctx == NULL) {
+ ret = -1;
+ }
+
+ /* Set the padding policy in the server context and in the client connection
+ */
+ if (ret == 0) {
+ picoquic_set_default_padding(test_ctx->qserver, 128, 64);
+ picoquic_cnx_set_padding_policy(test_ctx->cnx_client, 128, 64);
+ }
+
+ /* Run a basic test scenario
+ */
+ if (ret == 0) {
+ ret = tls_api_one_scenario_body(test_ctx, &simulated_time,
+ test_scenario_many_streams, sizeof(test_scenario_many_streams), 0, 0, 0, 250000);
+ }
+
+ /* And then free the resource
+ */
+
+ if (test_ctx != NULL) {
+ tls_api_delete_ctx(test_ctx);
+ test_ctx = NULL;
+ }
+
+ return ret;
}
\ No newline at end of file