Restore some deleted multipath tests

Author: huitema

picoquic/loss_recovery.c

@@ -177,7 +177,22 @@ int picoquic_retransmit_needed(picoquic_cnx_t* cnx,
 {
     size_t length = 0;
 
-    if (cnx->is_simple_multipath_enabled && cnx->cnx_state == picoquic_state_ready) {
+    if (pc == picoquic_packet_context_application && cnx->is_unique_path_id_enabled) {
+        /* If unique multipath is enabled, should check for retransmission on all paths */
+        for (int i=0; i<cnx->nb_paths; i++) {
+            if (length == 0) {
+                length = picoquic_retransmit_needed_loop(cnx, &cnx->path[i]->pkt_ctx, pc, path_x, current_time,
+                    next_wake_time, packet, send_buffer_max, header_length);
+            }
+            else {
+                /* If more retransmission are queued, set the timer appropriately */
+                if (cnx->path[i]->pkt_ctx.pending_first != NULL) {
+                    picoquic_set_wake_up_from_packet_retransmit(cnx, cnx->path[i]->pkt_ctx.pending_first, current_time, next_wake_time);
+                }
+            }
+        }
+    }
+    else if (cnx->is_simple_multipath_enabled && cnx->cnx_state == picoquic_state_ready) {
         /* The per-path algorithm excludes the packets that were sent on
         * a path now deleted. The path is set to NULL. */
         picoquic_packet_t* old_p;

picoquic/quicctx.c

@@ -1825,12 +1825,13 @@ void picoquic_demote_path(picoquic_cnx_t* cnx, int path_index, uint64_t current_
         /* TODO: add suspended callback */
 
         /* if in multipath, call "retransmit on path demoted" */
-        if (cnx->is_unique_path_id_enabled) {
+        if (cnx->is_unique_path_id_enabled || cnx->is_simple_multipath_enabled) {
             if (!cnx->path[path_index]->path_abandon_sent) {
                 uint8_t buffer[512];
                 uint8_t* end_bytes;
                 int more_data = 0;
-                uint64_t path_id = cnx->path[path_index]->unique_path_id;
+                uint64_t path_id = (cnx->is_simple_multipath_enabled)?cnx->path[path_index]->p_remote_cnxid->sequence:
+                    cnx->path[path_index]->unique_path_id;
                 end_bytes = picoquic_format_path_abandon_frame(buffer, buffer + sizeof(buffer), &more_data,
                     path_id, reason, phrase);
                 if (end_bytes != NULL && picoquic_queue_misc_frame(cnx, buffer, end_bytes - buffer, 0) == 0) {

picoquic/sender.c

@@ -4370,7 +4370,7 @@ static int picoquic_select_next_path(picoquic_cnx_t * cnx, uint64_t current_time
 {
     int path_id = -1;
 
-    if (cnx->is_unique_path_id_enabled && cnx->cnx_state >= picoquic_state_ready) {
+    if ((cnx->is_simple_multipath_enabled || cnx->is_unique_path_id_enabled) && cnx->cnx_state >= picoquic_state_ready) {
         return picoquic_select_next_path_mp(cnx, current_time, next_wake_time, p_addr_to, p_addr_from, if_index);
     }