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

Fix: don't double-count tag length in amplification logic

Browse source
This commit is contained in:
Dmitri Tikhonov 2020-06-04 10:27:05 -04:00
parent 1fbdbcee1d
commit ad48a114a2
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/liblsquic/lsquic_mini_conn_ietf.c
View file

@ -635,7 +635,7 @@ ietf_mini_conn_ci_is_tickable (struct lsquic_conn *lconn)
if (!(packet_out->po_flags & PO_SENT)) if (!(packet_out->po_flags & PO_SENT))
{ {
packet_size = lsquic_packet_out_total_sz(lconn, packet_out); packet_size = lsquic_packet_out_total_sz(lconn, packet_out);
return imico_can_send(conn, packet_size + IQUIC_TAG_LEN); return imico_can_send(conn, packet_size);
} }
return 0; return 0;
@ -665,15 +665,15 @@ ietf_mini_conn_ci_next_packet_to_send (struct lsquic_conn *lconn, size_t size)
packet_size = lsquic_packet_out_total_sz(lconn, packet_out); packet_size = lsquic_packet_out_total_sz(lconn, packet_out);
if (size == 0 || packet_size + size <= conn->imc_path.np_pack_size) if (size == 0 || packet_size + size <= conn->imc_path.np_pack_size)
{ {
if (!imico_can_send(conn, packet_size + IQUIC_TAG_LEN)) if (!imico_can_send(conn, packet_size))
{ {
LSQ_DEBUG("cannot send packet %"PRIu64" of size %zu: client " LSQ_DEBUG("cannot send packet %"PRIu64" of size %zu: client "
"address has not been validated", packet_out->po_packno, "address has not been validated", packet_out->po_packno,
packet_size + IQUIC_TAG_LEN); packet_size);
return NULL; return NULL;
} }
packet_out->po_flags |= PO_SENT; packet_out->po_flags |= PO_SENT;
conn->imc_bytes_out += packet_size + IQUIC_TAG_LEN; conn->imc_bytes_out += packet_size;
if (size == 0) if (size == 0)
LSQ_DEBUG("packet_to_send: %"PRIu64, packet_out->po_packno); LSQ_DEBUG("packet_to_send: %"PRIu64, packet_out->po_packno);
else else
@ -1299,7 +1299,7 @@ ietf_mini_conn_ci_packet_not_sent (struct lsquic_conn *lconn,
packet_out->po_flags &= ~PO_SENT; packet_out->po_flags &= ~PO_SENT;
packet_size = lsquic_packet_out_total_sz(lconn, packet_out); packet_size = lsquic_packet_out_total_sz(lconn, packet_out);
conn->imc_bytes_out -= packet_size + IQUIC_TAG_LEN; conn->imc_bytes_out -= packet_size;
LSQ_DEBUG("%s: packet %"PRIu64" not sent", __func__, packet_out->po_packno); LSQ_DEBUG("%s: packet %"PRIu64" not sent", __func__, packet_out->po_packno);
} }