Port all old multipath tests

Author: huitema

UnitTest1/unittest1.cpp

@@ -2428,7 +2428,6 @@ namespace UnitTest1
 
             Assert::AreEqual(ret, 0);
         }
-#if 0
         TEST_METHOD(multipath_aead) {
             int ret = multipath_aead_test();
 
@@ -2554,7 +2553,7 @@ namespace UnitTest1
 
             Assert::AreEqual(ret, 0);
         }
-#endif
+
         TEST_METHOD(m_unip_basic) {
             int ret = m_unip_basic_test();
 

picoquic/picoquic_internal.h

@@ -668,7 +668,7 @@ typedef struct st_picoquic_quic_t {
     unsigned int test_large_server_flight : 1; /* Use TP to ensure server flight is at least 8K */
     unsigned int is_port_blocking_disabled : 1; /* Do not check client port on incoming connections */
     unsigned int are_path_callbacks_enabled : 1; /* Enable path specific callbacks by default */
-
+    unsigned int use_predictable_random : 1; /* For logging tests */
     picoquic_stateless_packet_t* pending_stateless_packet;
 
     picoquic_congestion_algorithm_t const* default_congestion_alg;

picoquic/sender.c

@@ -2901,7 +2901,9 @@ void picoquic_ready_state_transition(picoquic_cnx_t* cnx, uint64_t current_time)
     picoquic_implicit_handshake_ack(cnx, picoquic_packet_context_handshake, current_time);
 
     (void)picoquic_register_net_secret(cnx);
-    picoquic_public_random_seed(cnx->quic);
+    if (!cnx->quic->use_predictable_random) {
+        picoquic_public_random_seed(cnx->quic);
+    }
 
     if (!cnx->client_mode) {
         (void)picoquic_queue_handshake_done_frame(cnx);

picoquic_t/picoquic_t.c

@@ -427,7 +427,6 @@ static const picoquic_test_def_t test_table[] = {
     { "monopath_rotation", monopath_rotation_test },
     { "monopath_0rtt", monopath_0rtt_test },
     { "monopath_0rtt_loss", monopath_0rtt_loss_test },
-#if 0
     { "multipath_aead", multipath_aead_test },
     { "multipath_basic", multipath_basic_test },
     { "multipath_drop_first", multipath_drop_first_test },
@@ -449,7 +448,6 @@ static const picoquic_test_def_t test_table[] = {
     { "multipath_standby", multipath_standby_test },
     { "multipath_standup", multipath_standup_test },
     { "multipath_qlog", multipath_qlog_test },
-#endif
     { "m_unip_basic", m_unip_basic_test },
     { "m_unip_drop_first", m_unip_drop_first_test },
     { "m_unip_drop_second", m_unip_drop_second_test },

picoquictest/multipath_qlog_ref.txt

@@ -1052,7 +1052,6 @@ int multipath_test_one(uint64_t max_completion_microsec, multipath_test_enum_t t
     return ret;
 }
 
-#if 0
 /* Basic multipath test. Set up two links in parallel, verify that both are used and that
  * the overall transmission is shorterthan if only one link was used.
  */
@@ -1061,7 +1060,7 @@ int multipath_basic_test()
 {
     uint64_t max_completion_microsec = 1060000;
 
-    return multipath_test_one(max_completion_microsec, multipath_test_basic, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_basic, multipath_variant_unique);
 }
 
 /* Drop first multipath test. Set up two links in parallel, start using them, then
@@ -1072,7 +1071,7 @@ int multipath_drop_first_test()
 {
     uint64_t max_completion_microsec = 1490000;
 
-    return multipath_test_one(max_completion_microsec, multipath_test_drop_first, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_drop_first, multipath_variant_unique);
 }
 
 /* Drop second multipath test. Set up two links in parallel, start using them, then
@@ -1083,7 +1082,7 @@ int multipath_drop_second_test()
 {
     uint64_t max_completion_microsec = 1260000;
 
-    return multipath_test_one(max_completion_microsec, multipath_test_drop_second, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_drop_second, multipath_variant_unique);
 }
 
 /* Simulate the combination of a satellite link and a low latency low bandwidth
@@ -1093,7 +1092,7 @@ int multipath_sat_plus_test()
 {
     uint64_t max_completion_microsec = 10000000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_sat_plus, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_sat_plus, multipath_variant_unique);
 }
 
 /* Test the renewal of the connection ID on a path
@@ -1102,7 +1101,7 @@ int multipath_renew_test()
 {
     uint64_t max_completion_microsec = 3000000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_renew, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_renew, multipath_variant_unique);
 }
 
 /* Test key rotation in a multipath setup
@@ -1111,15 +1110,15 @@ int multipath_rotation_test()
 {
     uint64_t max_completion_microsec = 3000000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_rotation, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_rotation, multipath_variant_unique);
 }
 
 /* Test nat traversal in a multipath setup */
 int multipath_nat_test()
 {
     uint64_t max_completion_microsec = 3000000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_nat, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_nat, multipath_variant_unique);
 }
 
 /* Test that breaking paths are removed after some time
@@ -1128,7 +1127,7 @@ int multipath_break1_test()
 {
     uint64_t max_completion_microsec = 10800000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_break1, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_break1, multipath_variant_unique);
 }
 
 /* Test reaction to socket error on second path
@@ -1137,7 +1136,7 @@ int multipath_socket_error_test()
 {
     uint64_t max_completion_microsec = 10900000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_break2, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_break2, multipath_variant_unique);
 }
 
 /* Test that abandoned paths are removed after some time
@@ -1146,24 +1145,25 @@ int multipath_abandon_test()
 {
     uint64_t max_completion_microsec = 3800000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_abandon, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_abandon, multipath_variant_unique);
 }
 
 /* Test that breaking paths can come back up after some time
  */
 int multipath_back1_test()
 {
-    uint64_t max_completion_microsec = 3050000;
+    /* TODO: investigate why 3.3 instead of 3.05 with prior implementation of multipath */
+    uint64_t max_completion_microsec = 3300000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_back1, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_back1, multipath_variant_unique);
 }
 
 /* Test that a typical wifi+lte scenario provides good performance */
 int multipath_perf_test()
 {
     uint64_t max_completion_microsec = 1550000;
 
-    return  multipath_test_one(max_completion_microsec, multipath_test_perf, multipath_variant_cid);
+    return  multipath_test_one(max_completion_microsec, multipath_test_perf, multipath_variant_unique);
 }
 
 #if defined(_WINDOWS) && !defined(_WINDOWS64)
@@ -1182,7 +1182,7 @@ int multipath_callback_test()
     uint64_t max_completion_microsec = 1000000;
 #endif
 
-    return multipath_test_one(max_completion_microsec, multipath_test_callback, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_callback, multipath_variant_unique);
 }
 #endif
 
@@ -1203,45 +1203,46 @@ int multipath_quality_test()
 #endif
 
 
-    return multipath_test_one(max_completion_microsec, multipath_test_quality, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_quality, multipath_variant_unique);
 }
 #endif
 
 int multipath_stream_af_test()
 {
     uint64_t max_completion_microsec = 1500000;
 
-    return multipath_test_one(max_completion_microsec, multipath_test_stream_af, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_stream_af, multipath_variant_unique);
 }
 
 int multipath_datagram_test()
 {
-    uint64_t max_completion_microsec = 1100000;
+    /* TODO: investigate why 1.15 instead of 1.12 with prior implementation of multipath */
+    uint64_t max_completion_microsec = 1150000;
 
-    return multipath_test_one(max_completion_microsec, multipath_test_datagram, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_datagram, multipath_variant_unique);
 }
 
 int multipath_dg_af_test()
 {
     uint64_t max_completion_microsec = 1100000;
 
-    return multipath_test_one(max_completion_microsec, multipath_test_dg_af, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_dg_af, multipath_variant_unique);
 }
 
 int multipath_standby_test()
 {
     uint64_t max_completion_microsec = 2000000;
 
-    return multipath_test_one(max_completion_microsec, multipath_test_standby, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_standby, multipath_variant_unique);
 }
 
 int multipath_standup_test()
 {
     uint64_t max_completion_microsec = 3000000;
 
-    return multipath_test_one(max_completion_microsec, multipath_test_standup, multipath_variant_cid);
+    return multipath_test_one(max_completion_microsec, multipath_test_standup, multipath_variant_unique);
 }
-#endif
+
 /* Monopath tests:
  * Enable the multipath option, but use only a single path. The gal of the tests is to verify that
  * these "monopath" scenarios perform just as well as if multipath was not enabled.
@@ -1482,6 +1483,8 @@ int multipath_trace_test_one(int is_simple_multipath)
     picoquic_tp_t server_parameters;
     picoquic_tp_t client_parameters;
     uint64_t loss_mask = 0;
+    multipath_variant_enum m_variant = (is_simple_multipath) ?
+        multipath_variant_simple : multipath_variant_unique;
 
     if (ret == 0 && test_ctx == NULL) {
         ret = -1;
@@ -1509,10 +1512,12 @@ int multipath_trace_test_one(int is_simple_multipath)
         test_ctx->c_to_s_link->queue_delay_max = 2 * test_ctx->c_to_s_link->microsec_latency;
         test_ctx->s_to_c_link->queue_delay_max = 2 * test_ctx->s_to_c_link->microsec_latency;
         /* Set the multipath option at both client and server */
-        multipath_init_params(&server_parameters, 1, is_simple_multipath);
+        multipath_init_params(&server_parameters, 1, m_variant);
         picoquic_set_default_tp(test_ctx->qserver, &server_parameters);
-        multipath_init_params(&client_parameters, 1, is_simple_multipath);
+        multipath_init_params(&client_parameters, 1, m_variant);
         picoquic_set_default_tp(test_ctx->qclient, &server_parameters);
+        test_ctx->qclient->use_predictable_random = 1;
+        test_ctx->qserver->use_predictable_random = 1;
 
         /* Force ciphersuite to AES128, so Client Hello has a constant format */
         if (picoquic_set_cipher_suite(test_ctx->qclient, PICOQUIC_AES_128_GCM_SHA256) != 0) {
@@ -1523,6 +1528,8 @@ int multipath_trace_test_one(int is_simple_multipath)
         }
         /* Delete the old connection */
         picoquic_delete_cnx(test_ctx->cnx_client);
+        /* Reset the uniform random test */
+        picoquic_public_random_seed_64(RANDOM_PUBLIC_TEST_SEED, 1);
         /* re-create a client connection, this time picking up the required connection ID */
         test_ctx->cnx_client = picoquic_create_cnx(test_ctx->qclient, qlog_multipath_initial_cid, picoquic_null_connection_id,
             (struct sockaddr*) & test_ctx->server_addr, 0,

picoquictest/multipath_test.c

@@ -1,4 +1,4 @@
 Time, Path-ID, Event,
-64714, 1, 20,
-1141623, 1, 22,
-1141623, 0, 22,
+65579, 1, 20,
+1159758, 1, 22,
+1159758, 0, 22,

picoquictest/path_callback_ref.txt

@@ -1,34 +1,32 @@
 Time, Path-ID, Event, Pacing_rate, Receive Rate, CWIN, RTT
 22002, 0, 23, 872647, 0, 15360, 22002
-64714, 1, 23, 0, 0, 15360, 22002
-64714, 1, 20,
-68712, 0, 23, 873799, 258249, 15360, 21973
-68712, 1, 23, 853295, 0, 15360, 22501
-95661, 0, 23, 865878, 773327, 15360, 22174
-95661, 1, 23, 849632, 116270, 15360, 22598
-118269, 0, 23, 865878, 1095547, 15360, 22174
-118269, 1, 23, 849632, 772344, 15360, 22598
-136685, 0, 23, 854510, 1251086, 15360, 22469
-136685, 1, 23, 837367, 1251086, 15360, 22929
-176707, 0, 23, 788954, 1251086, 15360, 24336
-179272, 0, 23, 729233, 1251086, 15360, 26329
-179272, 1, 23, 766130, 1251086, 15360, 25061
-259708, 1, 23, 694293, 1251221, 15360, 27654
-302558, 0, 23, 670367, 1251086, 15360, 28641
-305791, 1, 23, 629095, 1251086, 15360, 30520
-363177, 1, 23, 621661, 988417, 15360, 30885
-408760, 1, 23, 631724, 764498, 15360, 30393
-447283, 0, 23, 709429, 1058527, 15360, 27064
-447283, 1, 23, 654597, 867078, 15360, 29331
-491607, 0, 23, 723927, 856812, 15360, 26522
-491607, 1, 23, 673542, 1251086, 15360, 28506
-533848, 0, 23, 746587, 926806, 15360, 25717
-547306, 0, 23, 746587, 623811, 15360, 25717
-608102, 0, 23, 762631, 1096474, 15360, 25176
-656444, 0, 23, 768276, 1251086, 15360, 24991
-793499, 0, 23, 715937, 1251086, 15360, 26818
-900628, 0, 23, 660224, 1251086, 15360, 29081
-900628, 1, 23, 607037, 1251086, 15360, 31629
-975279, 0, 23, 644966, 719124, 15360, 29769
-1141623, 1, 22,
-1141623, 0, 22,
+65579, 1, 23, 0, 0, 15360, 22002
+65579, 1, 20,
+68426, 0, 23, 877393, 70283, 15360, 21883
+68426, 1, 23, 858791, 0, 15360, 22357
+87581, 0, 23, 877393, 253342, 15360, 21883
+113379, 0, 23, 873720, 1031103, 15360, 21975
+113379, 1, 23, 854206, 770003, 15360, 22477
+151362, 0, 23, 836273, 1251086, 15360, 22959
+151362, 1, 23, 816118, 1251086, 15360, 23526
+184521, 0, 23, 780202, 1251086, 15360, 24609
+184521, 1, 23, 759613, 1251086, 15360, 25276
+323690, 1, 23, 710321, 980645, 15360, 27030
+366655, 0, 23, 772107, 1019244, 15360, 24867
+400085, 1, 23, 733580, 1203094, 15360, 26173
+442034, 0, 23, 783545, 863827, 15360, 24504
+455282, 0, 23, 783545, 917380, 15360, 24504
+484022, 0, 23, 780964, 1146725, 15360, 24585
+522992, 0, 23, 799267, 1212996, 15360, 24022
+528747, 0, 23, 799267, 824373, 15360, 24022
+606935, 0, 23, 807333, 1251086, 15360, 23782
+695605, 0, 23, 756262, 1251086, 15360, 25388
+742839, 1, 23, 657376, 1251086, 15360, 29207
+785426, 0, 23, 700193, 1251086, 15360, 27421
+839230, 1, 23, 618238, 1074667, 15360, 31056
+884248, 1, 23, 630210, 764498, 15360, 30466
+926128, 1, 23, 640790, 840191, 15360, 29963
+993242, 1, 23, 653216, 1143651, 15360, 29393
+999434, 1, 23, 663235, 118281, 15360, 28949
+1159758, 1, 22,
+1159758, 0, 22,

picoquictest/path_quality_ref.txt

@@ -421,7 +421,6 @@ int monopath_hole_test();
 int monopath_rotation_test();
 int monopath_0rtt_test();
 int monopath_0rtt_loss_test();
-#if 0
 int multipath_aead_test();
 int multipath_basic_test();
 int multipath_drop_first_test();
@@ -443,7 +442,6 @@ int multipath_dg_af_test();
 int multipath_standby_test();
 int multipath_standup_test();
 int multipath_qlog_test();
-#endif
 int m_unip_basic_test();
 int m_unip_drop_first_test();
 int m_unip_drop_second_test();