Proper timers for address fail test

huitema · huitema · commit f209630a334b · 2025-03-23T18:32:36.000-07:00
diff --git a/picoquic/picoquic_internal.h b/picoquic/picoquic_internal.h
@@ -1597,6 +1597,7 @@ int picoquic_create_path(picoquic_cnx_t* cnx, uint64_t start_time,
     uint64_t unique_path_id);
 void picoquic_register_path(picoquic_cnx_t* cnx, picoquic_path_t * path_x);
 int picoquic_renew_connection_id(picoquic_cnx_t* cnx, int path_id);
+void picoquic_delete_tuple(picoquic_path_t* path_x, picoquic_tuple_t* tuple);
 void picoquic_delete_path(picoquic_cnx_t* cnx, int path_index);
 void picoquic_demote_path(picoquic_cnx_t* cnx, int path_index, uint64_t current_time, uint64_t reason, char const * phrase);
 void picoquic_retransmit_demoted_path(picoquic_cnx_t* cnx, picoquic_path_t* path_x, uint64_t current_time);
diff --git a/picoquic/sender.c b/picoquic/sender.c
@@ -4008,7 +4008,7 @@ uint64_t  picoquic_tuple_challenge_time(picoquic_path_t* path_x, picoquic_tuple_
     }
     else {
         if (tuple->challenge_repeat_count >= 2) {
-            next_challenge_time += path_x->retransmit_timer << (path_x->first_tuple->challenge_repeat_count - 1);
+            next_challenge_time += path_x->retransmit_timer << (tuple->challenge_repeat_count - 1);
         }
         else {
             next_challenge_time += PICOQUIC_INITIAL_RETRANSMIT_TIMER;
diff --git a/picoquictest/tls_api_test.c b/picoquictest/tls_api_test.c
@@ -6564,7 +6564,7 @@ int migration_fail_test()
     }
 
     if (ret == 0) {
-        ret = tls_api_one_scenario_body_verify(test_ctx, &simulated_time, 1000000);
+        ret = tls_api_one_scenario_body_verify(test_ctx, &simulated_time, 1100000);
     }
 
     if (test_ctx != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -4008,7 +4008,7 @@ uint64_t picoquic_tuple_challenge_time(picoquic_path_t* path_x, picoquic_tuple_`
`4008`	`4008`	`}`
`4009`	`4009`	`else {`
`4010`	`4010`	`if (tuple->challenge_repeat_count >= 2) {`
`4011`		`- next_challenge_time += path_x->retransmit_timer << (path_x->first_tuple->challenge_repeat_count - 1);`
	`4011`	`+ next_challenge_time += path_x->retransmit_timer << (tuple->challenge_repeat_count - 1);`
`4012`	`4012`	`}`
`4013`	`4013`	`else {`
`4014`	`4014`	`next_challenge_time += PICOQUIC_INITIAL_RETRANSMIT_TIMER;`
Original file line number	Diff line number	Diff line change
`@@ -6564,7 +6564,7 @@ int migration_fail_test()`
`6564`	`6564`	`}`
`6565`	`6565`
`6566`	`6566`	`if (ret == 0) {`
`6567`		`- ret = tls_api_one_scenario_body_verify(test_ctx, &simulated_time, 1000000);`
	`6567`	`+ ret = tls_api_one_scenario_body_verify(test_ctx, &simulated_time, 1100000);`
`6568`	`6568`	`}`
`6569`	`6569`
`6570`	`6570`	`if (test_ctx != NULL) {`