iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Release 2.19.5

Browse source 
- [BUGFIX] Generate frame record when moving an ACK from one buffered
  packet to another.
This commit is contained in:
Dmitri Tikhonov 2020-08-11 08:52:56 -04:00
parent 3a5376727e
commit 5488f41efa
6 changed files with 157 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/liblsquic/lsquic_packet_out.c
View file

@ -388,6 +388,7 @@ lsquic_packet_out_chop_regen (lsquic_packet_out_t *packet_out)
assert(adj); /* Otherwise why are we called? */
assert(packet_out->po_regen_sz == adj);
packet_out->po_regen_sz = 0;
packet_out->po_frame_types &= ~GQUIC_FRAME_REGEN_MASK;
}

32
src/liblsquic/lsquic_send_ctl.c
View file

@ -2507,21 +2507,39 @@ send_ctl_max_bpq_count (const lsquic_send_ctl_t *ctl,
}
static void
/* If error is returned, `src' is not modified */
static int
send_ctl_move_ack (struct lsquic_send_ctl *ctl, struct lsquic_packet_out *dst,
struct lsquic_packet_out *src)
{
struct packet_out_frec_iter pofi;
const struct frame_rec *frec;
assert(dst->po_data_sz == 0);
if (lsquic_packet_out_avail(dst) >= src->po_regen_sz)
/* This checks that we only ever expect to move an ACK frame from one
* buffered packet to another. We don't generate any other regen frame
* types in buffered packets.
*/
assert(!(GQUIC_FRAME_REGEN_MASK & (1 << src->po_frame_types)
& ~QUIC_FTBIT_ACK));
if (lsquic_packet_out_avail(dst) >= src->po_regen_sz
&& (frec = lsquic_pofi_first(&pofi, src), frec != NULL)
&& frec->fe_frame_type == QUIC_FRAME_ACK)
{
memcpy(dst->po_data, src->po_data, src->po_regen_sz);
if (0 != lsquic_packet_out_add_frame(dst, &ctl->sc_enpub->enp_mm,
frec->fe_frame_type, QUIC_FRAME_ACK, dst->po_data_sz,
src->po_regen_sz))
return -1;
dst->po_data_sz = src->po_regen_sz;
dst->po_regen_sz = src->po_regen_sz;
dst->po_frame_types |= (GQUIC_FRAME_REGEN_MASK & src->po_frame_types);
src->po_frame_types &= ~GQUIC_FRAME_REGEN_MASK;
lsquic_packet_out_chop_regen(src);
}
return 0;
}
@ -2589,8 +2607,14 @@ send_ctl_get_buffered_packet (lsquic_send_ctl_t *ctl,
switch (ack_action)
{
case AA_STEAL:
send_ctl_move_ack(ctl, packet_out,
TAILQ_FIRST(&ctl->sc_buffered_packets[BPT_OTHER_PRIO].bpq_packets));
if (0 != send_ctl_move_ack(ctl, packet_out,
TAILQ_FIRST(&ctl->sc_buffered_packets[BPT_OTHER_PRIO].bpq_packets)))
{
LSQ_INFO("cannot move ack");
lsquic_packet_out_destroy(packet_out, ctl->sc_enpub,
packet_out->po_path->np_peer_ctx);
return NULL;
}
break;
case AA_GENERATE:
lconn->cn_if->ci_write_ack(lconn, packet_out);