Remove picoquic_decode_ack_frame helpers as well
@@ -2505,7 +2505,7 @@ static int picoquic_process_ack_range(
return ret;
}
-uint8_t* picoquic_decode_ack_frame_maybe_ecn(picoquic_cnx_t* cnx, uint8_t* bytes,
+uint8_t* picoquic_decode_ack_frame(picoquic_cnx_t* cnx, uint8_t* bytes,
const uint8_t* bytes_max, uint64_t current_time, int epoch, int is_ecn)
{
uint64_t num_block;
@@ -2609,18 +2609,6 @@ uint8_t* picoquic_decode_ack_frame_maybe_ecn(picoquic_cnx_t* cnx, uint8_t* bytes
return bytes;
}
-uint8_t* picoquic_decode_ack_frame(picoquic_cnx_t* cnx, uint8_t* bytes,
- const uint8_t* bytes_max, uint64_t current_time, int epoch)
-{
- return picoquic_decode_ack_frame_maybe_ecn(cnx, bytes, bytes_max, current_time, epoch, 0);
-}
-
-uint8_t* picoquic_decode_ack_ecn_frame(picoquic_cnx_t* cnx, uint8_t* bytes,
- const uint8_t* bytes_max, uint64_t current_time, int epoch)
-{
- return picoquic_decode_ack_frame_maybe_ecn(cnx, bytes, bytes_max, current_time, epoch, 1);
-}
-
static int encode_ecn_block(picoquic_cnx_t* cnx, uint8_t* bytes, size_t bytes_max, size_t* byte_index)
{
int ret = 0;
@@ -3601,7 +3589,7 @@ int picoquic_decode_frames(picoquic_cnx_t* cnx, picoquic_path_t * path_x, uint8_
bytes = NULL;
break;
}
- bytes = picoquic_decode_ack_frame(cnx, bytes, bytes_max, current_time, epoch);
+ bytes = picoquic_decode_ack_frame(cnx, bytes, bytes_max, current_time, epoch, 0);
} else if (first_byte == picoquic_frame_type_ack_ecn) {
if (epoch == 1) {
DBG_PRINTF("Ack-ECN frame (0x%x) not expected in 0-RTT packet", first_byte);
@@ -3609,7 +3597,7 @@ int picoquic_decode_frames(picoquic_cnx_t* cnx, picoquic_path_t * path_x, uint8_
bytes = NULL;
break;
}
- bytes = picoquic_decode_ack_ecn_frame(cnx, bytes, bytes_max, current_time, epoch);
+ bytes = picoquic_decode_ack_frame(cnx, bytes, bytes_max, current_time, epoch, 1);
} else if (epoch != 1 && epoch != 3 && first_byte != picoquic_frame_type_padding
&& first_byte != picoquic_frame_type_path_challenge
&& first_byte != picoquic_frame_type_path_response
