diff --git a/picoquic/frames.c b/picoquic/frames.c
index 11a22732f38acbd50beb1e8433535436c6dd9572..e1184583b25556b755fd724f87aaaee5fe16f5da 100644
--- a/picoquic/frames.c
+++ b/picoquic/frames.c
@@ -1646,8 +1646,7 @@ static int picoquic_process_ack_range(
picoquic_packet_t* next = p->next_packet;
picoquic_path_t * old_path = p->send_path;
- /* TODO: understand why we need this check, instead of just a check for NULL */
- if (old_path == cnx->path[0]) {
+ if (old_path != NULL) {
if (cnx->congestion_alg != NULL) {
cnx->congestion_alg->alg_notify(old_path,
picoquic_congestion_notification_acknowledgement,
@@ -1661,6 +1660,7 @@ static int picoquic_process_ack_range(
old_path->mtu_probe_sent = 0;
}
}
+
/* If the packet contained an ACK frame, perform the ACK of ACK pruning logic */
picoquic_process_possible_ack_of_ack_frame(cnx, p);
diff --git a/picoquic/picoquic.h b/picoquic/picoquic.h
index 7f33a1a8f9087c92f08d1c671a56c9e597db64c6..714a435d95555a93da244680f67ef58beed4da76 100644
--- a/picoquic/picoquic.h
+++ b/picoquic/picoquic.h
@@ -208,6 +208,7 @@ typedef struct st_picoquic_packet_t {
unsigned int is_evaluated : 1;
unsigned int is_pure_ack : 1;
unsigned int contains_crypto : 1;
+ unsigned int is_mtu_probe : 1;
uint8_t bytes[PICOQUIC_MAX_PACKET_SIZE];
} picoquic_packet_t;
diff --git a/picoquic/quicctx.c b/picoquic/quicctx.c
index 0ba74a5e1409c60034b7ba6e2e67e9758b7ca8cb..b000d83e3384ca25258cbf34ea7b2dce0406755a 100644
--- a/picoquic/quicctx.c
+++ b/picoquic/quicctx.c
@@ -828,7 +828,7 @@ void picoquic_delete_path(picoquic_cnx_t* cnx, int path_index)
/* Remove old path data from retransmit queue */
for (picoquic_packet_context_enum pc = 0; pc < picoquic_nb_packet_context; pc++)
{
- p = cnx->pkt_ctx[pc].retransmit_oldest;
+ p = cnx->pkt_ctx[pc].retransmit_newest;
while (p != NULL) {
if (p->send_path == path_x) {
diff --git a/picoquic/sender.c b/picoquic/sender.c
index 366c8d9b69efad3669b74a6f8e3d1a91d124cdf4..397e12056f2547dca9d5003b9e18119b8f633bee 100644
--- a/picoquic/sender.c
+++ b/picoquic/sender.c
@@ -840,10 +840,11 @@ int picoquic_retransmit_needed(picoquic_cnx_t* cnx,
/* TODO: while packets are pure ACK, drop them from retransmit queue */
while (p != NULL) {
+ picoquic_path_t * old_path = p->send_path; /* should be the path on which the packet was transmitted */
int should_retransmit = 0;
int timer_based_retransmit = 0;
uint64_t lost_packet_number = p->sequence_number;
- picoquic_packet_t* p_next = p->next_packet;
+ picoquic_packet_t* p_next = p->previous_packet;
uint8_t * new_bytes = packet->bytes;
int ret = 0;
@@ -872,11 +873,11 @@ int picoquic_retransmit_needed(picoquic_cnx_t* cnx,
size_t frame_length = 0;
size_t byte_index = 0; /* Used when parsing the old packet */
size_t checksum_length = 0;
- /* should be the path on which the packet was transmitted */
- picoquic_path_t * old_path = p->send_path;
- /* we'll report it where it got lost */
- if (old_path) old_path->retrans_count++;
+ /* we'll report it where it got lost */
+ if (old_path) {
+ old_path->retrans_count++;
+ }
*header_length = 0;
@@ -934,10 +935,12 @@ int picoquic_retransmit_needed(picoquic_cnx_t* cnx,
*is_cleartext_mode = 1;
}
- if (old_path != NULL && (p->length + p->checksum_overhead) > old_path->send_mtu) {
- /* MTU probe was lost, presumably because of packet too big */
- old_path->mtu_probe_sent = 0;
- old_path->send_mtu_max_tried = (uint32_t)(p->length + p->checksum_overhead);
+ if (packet->is_mtu_probe) {
+ if (old_path != NULL) {
+ /* MTU probe was lost, presumably because of packet too big */
+ old_path->mtu_probe_sent = 0;
+ old_path->send_mtu_max_tried = (uint32_t)(p->length + p->checksum_overhead);
+ }
/* MTU probes should not be retransmitted */
packet_is_pure_ack = 1;
do_not_detect_spurious = 0;
@@ -1017,12 +1020,11 @@ int picoquic_retransmit_needed(picoquic_cnx_t* cnx,
packet->length = length;
cnx->nb_retransmission_total++;
- /* TODO: understand why we need to check for exact path value, instead of NULL */
- if (cnx->congestion_alg != NULL && old_path == cnx->path[0]) {
+ if (cnx->congestion_alg != NULL && old_path != NULL) {
cnx->congestion_alg->alg_notify(old_path,
(timer_based_retransmit == 0) ? picoquic_congestion_notification_repeat : picoquic_congestion_notification_timeout,
0, 0, lost_packet_number, current_time);
- }
+ }
break;
}
@@ -2357,6 +2359,7 @@ int picoquic_prepare_packet_ready(picoquic_cnx_t* cnx, picoquic_path_t * path_x,
length = picoquic_prepare_mtu_probe(cnx, path_x, header_length, checksum_overhead, bytes);
packet->length = length;
packet->send_path = path_x;
+ packet->is_mtu_probe = 1;
path_x->mtu_probe_sent = 1;
is_pure_ack = 0;
}
diff --git a/picoquicfirst/picoquicdemo.c b/picoquicfirst/picoquicdemo.c
index c44037f270aea618aa0a5bdbfb21819b2d91e7b5..b3df8a0689857aa0b303efaed2d153b00bdd5486 100644
--- a/picoquicfirst/picoquicdemo.c
+++ b/picoquicfirst/picoquicdemo.c
@@ -905,7 +905,6 @@ int quic_client_migrate(picoquic_cnx_t * cnx, SOCKET_TYPE * fd, struct sockaddr
{
fprintf(F_log, "Switch to new port, sending probe.\n");
}
- cnx->path[0]->path_is_demoted = 1;
}
}
}
diff --git a/picoquictest/stresstest.c b/picoquictest/stresstest.c
index 4d48d9c4a57c19976e0286381b9b71a4b8de06b0..393a1dbf71eaadc550c42a843f0a11e4c35b454c 100644
--- a/picoquictest/stresstest.c
+++ b/picoquictest/stresstest.c
@@ -47,6 +47,7 @@ uint64_t picoquic_stress_max_bidir = 8 * 4; /* Default to 8 streams max per conn
size_t picoquic_stress_max_open_streams = 4; /* Default to 4 simultaneous streams max per connection */
uint64_t stress_random_ctx = 0xBabaC001BaddBab1ull;
uint32_t picoquic_stress_max_message_before_drop = 25;
+uint32_t picoquic_stress_max_message_before_migrate = 8;
typedef struct st_picoquic_stress_server_callback_ctx_t {
// picoquic_first_server_stream_ctx_t* first_stream;
@@ -65,6 +66,7 @@ typedef struct st_picoquic_stress_client_callback_ctx_t {
uint64_t last_interaction_time;
uint32_t nb_client_streams;
uint32_t message_disconnect_trigger;
+ uint32_t message_migration_trigger;
int progress_observed;
} picoquic_stress_client_callback_ctx_t;
@@ -403,6 +405,13 @@ int stress_client_set_callback(picoquic_cnx_t* cnx)
ctx->message_disconnect_trigger++;
}
+ if ((ctx->message_migration_trigger = (uint32_t)picoquic_test_uniform_random(&stress_random_ctx, 2 * picoquic_stress_max_message_before_migrate)) >= picoquic_stress_max_message_before_migrate) {
+ ctx->message_migration_trigger = 0;
+ }
+ else {
+ ctx->message_migration_trigger++;
+ }
+
stress_client_start_streams(cnx, ctx);
}
}
@@ -501,19 +510,23 @@ static int stress_submit_sp_packets(picoquic_stress_ctx_t * ctx, picoquic_quic_t
return ret;
}
-static int stress_handle_packet_arrival(picoquic_stress_ctx_t * ctx, picoquic_quic_t * q, picoquictest_sim_link_t* link)
+static int stress_handle_packet_arrival(picoquic_stress_ctx_t * ctx, picoquic_quic_t * q, picoquictest_sim_link_t* link, struct sockaddr * dest_addr)
{
int ret = 0;
/* dequeue packet from server to client and submit */
picoquictest_sim_packet_t* packet = picoquictest_sim_link_dequeue(link, ctx->simulated_time);
if (packet != NULL) {
- ret = picoquic_incoming_packet(q, packet->bytes, (uint32_t)packet->length,
- (struct sockaddr*)&packet->addr_from,
- (struct sockaddr*)&packet->addr_to, 0,
- ctx->simulated_time);
- if (ret != 0){
- stress_debug_break();
+ /* Check that the destination address matches the current address */
+ if (picoquic_compare_addr(dest_addr, (struct sockaddr*)&packet->addr_to) == 0) {
+ ret = picoquic_incoming_packet(q, packet->bytes, (uint32_t)packet->length,
+ (struct sockaddr*)&packet->addr_from,
+ (struct sockaddr*)&packet->addr_to, 0,
+ ctx->simulated_time);
+
+ if (ret != 0) {
+ stress_debug_break();
+ }
}
free(packet);
}
@@ -540,8 +553,8 @@ static int stress_handle_packet_prepare(picoquic_stress_ctx_t * ctx, picoquic_qu
struct sockaddr* local_addr = NULL;
/* Check whether immediate abrubt disconnection is required */
- if (c_ctx != NULL && cnx->cnx_state == picoquic_state_disconnected &&
- c_ctx->message_disconnect_trigger == 0) {
+ if (c_ctx != NULL && cnx->cnx_state != picoquic_state_disconnected &&
+ c_ctx->message_disconnect_trigger != 0) {
uint64_t nb_sent = 0;
for (picoquic_packet_context_enum pc = 0; pc < picoquic_nb_packet_context; pc++) {
nb_sent += cnx->pkt_ctx[pc].send_sequence;
@@ -553,6 +566,21 @@ static int stress_handle_packet_prepare(picoquic_stress_ctx_t * ctx, picoquic_qu
}
}
+ if (ret == 0 && c_ctx != NULL && cnx->cnx_state == picoquic_state_ready &&
+ cnx->cnxid_stash_first != NULL && c_ctx->message_migration_trigger != 0 &&
+ cnx->pkt_ctx[picoquic_packet_context_application].send_sequence > c_ctx->message_migration_trigger){
+ /* Simulate a migration */
+ ctx->c_ctx[c_index]->client_addr.sin_port++;
+ ret = picoquic_create_probe(cnx, (struct sockaddr *)&ctx->server_addr, NULL);
+ if (ret != 0) {
+ stress_debug_break();
+ } else {
+ /* Prep for a future migration */
+ c_ctx->message_migration_trigger += 32;
+ }
+ }
+
+
if (c_ctx == NULL || cnx->cnx_state == picoquic_state_disconnected
|| simulate_disconnect == 0) {
ret = picoquic_prepare_packet(cnx, ctx->simulated_time,
@@ -743,7 +771,8 @@ static int stress_loop_poll_context(picoquic_stress_ctx_t * ctx)
if (ret == 0 && ctx->c_ctx[best_index]->s_to_c_link->first_packet != NULL &&
ctx->c_ctx[best_index]->s_to_c_link->first_packet->arrival_time <= ctx->simulated_time) {
/* dequeue packet from server to client and submit */
- ret = stress_handle_packet_arrival(ctx, ctx->c_ctx[best_index]->qclient, ctx->c_ctx[best_index]->s_to_c_link);
+ ret = stress_handle_packet_arrival(ctx, ctx->c_ctx[best_index]->qclient, ctx->c_ctx[best_index]->s_to_c_link,
+ (struct sockaddr *)&ctx->c_ctx[best_index]->client_addr);
if (ret != 0) {
stress_debug_break();
}
@@ -752,7 +781,8 @@ static int stress_loop_poll_context(picoquic_stress_ctx_t * ctx)
if (ret == 0 && ctx->c_ctx[best_index]->c_to_s_link->first_packet != NULL &&
ctx->c_ctx[best_index]->c_to_s_link->first_packet->arrival_time <= ctx->simulated_time) {
/* dequeue packet from client to server and submit */
- ret = stress_handle_packet_arrival(ctx, ctx->qserver, ctx->c_ctx[best_index]->c_to_s_link);
+ ret = stress_handle_packet_arrival(ctx, ctx->qserver, ctx->c_ctx[best_index]->c_to_s_link,
+ (struct sockaddr *)&ctx->server_addr);
if (ret != 0) {
stress_debug_break();
}