Merge pull request private-octopus#1646 from private-octopus/always-m…

…p_new_cid-if-unique Always use MB NEW CID if unique path ID negotiated
hfstco · Mar 1, 2024 · 8db276e · 8db276e
2 parents 28cf9e6 + dc6668e
commit 8db276e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/picoquic/frames.c b/picoquic/frames.c
@@ -376,9 +376,9 @@ uint8_t * picoquic_format_new_connection_id_frame(picoquic_cnx_t* cnx, picoquic_
     int * more_data, int * is_pure_ack, picoquic_local_cnxid_t* l_cid)
 {
     uint8_t* bytes0 = bytes;
-    int is_mp = (cnx->is_unique_path_id_enabled && l_cid->path_id > 0);
+    unsigned int is_mp = cnx->is_unique_path_id_enabled;
 
-    if (l_cid != NULL && (l_cid->sequence != 0 || l_cid->path_id > 0)  && l_cid->cnx_id.id_len > 0) {
+    if (l_cid != NULL && l_cid->cnx_id.id_len > 0) {
         if ((bytes = picoquic_frames_varint_encode(bytes, bytes_max, 
             (is_mp)?picoquic_frame_type_mp_new_connection_id:picoquic_frame_type_new_connection_id)) == NULL ||
             (is_mp && ((bytes = picoquic_frames_varint_encode(bytes, bytes_max, l_cid->path_id)) == NULL)) ||